diff --git a/client/src/i18n/en.json b/client/src/i18n/en.json
index 53e3ea9a73..1689068900 100644
--- a/client/src/i18n/en.json
+++ b/client/src/i18n/en.json
@@ -499,7 +499,7 @@
       "CREATION" : "Creation",
       "EDITION"  : "Edition"
     },
-    "PLACE_HOLDERS": {
+    "PLACEHOLDERS": {
       "ENTER_ACCOUNT"      : "Enter account",
       "ENTER_CODE"         : "Entrer code",
       "ENTER_COUNTRY"      : "Enter Country",
diff --git a/client/src/i18n/fr.json b/client/src/i18n/fr.json
index 1773d3c31d..659eceee61 100644
--- a/client/src/i18n/fr.json
+++ b/client/src/i18n/fr.json
@@ -498,7 +498,7 @@
       "CREATION" : "Creation",
       "EDITION"  : "Edition"
     },
-    "PLACE_HOLDERS": {
+    "PLACEHOLDERS": {
       "ENTER_ACCOUNT"      : "Entrer le compte",
       "ENTER_CODE"         : "Entrer le code",
       "ENTER_COUNTRY"      : "Entrer le nom pays",
diff --git a/client/src/js/components/bhFindPatient.js b/client/src/js/components/bhFindPatient.js
index c3894f8df7..0362a5e762 100644
--- a/client/src/js/components/bhFindPatient.js
+++ b/client/src/js/components/bhFindPatient.js
@@ -44,11 +44,11 @@ function FindPatientComponent(Patients, AppCache) {
   vm.options = {
     findById : {
       'label' : 'FORM.LABELS.PATIENT_ID',
-      'placeholder' : 'FORM.PLACE_HOLDERS.SEARCH_PATIENT_ID'
+      'placeholder' : 'FORM.PLACEHOLDERS.SEARCH_PATIENT_ID'
     },
     findByName : {
       'label' : 'FORM.LABELS.PATIENT_NAME',
-      'placeholder' : 'FORM.PLACE_HOLDERS.SEARCH_NAME'
+      'placeholder' : 'FORM.PLACEHOLDERS.SEARCH_NAME'
     }
   };
 
diff --git a/client/src/partials/accounts/accounts.html b/client/src/partials/accounts/accounts.html
index 891da5b50e..349c235e92 100644
--- a/client/src/partials/accounts/accounts.html
+++ b/client/src/partials/accounts/accounts.html
@@ -96,7 +96,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }}</h4>
             
               <div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.label.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.ACCOUNT_TITLE" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}" ng-maxlength="AccountsCtrl.maxLength" class="form-control" name="label" ng-model="AccountsCtrl.account.label" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}" ng-maxlength="AccountsCtrl.maxLength" class="form-control" name="label" ng-model="AccountsCtrl.account.label" required>
                 <div class="help-block" ng-messages="CreateForm.label.$error" ng-show="CreateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                 
@@ -248,7 +248,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }}</h4>
             <form class="panel-body" name="UpdateForm" ng-submit="AccountsCtrl.submit(UpdateForm)" autocomplete="off" autocapitalize="off" autocorrect="off" novalidate>
               <div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.label.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.ACCOUNT_TITLE" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}" ng-maxlength="AccountsCtrl.maxLength" class="form-control" name="label" ng-model="AccountsCtrl.account.label" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}" ng-maxlength="AccountsCtrl.maxLength" class="form-control" name="label" ng-model="AccountsCtrl.account.label" required>
                 <div class="help-block" ng-messages="UpdateForm.label.$error" ng-show="UpdateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                
