diff --git a/resources/dictionaries/en/unit_types_numbered.txt b/resources/dictionaries/en/unit_types_numbered.txt
index baa1443d..427e4bf6 100644
--- a/resources/dictionaries/en/unit_types_numbered.txt
+++ b/resources/dictionaries/en/unit_types_numbered.txt
@@ -20,7 +20,7 @@ duplex|dup|dupl
 extension|ext|extn
 factory|fcty|fty|fy
 farm|frm
-flat|ft|fl|flt|f
+flat|flt
 garage|grge
 hall
 hangar|hngr
diff --git a/scripts/geodata/addresses/units.py b/scripts/geodata/addresses/units.py
index 21b0fefb..78e533d1 100644
--- a/scripts/geodata/addresses/units.py
+++ b/scripts/geodata/addresses/units.py
@@ -114,7 +114,7 @@ class Unit(NumberedComponent):
     @classmethod
     def phrase(cls, unit, language, country=None, zone=None):
         if unit is not None:
-            key = 'units.alphanumeric' if zone is None else 'units.zone.{}'.format(zone)
+            key = 'units.alphanumeric' if zone is None else 'units.zones.{}'.format(zone)
 
             add_direction = address_config.get_property('{}.add_direction'.format(key), language, country=country)
             if add_direction: