diff --git a/better_zip/better_zip.py b/better_zip/better_zip.py
index 6c5ca110c..8f88cb379 100644
--- a/better_zip/better_zip.py
+++ b/better_zip/better_zip.py
@@ -22,7 +22,7 @@ from openerp.osv import orm, fields
 
 
 class BetterZip(orm.Model):
-    " Zip/NPA completion object"
+    " City/locations completion object"
 
     _name = "res.better.zip"
     _description = __doc__
diff --git a/better_zip/better_zip_view.xml b/better_zip/better_zip_view.xml
index fdd4d0dac..41fec0f67 100644
--- a/better_zip/better_zip_view.xml
+++ b/better_zip/better_zip_view.xml
@@ -34,7 +34,7 @@
     </record>
 
     <record id="action_zip_tree" model="ir.actions.act_window">
-      <field name="name">ZIP Management</field>
+      <field name="name">Cites/locations Management</field>
       <field name="res_model">res.better.zip</field>
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>
@@ -42,7 +42,7 @@
     </record>
 
     <menuitem
-        name="ZIP Management"
+        name="Cities/Locations Management"
         id="zip_base"
         parent="base.menu_base_config"
         action="action_zip_tree"
diff --git a/better_zip/company_view.xml b/better_zip/company_view.xml
index 40ee445d6..d697158e3 100644
--- a/better_zip/company_view.xml
+++ b/better_zip/company_view.xml
@@ -11,7 +11,7 @@
           <field name="better_zip_id"
                  colspan="4"
                  on_change="on_change_city(better_zip_id)"
-                 placeholder="ZIP completion" />
+                 placeholder="City completion" />
         </field>
       </field>
     </record>
diff --git a/better_zip/partner_view.xml b/better_zip/partner_view.xml
index a442169e5..cc6b29301 100644
--- a/better_zip/partner_view.xml
+++ b/better_zip/partner_view.xml
@@ -9,7 +9,7 @@
         <field name="city" position="before">
           <field name="zip_id"
                  on_change="onchange_zip_id(zip_id)"
-                 placeholder="ZIP completion"/>
+                 placeholder="City completion"/>
         </field>
       </field>
     </record>