diff --git a/client/src/partials/billing_services/modal.html b/client/src/partials/billing_services/modal.html
index 252655991c..f59d254a4a 100644
--- a/client/src/partials/billing_services/modal.html
+++ b/client/src/partials/billing_services/modal.html
@@ -20,7 +20,7 @@ <h4>{{ BillingServicesFormCtrl.title | translate }}<span ng-show="BillingService
         class="form-control"
         name="account"
         ng-model="BillingServicesFormCtrl.model.account"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}"
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}"
         uib-typeahead="account as account.hrlabel for account in BillingServicesFormCtrl.accounts | filter:$viewValue | limitTo:6"
         typeahead-editable="false"
         typeahead-template-url="partials/templates/typeahead/accounts.html"
@@ -59,7 +59,7 @@ <h4>{{ BillingServicesFormCtrl.title | translate }}<span ng-show="BillingService
         class="form-control"
         name="description"
         ng-model="BillingServicesFormCtrl.model.description"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_DESCRIPTION' | translate }}"
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_DESCRIPTION' | translate }}"
         ng-maxlength="BillingServicesFormCtrl.maxLength"
         required>
       </textarea>
diff --git a/client/src/partials/debtors/groups.edit.html b/client/src/partials/debtors/groups.edit.html
index dbdc61cd6f..3b659b6e6e 100644
--- a/client/src/partials/debtors/groups.edit.html
+++ b/client/src/partials/debtors/groups.edit.html
@@ -37,7 +37,7 @@
           <input
             class="form-control"
             name="account_id"
-            placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
+            placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
             uib-typeahead="account as account.hrlabel for account in GroupEditCtrl.accounts | filter:$viewValue | limitTo:10"
             typeahead-template-url="partials/templates/typeahead/accounts.html"
             typeahead-editable="false"
diff --git a/client/src/partials/debtors/groups.list.html b/client/src/partials/debtors/groups.list.html
index 3c11841bdd..49a2090204 100644
--- a/client/src/partials/debtors/groups.list.html
+++ b/client/src/partials/debtors/groups.list.html
@@ -21,7 +21,7 @@
         </div>
       </div>
 
-      <input ng-model="GroupCtrl.filter" ng-show="GroupCtrl.filterActive" class="form-control" placeholder="{{'FORM.PLACE_HOLDERS.FILTER_NAME' | translate }}" style="border-radius: 0"></input>
+      <input ng-model="GroupCtrl.filter" ng-show="GroupCtrl.filterActive" class="form-control" placeholder="{{'FORM.PLACEHOLDERS.FILTER_NAME' | translate }}" style="border-radius: 0"></input>
     </div>
 
     <div
diff --git a/client/src/partials/donors/donors.html b/client/src/partials/donors/donors.html
index 3d1c3240b0..3d172e9274 100644
--- a/client/src/partials/donors/donors.html
+++ b/client/src/partials/donors/donors.html
@@ -72,7 +72,7 @@ <h4>{{ "DONOR_MANAGEMENT.TITLE" | translate }}</h4>
                 <input
                   class="form-control"
                   name="name"
-                  placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
+                  placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
                   ng-maxlength="DonorCtrl.maxLength"
                   ng-model="DonorCtrl.donor.name" required>
                 <div class="help-block" ng-messages="ActionForm.name.$error" ng-show="ActionForm.$submitted">
diff --git a/client/src/partials/inventory/configuration/groups/modals/actions.tmpl.html b/client/src/partials/inventory/configuration/groups/modals/actions.tmpl.html
index 38d76c3fc5..7fc0394e38 100644
--- a/client/src/partials/inventory/configuration/groups/modals/actions.tmpl.html
+++ b/client/src/partials/inventory/configuration/groups/modals/actions.tmpl.html
@@ -14,7 +14,7 @@
         class="form-control"
         type="text"
         name="name"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
         required>
       <div class="help-block" ng-messages="ActionForm.name.$error" ng-show="ActionForm.$submitted">
         <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
@@ -28,7 +28,7 @@
         class="form-control"
         type="text"
         name="code"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_CODE' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_CODE' | translate }}..."
         required>
       <div class="help-block" ng-messages="ActionForm.code.$error" ng-show="ActionForm.$submitted">
         <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
