diff --git a/csv-generic/gen-generic.php b/csv-generic/gen-generic.php
index 71fc214..fcbf907 100644
--- a/csv-generic/gen-generic.php
+++ b/csv-generic/gen-generic.php
@@ -61,6 +61,8 @@ foreach ($lga_list as $lga) {
 
     if (count($lga_candidates) === 0) continue;
 
+    remove_duplicates($lga_candidates);
+
     $dir = dirname($lga['config-file']);
     $dir_files = scandir($dir);
     $output_file = $dir."/candidates-generic.csv";
@@ -118,11 +120,10 @@ foreach ($lga_list as $lga) {
 
     foreach ($overrides as $override) {
         foreach ($lines as $line_key => $line) {
-            foreach ($header as $index => $field) {
-                if (($override['Field'] === $field) && 
-                        ($line[$index] === $override['Old'])) {
-                    $lines[$line_key][$index] = $override['New'];
-                }
+            $match_index = array_search($override['Match Field'], $header); 
+            $replace_index = array_search($override['Replace Field'], $header); 
+            if ($line[$match_index] === $override['Match Value']) { 
+                $lines[$line_key][$replace_index] = $override['Replace Value'];
             }
         }
     }
diff --git a/csv-generic/parse_generic_csv.php b/csv-generic/parse_generic_csv.php
index 6d56511..d2036f8 100644
--- a/csv-generic/parse_generic_csv.php
+++ b/csv-generic/parse_generic_csv.php
@@ -75,7 +75,7 @@ function match_lga(&$candidate_data, $lga_list) {
 
         $max_score = 0;
         foreach ($match_lga['wardNames'] as $ward) {
-            similar_text($ward, $candidate['Ward'], $score);
+            similar_text(strtolower($ward), strtolower($candidate['Ward']), $score);
             if ($score >= $max_score) {
                 $max_score = $score;
                 $match_ward = $ward;
@@ -86,3 +86,22 @@ function match_lga(&$candidate_data, $lga_list) {
         $candidate['match_ward'] = $match_ward;
     }
 }
+
+function remove_duplicates(&$candidate_data) {
+    $names = [];
+    $duplicates = [];
+    foreach ($candidate_data as $candidate_key => $candidate) {
+        /* If we've already had this name, remove the old entry */
+        foreach ($names as $name_key => $name) {
+            similar_text(strtolower($name), strtolower($candidate['Name']), $score);
+            if ($score > 90) {
+                $duplicates[] = $name_key;
+            }
+        }
+        $names[$candidate_key] = $candidate['Name'];
+    }
+    $duplicates = array_unique($duplicates);
+    foreach ($duplicates as $duplicate) {
+        unset($candidate_data[$duplicate]);
+    }
+}