diff --git a/koha-tmpl/intranet-tmpl/prog/en/columns.def b/koha-tmpl/intranet-tmpl/prog/en/columns.def
index 73891766b1..c80975a3bd 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/columns.def
+++ b/koha-tmpl/intranet-tmpl/prog/en/columns.def
@@ -14,7 +14,7 @@
 <field name="borrowers.address2">Address 2</field>
 <field name="borrowers.city">City</field>
 <field name="borrowers.state">State</field>
-<field name="borrowers.zipcode">Zip/postal code</field>
+<field name="borrowers.zipcode">ZIP/Postal code</field>
 <field name="borrowers.country">Country</field>
 <field name="borrowers.phone">Primary phone</field>
 <field name="borrowers.phonepro">Secondary phone</field>
@@ -28,7 +28,7 @@
 <field name="borrowers.B_address2">Alternate address: Address 2</field>
 <field name="borrowers.B_city">Alternate address: City</field>
 <field name="borrowers.B_state">Alternate address: State</field>
-<field name="borrowers.B_zipcode">Alternate address: Zip/postal code</field>
+<field name="borrowers.B_zipcode">Alternate address: ZIP/Postal code</field>
 <field name="borrowers.B_country">Alternate address: Country</field>
 <field name="borrowers.B_phone">Alternate address: Phone</field>
 <field name="borrowers.B_email">Alternate address: Email</field>
@@ -42,7 +42,7 @@
 <field name="borrowers.contactfirstname">Alternate contact: First name</field>
 <field name="borrowers.contacttitle">Alternate contact: Title</field>
 <field name="borrowers.altcontactstate">Alternate contact: State</field>
-<field name="borrowers.altcontactzipcode">Alternate contact: Zip/postal code</field>
+<field name="borrowers.altcontactzipcode">Alternate contact: ZIP/Postal code</field>
 <field name="borrowers.altcontactcountry">Alternate contact: Country</field>
 <field name="borrowers.altcontactphone">Alternate contact: Phone</field>
 <field name="borrowers.cardnumber">Card number</field>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
index 0b106d3369..29b54b90b1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tt
@@ -133,7 +133,7 @@ tinyMCE.init({
         <li><label for="branchaddress3">Address line 3: </label><input type="text" name="branchaddress3" id="branchaddress3" size="60" value="[% branchaddress3 |html %]" /></li>
         <li><label for="branchcity">City: </label><input type="text" name="branchcity" id="branchcity" size="60" value="[% branchcity |html %]" /></li>
         <li><label for="branchstate">State: </label><input type="text" name="branchstate" id="branchstate" size="60" value="[% branchstate |html %]" /></li>
-        <li><label for="branchzip">Zip/Postal code: </label><input type="text" name="branchzip" id="branchzip"  size="25" maxlength="25" value="[% branchzip |html %]" /></li>
+        <li><label for="branchzip">ZIP/Postal code: </label><input type="text" name="branchzip" id="branchzip"  size="25" maxlength="25" value="[% branchzip |html %]" /></li>
         <li><label for="branchcountry">Country: </label><input type="text" name="branchcountry" id="branchcountry" size="60" value="[% branchcountry |html %]" /></li>
         <li><label for="branchphone">Phone: </label><input type="text" name="branchphone" id="branchphone" size="60" value="[% branchphone |html %]" /></li>
         <li><label for="branchfax">Fax: </label><input type="text" name="branchfax" id="branchfax" size="60" value="[% branchfax |html %]" /></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
index 9e4553b2d0..7143661618 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/cities.tt
@@ -87,7 +87,7 @@
                     <input type="text" name="city_state" id="city_state" size="80" maxlength="100" value="[% city.city_state |html %]" />
                 </li>
                 <li>
-                    <label for="city_zipcode" class="required">Zip/Postal code: </label>
+                    <label for="city_zipcode" class="required">ZIP/Postal code: </label>
                     <input type="text" name="city_zipcode" id="city_zipcode" size="20" maxlength="20" value="[% city.city_zipcode %]" required="required" class="required" /> <span class="required">Required</span>
                 </li>
                 <li>
@@ -117,7 +117,7 @@
             <tr><th>State</th>
                 <td>[% city.city_state %]</td>
             </tr>
-            <tr><th>Zip/Postal code</th>
+            <tr><th>ZIP/Postal code</th>
                 <td>[% city.city_zipcode %]</td>
             </tr>
             <tr><th>Country</th>
@@ -152,7 +152,7 @@
                 <th>City ID</th>
                 <th>City</th>
                 <th>State</th>
-                <th>Zip/Postal code</th>
+                <th>ZIP/Postal code</th>
                 <th>Country</th>
                 <th>&nbsp;</th>
                 <th>&nbsp;</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
index 89e4436e73..6f7e60a0b7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
@@ -56,5 +56,5 @@ I18N/L10N:
         - pref: AddressFormat
           default: us
           choices:
-              us: US style ([Street number], [Address] - [City], [Zip/Postal Code], [Country])
-              de: German style ([Address] [Street number] - [Zip/Postal Code] [City] - [Country])
+              us: US style ([Street number], [Address] - [City], [ZIP/Postal Code], [Country])
+              de: German style ([Address] [Street number] - [ZIP/Postal Code] [City] - [Country])
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
index 200ce242d2..3c5397ce38 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
@@ -104,7 +104,7 @@
 			</tr>
 
 			<tr>
-            <td rowspan="2">Zip code</td>
+            <td rowspan="2">ZIP/Postal code</td>
 			<td><input type="radio" name="Line" value="zipcode" /></td>
 			<td><input type="radio" name="Column" value="zipcode" /></td>
 			<td><select name="Filter"  size="1" id="zipcode">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
index 65ce4407ca..3bd2bf5a56 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/modborrowers.tt
@@ -235,7 +235,7 @@
                                                 <th>Category</th>
                                                 <th>City</th>
                                                 <th>State</th>
-                                                <th>Zip/Postal code</th>
+                                                <th>ZIP/Postal code</th>
                                                 <th>Country</th>
                                                 <th class="title-string">Registration date</th>
                                                 <th class="title-string">Expiry date</th>
@@ -302,7 +302,7 @@
                                                 [% CASE 'state' %]
                                                 State
                                                 [% CASE 'zipcode' %]
-                                                Zip/Postal code
+                                                ZIP/Postal code
                                                 [% CASE 'country' %]
                                                 Country
                                                 [% CASE 'sort1' %]
diff --git a/reports/borrowers_stats.pl b/reports/borrowers_stats.pl
index b34934e78e..83ef452b38 100755
--- a/reports/borrowers_stats.pl
+++ b/reports/borrowers_stats.pl
@@ -227,7 +227,7 @@ sub calculate {
             }
 
             if    ( $i == 0)  { $cell{crit} = "Cat code"; }
-            elsif ( $i == 1 ) { $cell{crit} = "Zip code"; }
+            elsif ( $i == 1 ) { $cell{crit} = "ZIP/Postal code"; }
             elsif ( $i == 2 ) { $cell{crit} = "Branch code"; }
             elsif ( $i == 3 ||
                     $i == 4 ) { $cell{crit} = "Date of birth"; }