@@ -45,7 +45,7 @@
         uib-typeahead="acc as acc.hrlabel for acc in $ctrl.accountList | filter:$viewValue | limitTo:8"
         typeahead-template-url="partials/templates/typeahead/accounts.html"
         typeahead-editable="true"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
         required>
       <div class="help-block" ng-messages="ActionForm.salesAccount.$error" ng-show="ActionForm.$submitted">
         <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
@@ -61,7 +61,7 @@
         uib-typeahead="acc as acc.hrlabel for acc in $ctrl.accountList | filter:$viewValue | limitTo:8"
         typeahead-template-url="partials/templates/typeahead/accounts.html"
         typeahead-editable="true"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
         >
     </div>
 
@@ -74,7 +74,7 @@
         uib-typeahead="acc as acc.hrlabel for acc in $ctrl.accountList | filter:$viewValue | limitTo:8"
         typeahead-template-url="partials/templates/typeahead/accounts.html"
         typeahead-editable="true"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
         >
     </div>
 
diff --git a/client/src/partials/inventory/configuration/types/modals/actions.tmpl.html b/client/src/partials/inventory/configuration/types/modals/actions.tmpl.html
index 3b95eb35eb..29f36ed3e6 100644
--- a/client/src/partials/inventory/configuration/types/modals/actions.tmpl.html
+++ b/client/src/partials/inventory/configuration/types/modals/actions.tmpl.html
@@ -13,7 +13,7 @@
         class="form-control"
         type="text"
         name="text"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
         required>
       <div class="help-block" ng-messages="ActionForm.text.$error" ng-show="ActionForm.$submitted">
         <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
diff --git a/client/src/partials/inventory/configuration/units/modals/actions.tmpl.html b/client/src/partials/inventory/configuration/units/modals/actions.tmpl.html
index cc2ff89426..3aa9207463 100644
--- a/client/src/partials/inventory/configuration/units/modals/actions.tmpl.html
+++ b/client/src/partials/inventory/configuration/units/modals/actions.tmpl.html
@@ -13,7 +13,7 @@
         class="form-control"
         type="text"
         name="text"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
         required>
       <div class="help-block" ng-messages="ActionForm.text.$error" ng-show="ActionForm.$submitted">
         <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
diff --git a/client/src/partials/inventory/list/modals/actions.tmpl.html b/client/src/partials/inventory/list/modals/actions.tmpl.html
index 339b71b6db..5e2ae24dc4 100644
--- a/client/src/partials/inventory/list/modals/actions.tmpl.html
+++ b/client/src/partials/inventory/list/modals/actions.tmpl.html
@@ -14,7 +14,7 @@
         class="form-control"
         type="text"
         name="code"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_CODE' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_CODE' | translate }}..."
         required>
       <div class="help-block" ng-messages="ActionForm.code.$error" ng-show="ActionForm.$submitted">
         <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
@@ -28,7 +28,7 @@
         class="form-control"
         type="text"
         name="text"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_NAME' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_NAME' | translate }}..."
         required>
       <div class="help-block" ng-messages="ActionForm.text.$error" ng-show="ActionForm.$submitted">
         <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
@@ -49,7 +49,7 @@
       <label class="control-label">{{ 'FORM.LABELS.PRICE' | translate }}</label>
       <input class="form-control" type="text" name="price"
         ng-model="$ctrl.session.price"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PRICE' | translate }}..."
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PRICE' | translate }}..."
         required>
       <div class="help-block" ng-messages="ActionForm.price.$error" ng-show="ActionForm.$submitted">
         <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
@@ -108,14 +108,14 @@
       <label class="control-label">{{ 'FORM.LABELS.UNIT_WEIGHT' | translate }}</label>
       <input class="form-control" type="number" step="1" name="unit_weight"
         ng-model="$ctrl.session.unit_weight"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_UNIT_WEIGHT' | translate }}...">
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_UNIT_WEIGHT' | translate }}...">
     </div>
 
     <div class="form-group">
       <label class="control-label">{{ 'FORM.LABELS.UNIT_VOLUME' | translate }}</label>
       <input class="form-control" type="number" step="1" name="unit_volume"
         ng-model="$ctrl.session.unit_volume"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_UNIT_VOLUME' | translate }}...">
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_UNIT_VOLUME' | translate }}...">
     </div>
 
   </div>
diff --git a/client/src/partials/locations/country/country.html b/client/src/partials/locations/country/country.html
index 3f29e4efc8..28a47fe96b 100644
--- a/client/src/partials/locations/country/country.html
+++ b/client/src/partials/locations/country/country.html
@@ -80,7 +80,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
             
               <div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.country.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.COUNTRY" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_COUNTRY' | translate }}" ng-maxlength="CountryCtrl.countryLength" class="form-control" name="country" ng-model="CountryCtrl.country.name" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_COUNTRY' | translate }}" ng-maxlength="CountryCtrl.countryLength" class="form-control" name="country" ng-model="CountryCtrl.country.name" required>
                 <div class="help-block" ng-messages="CreateForm.country.$error" ng-show="CreateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                 
@@ -105,7 +105,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
             <form class="panel-body" name="UpdateForm" ng-submit="CountryCtrl.submit(UpdateForm)" autocomplete="off" autocapitalize="off" autocorrect="off" novalidate>
               <div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.country.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.COUNTRY" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_COUNTRY' | translate }}" ng-maxlength="CountryCtrl.countryLength" class="form-control" name="country" ng-model="CountryCtrl.country.name" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_COUNTRY' | translate }}" ng-maxlength="CountryCtrl.countryLength" class="form-control" name="country" ng-model="CountryCtrl.country.name" required>
                 <div class="help-block" ng-messages="UpdateForm.country.$error" ng-show="UpdateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                 
diff --git a/client/src/partials/locations/province/province.html b/client/src/partials/locations/province/province.html
index 02d0d6c009..f29c44fa5d 100644
--- a/client/src/partials/locations/province/province.html
+++ b/client/src/partials/locations/province/province.html
@@ -99,7 +99,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
 
               <div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.province.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.PROVINCE" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PROVINCE' | translate }}" ng-maxlength="ProvinceCtrl.maxLength" class="form-control" name="province" ng-model="ProvinceCtrl.province.name" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PROVINCE' | translate }}" ng-maxlength="ProvinceCtrl.maxLength" class="form-control" name="province" ng-model="ProvinceCtrl.province.name" required>
                 <div class="help-block" ng-messages="CreateForm.province.$error" ng-show="CreateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                  
@@ -141,7 +141,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
 
               <div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.province.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.PROVINCE" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PROVINCE' | translate }}" class="form-control" ng-maxlength="ProvinceCtrl.maxLength" name="province" ng-model="ProvinceCtrl.province.name" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PROVINCE' | translate }}" class="form-control" ng-maxlength="ProvinceCtrl.maxLength" name="province" ng-model="ProvinceCtrl.province.name" required>
                 <div class="help-block" ng-messages="UpdateForm.province.$error" ng-show="UpdateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                 
diff --git a/client/src/partials/locations/sector/sector.html b/client/src/partials/locations/sector/sector.html
index c1e76c2502..82b9baf01f 100644
--- a/client/src/partials/locations/sector/sector.html
+++ b/client/src/partials/locations/sector/sector.html
@@ -115,7 +115,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
 
               <div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.sector.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.SECTOR" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_SECTOR' | translate }}" ng-maxlength="SectorCtrl.maxLength" class="form-control" name="sector" ng-model="SectorCtrl.sector.name" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_SECTOR' | translate }}" ng-maxlength="SectorCtrl.maxLength" class="form-control" name="sector" ng-model="SectorCtrl.sector.name" required>
                 <div class="help-block" ng-messages="CreateForm.sector.$error" ng-show="CreateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                 
