diff --git a/core/src/main/resources/hudson/model/User/index.jelly b/core/src/main/resources/hudson/model/User/index.jelly
index d4895ca5a119095265cdee1d4a5d6417197327e8..b16f2b3e63761c7db7856335bafe3e1a2b7a0043 100644
--- a/core/src/main/resources/hudson/model/User/index.jelly
+++ b/core/src/main/resources/hudson/model/User/index.jelly
@@ -32,7 +32,7 @@ THE SOFTWARE.
       </h1>
       <t:editableDescription permission="${app.ADMINISTER}" />
       <div>
-        ${%Jenkins User Id}: ${it.id}
+        ${%Jenkins User ID}: ${it.id}
       </div>
       <!-- give properties a chance to contribute summary item -->
       <j:forEach var="p" items="${it.allProperties}">
diff --git a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
index 8bcfe21fc7debdf881861869da12e1f0eb483697..ffdcd6d2f351a75f4e1fe6ecc9912259dbfe8ed6 100644
--- a/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
+++ b/core/src/main/resources/hudson/model/View/AsynchPeople/index.jelly
@@ -101,7 +101,7 @@ THE SOFTWARE.
       <table class="sortable pane bigtable" id="people">
         <tr>
           <th />
-          <th>${%User Id}</th>
+          <th>${%User ID}</th>
           <th>${%Name}</th>
           <th initialSortDir="up">${%Last Commit Activity}</th>
           <th>${%On}</th>
diff --git a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
index 9b7fe9d0fae2be471385ab3aecdaddf90f254aa0..a7cad84726f1fda839af513793310c15b4aff4e3 100644
--- a/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
+++ b/core/src/main/resources/hudson/security/HudsonPrivateSecurityRealm/index.jelly
@@ -33,7 +33,7 @@ THE SOFTWARE.
       <table class="sortable pane bigtable" id="people">
         <tr>
           <th style="width:32px"/>
-          <th>${%User Id}</th>
+          <th>${%User ID}</th>
           <th>${%Name}</th>
           <th style="width:32px"/>
         </tr>
diff --git a/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties b/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties
index 44470a3c2b9ca6c4fadff861c913f87cef5fafb8..a42853e5049257f1e3a33107cb91b76b020b0cac 100644
--- a/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties
+++ b/core/src/main/resources/jenkins/security/apitoken/LegacyApiTokenAdministrativeMonitor/manage.properties
@@ -9,7 +9,7 @@ recommendationMessage=For such reasons, we recommend you: \
   <li>revoke the tokens that were never used and</li>\
   <li>ask users that are currently using their legacy token to generate a token using the new system and revoke their legacy token</li>\
 </ul>
-UserId=User Id
+UserId=User ID
 UserFullName=User full name
 TokenName=Token name
 NumDaysSinceCreation=Days since creation