Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/export.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/export.py	(revision 17848)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/export.py	(revision 17849)
@@ -222,8 +222,12 @@
 
     def mangle_value(self, value, name, context=None):
-        if name == 'lg_state' and context.lga:
-            value = context.lga.split('_')[0]
-        if name == 'lg_area' and context.lga:
-            value = '-'.join(context.lga.split('_')[1:])
+        if name in ('lg_state', 'lg_area') and context.lga:
+            value = context.lga
+            if value.startswith('cross_river') or value.startswith('akwa_ibom'):
+                value = context.lga.replace('_', '-', 1)
+            if name == 'lg_state':
+                value = value.split('_')[0]
+            if name == 'lg_area':
+                value = '-'.join(value.split('_')[1:])
         return super(
             NYSCExporter, self).mangle_value(
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_export.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_export.py	(revision 17848)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/tests/test_export.py	(revision 17849)
@@ -179,5 +179,5 @@
         self.student.nysc = True
         self.student.nysc_processed = False
-        self.student.lga = u'xyz_abc'
+        self.student.lga = u'cross_river_abc'
         exporter = NYSCExporter()
         exporter.export_all(self.app, self.outfile)
@@ -189,5 +189,5 @@
             'entry_session,faccode,depcode,certcode,'
             'nysc_senate_info,nysc_date_of_graduation,nysc_updated,nysc_processed,%s\r\n'
-            'A111111,234,123,Anna,M.,Tester,f,NG,1981-02-04#,created,xyz,abc,ug_ft,'
+            'A111111,234,123,Anna,M.,Tester,f,NG,1981-02-04#,created,cross-river,abc,ug_ft,'
             'CERT1,NA,NA,200,2012,0,2010,NA,NA,CERT1,,,,0,,,,,,12.12,,,,,,\r\n' % year_range_str,
             result