@@ -174,7 +174,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
 
               <div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.sector.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.SECTOR" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_SECTOR' | translate }}" ng-maxlength="SectorCtrl.maxLength" class="form-control" name="sector" ng-model="SectorCtrl.sector.name" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_SECTOR' | translate }}" ng-maxlength="SectorCtrl.maxLength" class="form-control" name="sector" ng-model="SectorCtrl.sector.name" required>
                 <div class="help-block" ng-messages="UpdateForm.sector.$error" ng-show="UpdateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                 
diff --git a/client/src/partials/locations/village/village.html b/client/src/partials/locations/village/village.html
index 9f699caf58..db5034dd55 100644
--- a/client/src/partials/locations/village/village.html
+++ b/client/src/partials/locations/village/village.html
@@ -132,7 +132,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
 
               <div class="form-group" ng-class="{ 'has-error' : CreateForm.$submitted && CreateForm.village.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.VILLAGE" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_VILLAGE' | translate }}" ng-maxlength="VillageCtrl.maxLength" class="form-control" name="village" ng-model="VillageCtrl.village.name" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_VILLAGE' | translate }}" ng-maxlength="VillageCtrl.maxLength" class="form-control" name="village" ng-model="VillageCtrl.village.name" required>
                 <div class="help-block" ng-messages="CreateForm.village.$error" ng-show="CreateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                
@@ -214,7 +214,7 @@ <h4>{{ 'FORM.INFOS.UPDATE_SUCCESS' | translate }} </h4>
 
               <div class="form-group" ng-class="{ 'has-error' : UpdateForm.$submitted && UpdateForm.village.$invalid }">
                 <label class="control-label">{{ "FORM.LABELS.VILLAGE" | translate }}</label>
-                <input type="text" placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_VILLAGE' | translate }}" ng-maxlength="VillageCtrl.maxLength" class="form-control" name="village" ng-model="VillageCtrl.village.name" required>
+                <input type="text" placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_VILLAGE' | translate }}" ng-maxlength="VillageCtrl.maxLength" class="form-control" name="village" ng-model="VillageCtrl.village.name" required>
                 <div class="help-block" ng-messages="UpdateForm.village.$error" ng-show="UpdateForm.$submitted">
                   <div ng-messages-include="partials/templates/messages.tmpl.html"></div>
                 </div>                
diff --git a/client/src/partials/login/login.html b/client/src/partials/login/login.html
index 7bc58e0b60..73b811d45b 100644
--- a/client/src/partials/login/login.html
+++ b/client/src/partials/login/login.html
@@ -36,7 +36,7 @@
                     type="text"
                     class="form-control"
                     ng-model="LoginCtrl.credentials.username"
-                    placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_USERNAME' | translate }}"
+                    placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_USERNAME' | translate }}"
                     autocomplete="off"
                     autocorrect="off"
                     autofocus
@@ -57,7 +57,7 @@
                     type="password"
                     ng-model="LoginCtrl.credentials.password"
                     class="form-control"
-                    placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PASSWORD' | translate }}"
+                    placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PASSWORD' | translate }}"
                     required />
                 </div>
               </div>
diff --git a/client/src/partials/templates/bhFindDocument.tmpl.html b/client/src/partials/templates/bhFindDocument.tmpl.html
index efcbd74780..2b6f042f93 100644
--- a/client/src/partials/templates/bhFindDocument.tmpl.html
+++ b/client/src/partials/templates/bhFindDocument.tmpl.html
@@ -15,7 +15,7 @@
         <input
           ng-model="$ctrl.searchByName"
           type="text"
-          placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_DOCUMENT_NAME' | translate }}..."
+          placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_DOCUMENT_NAME' | translate }}..."
           class="form-control">
       </div>
     </div>
