diff --git a/safe/definitions/hazard.py b/safe/definitions/hazard.py
index bffd24b39b..9034db208f 100644
--- a/safe/definitions/hazard.py
+++ b/safe/definitions/hazard.py
@@ -78,7 +78,7 @@
 continuous_hazard_unit_all = continuous_hazard_unit['types']
 hazard_generic = {
     'key': 'hazard_generic',
-    'name': tr('Generic'),
+    'name': tr('Generic Hazard'),
     'description': tr(
         'A <b>generic hazard</b> can be used for any type of hazard where the '
         'data have been classified or generalised. For example: earthquake, '
diff --git a/safe/impact_function/test/test_impact_function.py b/safe/impact_function/test/test_impact_function.py
index fd5353141c..1e6bf66ad2 100644
--- a/safe/impact_function/test/test_impact_function.py
+++ b/safe/impact_function/test/test_impact_function.py
@@ -216,7 +216,7 @@ def test_impact_function_behaviour(self):
         impact_function.exposure = exposure_layer
         impact_function.hazard = hazard_layer
         impact_function.prepare()
-        self.assertEqual(impact_function.name, 'Flood Polygon On Road Line')
+        self.assertEqual(impact_function.name, 'Flood Polygon On Roads Line')
         self.assertEqual(impact_function.title, 'be affected')
 
     def test_minimum_extent(self):
diff --git a/safe/report/test/test_impact_report.py b/safe/report/test/test_impact_report.py
index bc14b2e4bb..93c7e1cfb1 100644
--- a/safe/report/test/test_impact_report.py
+++ b/safe/report/test/test_impact_report.py
@@ -641,9 +641,9 @@ def test_analysis_provenance_details_simplified(self):
                                       u'InaSAFE v4 GeoJSON test layer - '}),
                     ('impact_function', {
                         'header': u'Impact Function',
-                        'provenance': u'Hazard_Generic '
+                        'provenance': u'Generic Hazard '
                                       u'Polygon On '
-                                      u'Structure Point'})
+                                      u'Structures Point'})
                 ])
         }
 
@@ -695,7 +695,7 @@ def test_analysis_provenance_tree_details(self):
             'header': u'Analysis details',
             'details': OrderedDict([('impact_function', {
                 'header': u'Impact Function',
-                'provenances': u'Hazard_Generic Polygon On Structure Point'
+                'provenances': u'Generic Hazard Polygon On Structures Point'
             }), ('hazard', {
                 'header': u'Hazard',
                 'provenances': OrderedDict([('title', {