diff --git a/src/main/java/uk/co/techblue/alfresco/dto/common/GroupSorter.java b/src/main/java/uk/co/techblue/alfresco/dto/common/GroupSorter.java
index 965e3a7..992b127 100644
--- a/src/main/java/uk/co/techblue/alfresco/dto/common/GroupSorter.java
+++ b/src/main/java/uk/co/techblue/alfresco/dto/common/GroupSorter.java
@@ -21,11 +21,11 @@
 public enum GroupSorter {
 	
 	/** The authority name. */
-	authorityName,
+	AUTHORITY_NAME,
 	
 	/** The short name. */
-	shortName,
+	SHORT_NAME,
 	
 	/** The display name. */
-	displayName
+	DISPLAY_NAME
 }
\ No newline at end of file
diff --git a/src/main/java/uk/co/techblue/alfresco/dto/common/UserRole.java b/src/main/java/uk/co/techblue/alfresco/dto/common/UserRole.java
index 5a054b1..d2fd1dc 100644
--- a/src/main/java/uk/co/techblue/alfresco/dto/common/UserRole.java
+++ b/src/main/java/uk/co/techblue/alfresco/dto/common/UserRole.java
@@ -21,17 +21,17 @@
 public enum UserRole {
     
     /** The Owner. */
-    Owner, 
- /** The Coordinator. */
- Coordinator, 
- /** The Collaborator. */
- Collaborator, 
- /** The Contributor. */
- Contributor, 
- /** The Editor. */
- Editor, 
- /** The Consumer. */
- Consumer, 
- /** The All. */
- All
+    OWNER,
+    /** The Coordinator. */
+    COORDINATOR,
+    /** The Collaborator. */
+    COLLABORATOR,
+    /** The Contributor. */
+    CONTRIBUTOR,
+    /** The Editor. */
+    EDITOR,
+    /** The Consumer. */
+    CONSUMER,
+    /** The All. */
+    ALL
 }
diff --git a/src/test/java/uk/co/techblue/alfresco/client/test/AlfrescoServiceTest.java b/src/test/java/uk/co/techblue/alfresco/client/test/AlfrescoServiceTest.java
index 78457f8..d9db952 100644
--- a/src/test/java/uk/co/techblue/alfresco/client/test/AlfrescoServiceTest.java
+++ b/src/test/java/uk/co/techblue/alfresco/client/test/AlfrescoServiceTest.java
@@ -189,7 +189,7 @@ private static void testGetParentAuthorities() {
         final GroupService userService = new GroupService(BASE_URL, AUTH_TICKET);
         try {
             final AuthorityQuery authorityQuery = new AuthorityQuery();
-            authorityQuery.setSortBy(GroupSorter.authorityName);
+            authorityQuery.setSortBy(GroupSorter.AUTHORITY_NAME);
             System.out.println(userService.getParentAuthorities(
                 "EMAIL_CONTRIBUTORS", authorityQuery));
         } catch (final GroupException e) {
@@ -201,7 +201,7 @@ private static void testGetChildAuthorities() {
         final GroupService userService = new GroupService(BASE_URL, AUTH_TICKET);
         try {
             final AuthorityQuery authorityQuery = new AuthorityQuery();
-            authorityQuery.setSortBy(GroupSorter.authorityName);
+            authorityQuery.setSortBy(GroupSorter.AUTHORITY_NAME);
             System.out.println(userService.getChildAuthorities(
                 "ALFRESCO_ADMINISTRATORS", authorityQuery));
         } catch (final GroupException e) {