diff --git a/client/src/partials/templates/modals/findEntity.modal.js b/client/src/partials/templates/modals/findEntity.modal.js
index dd6a32ebb8..d74bbbb396 100644
--- a/client/src/partials/templates/modals/findEntity.modal.js
+++ b/client/src/partials/templates/modals/findEntity.modal.js
@@ -51,8 +51,8 @@ function FindEntityModalController(Instance, Debtor, Creditor) {
     vm.entities = vm.selectedType.code === 'D' ? vm.debtorList :
       vm.selectedType.code === 'C' ? vm.creditorList : [];
 
-    vm.placeholder = vm.selectedType.code === 'D' ? 'FORM.PLACE_HOLDERS.ENTER_DEBTOR' :
-      vm.selectedType.code === 'C' ? 'FORM.PLACE_HOLDERS.ENTER_CREDITOR' : '';
+    vm.placeholder = vm.selectedType.code === 'D' ? 'FORM.PLACEHOLDERS.ENTER_DEBTOR' :
+      vm.selectedType.code === 'C' ? 'FORM.PLACEHOLDERS.ENTER_CREDITOR' : '';
   }
 
   function refresh() {
diff --git a/client/src/partials/templates/modals/location.modal.html b/client/src/partials/templates/modals/location.modal.html
index 91760463a0..1d935106c0 100644
--- a/client/src/partials/templates/modals/location.modal.html
+++ b/client/src/partials/templates/modals/location.modal.html
@@ -42,7 +42,7 @@ <h4>{{ "FORM.LABELS.CONFIRMATION" | translate }}</h4>
         class="form-control"
         name="country"
         ng-model="LocationModalCtrl.country"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_COUNTRY' | translate }}"
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_COUNTRY' | translate }}"
         required>
     </div>
 
@@ -69,7 +69,7 @@ <h4>{{ "FORM.LABELS.CONFIRMATION" | translate }}</h4>
         class="form-control"
         name="province"
         ng-model="LocationModalCtrl.province"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_PROVINCE' | translate }}"
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_PROVINCE' | translate }}"
         required>
     </div>
 
@@ -94,7 +94,7 @@ <h4>{{ "FORM.LABELS.CONFIRMATION" | translate }}</h4>
         name="sector"
         class="form-control"
         ng-model="LocationModalCtrl.sector"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_SECTOR' | translate }}"
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_SECTOR' | translate }}"
         required>
     </div>
 
@@ -109,7 +109,7 @@ <h4>{{ "FORM.LABELS.CONFIRMATION" | translate }}</h4>
         class="form-control"
         name="village"
         ng-model="LocationModalCtrl.village"
-        placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_VILLAGE' | translate }}"
+        placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_VILLAGE' | translate }}"
         required>
     </div>
 
diff --git a/client/src/partials/vouchers/complex.html b/client/src/partials/vouchers/complex.html
index e5e7f6d9b4..3fd48eb929 100644
--- a/client/src/partials/vouchers/complex.html
+++ b/client/src/partials/vouchers/complex.html
@@ -26,7 +26,7 @@
                   class="form-control"
                   name="description"
                   ng-model="ComplexVoucherCtrl.voucher.description"
-                  placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_DESCRIPTION' | translate }}"
+                  placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_DESCRIPTION' | translate }}"
                   required>
                 </textarea>
                 <div class="help-block" ng-messages="ComplexVoucherForm.description.$error" ng-show="ComplexVoucherForm.$submitted">
@@ -125,7 +125,7 @@ <h3>{{ 'VOUCHERS.COMPLEX.TITLE' | translate }}</h3>
                     <input
                       ng-model="row.account"
                       type="text"
-                      placeholder="{{ 'FORM.PLACE_HOLDERS.ENTER_ACCOUNT' | translate }}..."
+                      placeholder="{{ 'FORM.PLACEHOLDERS.ENTER_ACCOUNT' | translate }}..."
                       uib-typeahead="account as account.hrlabel for account in ComplexVoucherCtrl.accounts | filter:$viewValue | limitTo:8 "
                       typeahead-editable="false"
                       typeahead-on-select="ComplexVoucherCtrl.checkRowValidity($index)"