diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/attributes/AttributeValueKey.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/attributes/AttributeValueKey.java
index 3260678fa6..ec65c5f1e0 100644
--- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/attributes/AttributeValueKey.java
+++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/auth/attributes/AttributeValueKey.java
@@ -9,8 +9,8 @@
 
 public class AttributeValueKey {
 
-    private AccessOperation ao;
-    private AccessObjectType aot;
+    private AccessOperation accessOperation;
+    private AccessObjectType accessObjectType;
     private String role;
     private String type;
     private Set<String> namedKeyComponents = new HashSet<>();
@@ -24,8 +24,8 @@ public AttributeValueKey() {
 
     public AttributeValueKey(AccessOperation ao, AccessObjectType aot, String role, String type,
             String... namedKeyComponents) {
-        this.ao = ao;
-        this.aot = aot;
+        this.accessOperation = ao;
+        this.accessObjectType = aot;
         this.role = role;
         this.type = type;
         this.namedKeyComponents = new HashSet<>(Arrays.asList(namedKeyComponents));
@@ -33,27 +33,27 @@ public AttributeValueKey(AccessOperation ao, AccessObjectType aot, String role,
 
     public AttributeValueKey(AccessOperation ao, AccessObjectType aot, String role, String type,
             Set<String> namedKeyComponents) {
-        this.ao = ao;
-        this.aot = aot;
+        this.accessOperation = ao;
+        this.accessObjectType = aot;
         this.role = role;
         this.type = type;
         this.namedKeyComponents = namedKeyComponents;
     }
 
     public AccessOperation getAccessOperation() {
-        return ao;
+        return accessOperation;
     }
 
     public void setOperation(AccessOperation ao) {
-        this.ao = ao;
+        this.accessOperation = ao;
     }
 
     public AccessObjectType getObjectType() {
-        return aot;
+        return accessObjectType;
     }
 
     public void setObjectType(AccessObjectType aot) {
-        this.aot = aot;
+        this.accessObjectType = aot;
     }
 
     public String getRole() {
@@ -77,11 +77,11 @@ public void addNamedKey(String key) {
     }
 
     public AttributeValueKey clone() {
-        return new AttributeValueKey(ao, aot, role, type, namedKeyComponents);
+        return new AttributeValueKey(accessOperation, accessObjectType, role, type, namedKeyComponents);
     }
 
     public boolean isEmpty() {
-        return ao == null && aot == null && role == null && type == null;
+        return accessOperation == null && accessObjectType == null && role == null && type == null;
     }
 
     @Override