diff --git a/templates/accountProfiles/alumni1.tt2 b/templates/accountProfiles/alumni1.tt2
index 7ca5621feb3f7f95698e58de44b82ce91a9b5b0e..d89e98747e27649bafa358cbaec01d07e9a413bc 100644
--- a/templates/accountProfiles/alumni1.tt2
+++ b/templates/accountProfiles/alumni1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Alumni',
diff --git a/templates/accountProfiles/employee1.tt2 b/templates/accountProfiles/employee1.tt2
index d39b4767196272d64972631034e8b33ed20b0668..88f328238672305beced955ccf9049e5d49266b1 100644
--- a/templates/accountProfiles/employee1.tt2
+++ b/templates/accountProfiles/employee1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Employee',
diff --git a/templates/accountProfiles/fullset1.tt2 b/templates/accountProfiles/fullset1.tt2
index 834e447760c74164677eacacc03a95a131b43c35..6ddaa4879a0828a4634881c7b079ff7a8b6e046e 100644
--- a/templates/accountProfiles/fullset1.tt2
+++ b/templates/accountProfiles/fullset1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'FullSet',
diff --git a/templates/accountProfiles/generic1.tt2 b/templates/accountProfiles/generic1.tt2
index 6a5712b99125df284da89b530e1322f1515270aa..ed49adbaf2d62e4670277dded8dd52df5851223a 100644
--- a/templates/accountProfiles/generic1.tt2
+++ b/templates/accountProfiles/generic1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Generic',
diff --git a/templates/accountProfiles/librarywalkin1.tt2 b/templates/accountProfiles/librarywalkin1.tt2
index 8da2788285e39342a7e85e0fe2a2c0a3edc4f184..096b1ec3302858bf861f6cd3f1da8818967fb4f3 100644
--- a/templates/accountProfiles/librarywalkin1.tt2
+++ b/templates/accountProfiles/librarywalkin1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Library walk-in',
diff --git a/templates/accountProfiles/limitedset1.tt2 b/templates/accountProfiles/limitedset1.tt2
index edaa4839cea4fcaf2702864e0ff25db262f98d9a..6beb400f3625004c31333a4b983472d84264eefa 100644
--- a/templates/accountProfiles/limitedset1.tt2
+++ b/templates/accountProfiles/limitedset1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'LimitedSet',
diff --git a/templates/accountProfiles/researcher1.tt2 b/templates/accountProfiles/researcher1.tt2
index 1971535423219541d75413720bf2e63b5d7f4700..f2e57b47a7ee74d7d7e2a3e98adcf4f45edadda3 100644
--- a/templates/accountProfiles/researcher1.tt2
+++ b/templates/accountProfiles/researcher1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Researcher',
diff --git a/templates/accountProfiles/student1.tt2 b/templates/accountProfiles/student1.tt2
index a9bf528875e45ca528d3965294cf5a2c3c8b1662..3a6e7c65aaa1dec99992c81434847ef84e1f1a6d 100644
--- a/templates/accountProfiles/student1.tt2
+++ b/templates/accountProfiles/student1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Student',
diff --git a/templates/accountProfiles/student2.tt2 b/templates/accountProfiles/student2.tt2
index b0fdc7d85f9b519c2e589570d0bcbc0993d41de0..60bf538cb0463d43c9a5ba049bdb95e97753e27c 100644
--- a/templates/accountProfiles/student2.tt2
+++ b/templates/accountProfiles/student2.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Student',
diff --git a/templates/accountProfiles/teacher1.tt2 b/templates/accountProfiles/teacher1.tt2
index 606d95aa9ed636b73416f2b1b0dc51f6eb697932..0128501f8bc3c5012c631e248cecdcbfc1ad59d0 100644
--- a/templates/accountProfiles/teacher1.tt2
+++ b/templates/accountProfiles/teacher1.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Teacher',
diff --git a/templates/accountProfiles/teacher2.tt2 b/templates/accountProfiles/teacher2.tt2
index 8b8b749bfdd571f5d49113943edabd1cd530ab26..f7a4807bb3ae38940243e12c16f40126fe5d2134 100644
--- a/templates/accountProfiles/teacher2.tt2
+++ b/templates/accountProfiles/teacher2.tt2
@@ -1,5 +1,5 @@
-[% account_sp_entityid = account.get('sp_entityid') %]
-[% account_id = account.get('id') %]
+[% account_sp_entityid = account.sp_entityid() %]
+[% account_id = account.id() %]
 
 [% SET account_profile = {
 	'type' => 'Teacher',
diff --git a/templates/accountProfiles/valid-accounts.php.tt2 b/templates/accountProfiles/valid-accounts.php.tt2
index 297d040e92e74ce8a9805c7e4a6a751ea45876ed..e067406b479e48d38d1127fd2431c5d2baef9018 100644
--- a/templates/accountProfiles/valid-accounts.php.tt2
+++ b/templates/accountProfiles/valid-accounts.php.tt2
@@ -4,8 +4,8 @@ $validTestAccounts = array (
     'authcrypt:Hash',
 
 [% FOREACH account IN accounts %]
-  [% PROCESS "${account.get('account_profile')}.tt2" %]
-  'user[% account.get('id') %]:{SHA256}[% account.get('user_password_hash') %]=' => array(
+  [% PROCESS "${account.account_profile()}.tt2" %]
+  'user[% account.id() %]:{SHA256}[% account.user_password_hash() %]=' => array(
   [% FOREACH attribute IN account_profile.pairs -%]
    [% NEXT IF attribute.key.match('^(type|comment)$') %]
    [% IF attribute.value.isa('SCALAR') -%]
@@ -14,7 +14,7 @@ $validTestAccounts = array (
 	'[% attribute.key %]' => array('[% attribute.value.join("','") %]'),
    [% END %]
   [% END %]
-        'associatedSP' => "[% account.get('sp_entityid') %]",
+        'associatedSP' => "[% account.sp_entityid() %]",
 
   ),