diff --git a/templates/accountProfiles/alumni1.tt2 b/templates/accountProfiles/alumni1.tt2
index fd689b5b24cdb0c328a274384c0c7f75d1db0102..aa710630ba1274431c5d1c941b9305e4f415cb41 100644
--- a/templates/accountProfiles/alumni1.tt2
+++ b/templates/accountProfiles/alumni1.tt2
@@ -4,8 +4,7 @@
[% SET account_profile = {
'type' => 'Alumni',
'comment' => 'Value "member" is not set for eduPersonAffiliation, contrary to current students.',
- 'internal_uid' => "${account_id}",
- 'uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'eduPersonAffiliation' => ['alum'],
'eduPersonScopedAffiliation' => ["alum@${conf.idp_scope}"],
'displayName' => 'Åsold Wahlstrøm',
diff --git a/templates/accountProfiles/employee1.tt2 b/templates/accountProfiles/employee1.tt2
index 02f4b62d3a3e2b33751778d8d8ae05a89969fe6f..ef9b1fff60a65a382b8247884f4c4686dd979de9 100644
--- a/templates/accountProfiles/employee1.tt2
+++ b/templates/accountProfiles/employee1.tt2
@@ -4,8 +4,7 @@
[% SET account_profile = {
'type' => 'Employee',
'comment' => 'There are conflicting definitions of "staff" and "employee" from country to country that make those values particularly unreliable in any international context. However in this example we set both values.',
- 'internal_uid' => "${account_id}",
- 'uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'eduPersonAffiliation' => ['member','staff','employee'],
'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}","staff@${conf.idp_scope}","employee@${conf.idp_scope}"],
'displayName' => 'Linnéa Hsu',
diff --git a/templates/accountProfiles/generic1.tt2 b/templates/accountProfiles/generic1.tt2
index 95c7eb0794404a374b1c5eb48730aa08ee270c8c..350cda7d5c4837d1f2ad9cb52bac756a6a97319b 100644
--- a/templates/accountProfiles/generic1.tt2
+++ b/templates/accountProfiles/generic1.tt2
@@ -4,7 +4,7 @@
[% SET account_profile = {
'type' => 'Generic',
'comment' => 'This account provides a limited set of user attributes (eduPersonPrincipalName, mail and displayName).',
- 'internal_uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'displayName' => '山崎 弘å樫野 陽å',
'mail' => "forearartian@${conf.idp_scope}",
'eduPersonPrincipalName' =>"${account_id}@${conf.idp_scope}",
diff --git a/templates/accountProfiles/librarywalkin1.tt2 b/templates/accountProfiles/librarywalkin1.tt2
index 7c4dc4fb03131580f0b74c618b3c23488dd0ca9f..a9216d1079c6a44657266f9723899fb44cad81cc 100644
--- a/templates/accountProfiles/librarywalkin1.tt2
+++ b/templates/accountProfiles/librarywalkin1.tt2
@@ -4,8 +4,7 @@
[% SET account_profile = {
'type' => 'Library walk-in',
'comment' => 'This term was created to cover the case where physical presence in a library facility grants someone access to electronic resources typically licensed for faculty, staff and students. In recent years the library walk-in provision has been extended to cover other cases such as library users on the campus network, or those using on-campus workstations. Licensed resource providers have often been willing to interpret their contracts with licensees to accept this broader definition of "library-walk-in," though specific terms may vary. For a more direct way of using eduPerson attributes to express library privilege information, see the eduPersonEntitlement value "urn:mace:dir:entitlement:common-lib-terms" as defined in the MACE-Dir Registry of eduPersonEntitlement values <a href="http://middleware.internet2.edu/urn-mace/urn-mace-dir-entitlement.html">http://middleware.internet2.edu/urn-mace/urn-mace-dir-entitlement.html</a>.',
- 'internal_uid' => "${account_id}",
- 'uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'eduPersonAffiliation' => ['library-walk-in'],
'eduPersonScopedAffiliation' => ["library-walk-in@${conf.idp_scope}"],
'displayName' => 'Ramón Núñez',
diff --git a/templates/accountProfiles/researcher1.tt2 b/templates/accountProfiles/researcher1.tt2
index 538028d3db4aaa69dc91efd76c0c9e65610ea759..60342137f1cd052e5663687e3df3bce72c800f0f 100644
--- a/templates/accountProfiles/researcher1.tt2
+++ b/templates/accountProfiles/researcher1.tt2
@@ -4,8 +4,7 @@
[% SET account_profile = {
'type' => 'Researcher',
'comment' => "No standard value for eduPersonAffiliation can be used to represent a researcher. Therefore you can't differenciate a teacher from a researcher.",
- 'internal_uid' => "${account_id}",
- 'uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'eduPersonAffiliation' => ['member', 'faculty'],
'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "faculty@${conf.idp_scope}"],
'displayName' => 'Stéphane Larivière',
diff --git a/templates/accountProfiles/student1.tt2 b/templates/accountProfiles/student1.tt2
index aacaa1f4ca1b71045797243116acb1be196362c9..d6ed41fdf08e5868f5d4601d8408ee0c391ddc59 100644
--- a/templates/accountProfiles/student1.tt2
+++ b/templates/accountProfiles/student1.tt2
@@ -4,8 +4,7 @@
[% SET account_profile = {
'type' => 'Student',
'comment' => 'An active student has both "member" and "student" values set for eduPersonAffiliation.',
- 'internal_uid' => "${account_id}",
- 'uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'eduPersonAffiliation' => ['member', 'student'],
'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}","student@${conf.idp_scope}"],
'displayName' => 'Ciarán MacCárthaigh',
diff --git a/templates/accountProfiles/student2.tt2 b/templates/accountProfiles/student2.tt2
index 476c4249a6520870fbb23037041e6a07764bb69d..cea268fb2efe41b96f37a6f24f48c89b0e60e571 100644
--- a/templates/accountProfiles/student2.tt2
+++ b/templates/accountProfiles/student2.tt2
@@ -4,8 +4,7 @@
[% SET account_profile = {
'type' => 'Student',
'comment' => 'A PhD student, having three values set for eduPersonAffiliation: "member" and "student" and "faculty".',
- 'internal_uid' => "${account_id}",
- 'uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'eduPersonAffiliation' => ['member', 'student','faculty'],
'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}","student@${conf.idp_scope}","faculty@${conf.idp_scope}"],
'displayName' => 'Damiën Kuijper',
diff --git a/templates/accountProfiles/teacher1.tt2 b/templates/accountProfiles/teacher1.tt2
index 79e53fb13b2644b154912b3fa7552c246893093a..38b298ccf26600661b9f4afc326f8cc92463c0d1 100644
--- a/templates/accountProfiles/teacher1.tt2
+++ b/templates/accountProfiles/teacher1.tt2
@@ -4,8 +4,7 @@
[% SET account_profile = {
'type' => 'Teacher',
'comment' => 'An active teacher has both "member" and "faculty" values set for eduPersonAffiliation.',
- 'internal_uid' => "${account_id}",
- 'uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'eduPersonAffiliation' => ['member', 'faculty'],
'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "faculty@${conf.idp_scope}"],
'displayName' => 'Peter Müller',
diff --git a/templates/accountProfiles/teacher2.tt2 b/templates/accountProfiles/teacher2.tt2
index 58b76fe18bb756da8fcd8f9f7cf2d37a1567c868..dea6e52a4fa68a205a02a5e87d5f0fe66c7d7a51 100644
--- a/templates/accountProfiles/teacher2.tt2
+++ b/templates/accountProfiles/teacher2.tt2
@@ -4,7 +4,7 @@
[% SET account_profile = {
'type' => 'Teacher',
'comment' => 'This account provides a limited set of user attributes (eduPersonScopedAffiliation and eduPersonTargetedID).',
- 'internal_uid' => "${account_id}",
+ 'uid' => "user${account_id}",
'eduPersonScopedAffiliation' => ["member@${conf.idp_scope}", "faculty@${conf.idp_scope}"],
} %]
diff --git a/templates/web/validate_token.tt2.html b/templates/web/validate_token.tt2.html
index bd04d0eb2cf12188db83d57f7e8e952bf1b82e07..0db47fa782bceaa31f548f3bf122aa0da74d05cc 100644
--- a/templates/web/validate_token.tt2.html
+++ b/templates/web/validate_token.tt2.html
@@ -43,7 +43,7 @@
<table>
<caption>List of user attributes</caption>
[% FOREACH attribute IN account_profile.pairs -%]
- [% NEXT IF attribute.key.match('^(type|comment|internal_uid)$') %]
+ [% NEXT IF attribute.key.match('^(type|comment|uid)$') %]
[% IF attribute.value.isa('SCALAR') -%]
<tr>