diff --git a/frontend/client/res/templates/admin/layouts/rows.tpl b/frontend/client/res/templates/admin/layouts/rows.tpl
index ca2eab2107..f7c75a8fbe 100644
--- a/frontend/client/res/templates/admin/layouts/rows.tpl
+++ b/frontend/client/res/templates/admin/layouts/rows.tpl
@@ -70,7 +70,7 @@
 			<header>Enabled</header>
 			<ul class="enabled connected">
 				{{#each layout}}
-					<li draggable="true" {{#each ../dataAttributes}}data-{{this}}="{{attr ../this this}}" {{/each}}>
+					<li draggable="true" {{#each ../dataAttributes}}data-{{this}}="{{prop ../this this}}" {{/each}}>
 						<div class="left">
 							<label>{{label}}</label>
 						</div>
diff --git a/frontend/client/res/templates/fields/array/edit.tpl b/frontend/client/res/templates/fields/array/edit.tpl
index 71d056eeb5..ed4ab053a7 100644
--- a/frontend/client/res/templates/fields/array/edit.tpl
+++ b/frontend/client/res/templates/fields/array/edit.tpl
@@ -2,7 +2,7 @@
 {{#each selected}}
 	<div class="list-group-item" data-value="{{this}}">
 		{{#if ../translatedOptions}}
-			{{attr ../../translatedOptions this}}&nbsp;
+			{{prop ../../translatedOptions this}}&nbsp;
 		{{else}}
 			{{this}}
 		{{/if}}
diff --git a/frontend/client/res/templates/modals/array-field-add.tpl b/frontend/client/res/templates/modals/array-field-add.tpl
index 94e72594d8..57b29f80ac 100644
--- a/frontend/client/res/templates/modals/array-field-add.tpl
+++ b/frontend/client/res/templates/modals/array-field-add.tpl
@@ -4,7 +4,7 @@
 <ul class="list-group">
 {{#each optionList}}
 	<li class="list-group-item clearfix">
-		{{#if ../translatedOptions}}{{attr ../../translatedOptions this}}{{else}}{{this}}{{/if}}
+		{{#if ../translatedOptions}}{{prop ../../translatedOptions this}}{{else}}{{this}}{{/if}}
 		<button class="btn btn-default pull-right" data-value="{{this}}" data-action="add">{{translate 'Add'}}</button>
 	</li>
 {{/each}}
diff --git a/frontend/client/res/templates/preferences/fields/smtp-email-address/detail.tpl b/frontend/client/res/templates/preferences/fields/smtp-email-address/detail.tpl
index 2a9ed0e6c8..d3f7d0cf93 100644
--- a/frontend/client/res/templates/preferences/fields/smtp-email-address/detail.tpl
+++ b/frontend/client/res/templates/preferences/fields/smtp-email-address/detail.tpl
@@ -3,6 +3,6 @@
 {{else}}
 	<span class="text-danger">{{translate 'userHasNoEmailAddress' category='messages' scope='Admin'}}</span>
 	{{#if isAdmin}}
-		<a href="#User/edit/{{attr model 'id'}}">{{translate 'Edit'}}</a>
+		<a href="#User/edit/{{prop model 'id'}}">{{translate 'Edit'}}</a>
 	{{/if}}
 {{/if}}
diff --git a/frontend/client/res/templates/record/merge.tpl b/frontend/client/res/templates/record/merge.tpl
index 78b818c1d5..5530d0d61a 100644
--- a/frontend/client/res/templates/record/merge.tpl
+++ b/frontend/client/res/templates/record/merge.tpl
@@ -6,10 +6,10 @@
 				<th width="20%"></th>				
 				{{#each models}}
 				<th width="5%">
-					<input type="radio" name="check-all" value="{{attr this 'id'}}" data-id="{{id}}" class="pull-right">
+					<input type="radio" name="check-all" value="{{prop this 'id'}}" data-id="{{id}}" class="pull-right">
 				</th>
 				<th>
-					<a href="#{{../scope}}/view/{{attr this 'id'}}">{{get this 'name'}}</a>
+					<a href="#{{../scope}}/view/{{prop this 'id'}}">{{get this 'name'}}</a>
 				</th>
 				{{/each}}
 			</tr>
diff --git a/frontend/client/res/templates/role/table.tpl b/frontend/client/res/templates/role/table.tpl
index b9e74cce67..534d5bc8a1 100644
--- a/frontend/client/res/templates/role/table.tpl
+++ b/frontend/client/res/templates/role/table.tpl
@@ -14,7 +14,7 @@
 				{{#if ../editMode}}
 					<select name="{{name}}" class="form-control" data-type="access">{{options ../../accessList access scope='Role' field='accessList'}}</select>
 				{{else}}
-					<span style="color: {{attr ../../colors access}};">{{translateOption access scope='Role' field='accessList'}}</span>
+					<span style="color: {{prop ../../colors access}};">{{translateOption access scope='Role' field='accessList'}}</span>
 				{{/if}}	
 			</td>					
 			
@@ -26,7 +26,7 @@
 						</select>
 					{{else}}
 						{{#ifNotEqual ../../access 'not-set'}}
-							<span style="color: {{attr ../../../../colors level}};">{{translateOption ../level field='levelList' scope='Role'}}</span>
+							<span style="color: {{prop ../../../../colors level}};">{{translateOption ../level field='levelList' scope='Role'}}</span>
 						{{/ifNotEqual}}
 					{{/if}}					
 				</td>
diff --git a/frontend/client/src/view-helper.js b/frontend/client/src/view-helper.js
index 4b202913fc..d29ce81896 100644
--- a/frontend/client/src/view-helper.js
+++ b/frontend/client/src/view-helper.js
@@ -46,7 +46,7 @@
 				return new Handlebars.SafeString("<img src=\"img/" + img + "\"></img>");
 			});
 
-			Handlebars.registerHelper('attr', function (object, name) {
+			Handlebars.registerHelper('prop', function (object, name) {
 				if (name in object) {
 					return object[name];
 				}