diff --git a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
index 64d1e61230fd8df1e1c2d2c2638b681a3edccbee..b71fa1a918a4a1389bd58d5569b8a70656002d8e 100644
--- a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
+++ b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/ACIdentityManager.java
@@ -110,7 +110,7 @@ public class ACIdentityManager implements IdentityManager
             public NumericPrincipal run() throws Exception
             {
                 LocalAuthority localAuth = new LocalAuthority();
-                URI serviceURI = localAuth.getServiceURI("ums");
+                URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString());
 
                 UserClient userClient = new UserClient(serviceURI);
                 User newUser = userClient.createUser(x500Principal);
@@ -206,7 +206,7 @@ public class ACIdentityManager implements IdentityManager
                 public Object run() throws Exception
                 {
                     LocalAuthority localAuth = new LocalAuthority();
-                    URI serviceURI = localAuth.getServiceURI("ums");
+                    URI serviceURI = localAuth.getServiceURI(Standards.UMS_USERS_01.toString());
 
                     UserClient userClient = new UserClient(serviceURI);
                     userClient.augmentSubject(subject);
@@ -236,7 +236,7 @@ public class ACIdentityManager implements IdentityManager
         {
             RegistryClient regClient = new RegistryClient();
             LocalAuthority localAuth = new LocalAuthority();
-            URI serviceURI = localAuth.getServiceURI("gms");
+            URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString());
             URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_GROUPS_01, AuthMethod.ANON);
 
             // Hack to strip off the groups endpoint to get the base url of the service.
diff --git a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
index 11c3e6b1b802ee17c02027a93a259082e9f07ac0..190ee08700d2f68219b61a9615c2c8862528b29b 100644
--- a/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
+++ b/cadcAccessControl-Identity/src/ca/nrc/cadc/auth/AuthenticatorImpl.java
@@ -74,7 +74,7 @@ public class AuthenticatorImpl implements Authenticator
         {
             RegistryClient regClient = new RegistryClient();
             LocalAuthority localAuth = new LocalAuthority();
-            URI serviceURI = localAuth.getServiceURI("gms");
+            URI serviceURI = localAuth.getServiceURI(Standards.GMS_GROUPS_01.toString());
             URL serviceURL = regClient.getServiceURL(serviceURI, Standards.GMS_GROUPS_01, AuthMethod.ANON);
 
             // Hack to strip off the groups endpoint to get the base url of the service.