diff --git a/backend/src/main/java/com/nttdata/calender/changes/Change.java b/backend/src/main/java/com/nttdata/calender/changes/Change.java
index 3c28183..fdb93ce 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/Change.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/Change.java
@@ -142,16 +142,13 @@ public class Change {
                                                         .filter(peopleFullName::equals)
                                                         .isPresent());
 
-                        var currentState = getValue(entry, "State").getIntValue();
-
+                        var state = getValue(entry, "State").getIntValue();
                         var inApproval = inApprovalList(api.getUser(), getValueStringByID(entry, "ChangeNr"));
-                        var cancel = flagCancel(getValueStringByID(entry, "SupportGroupId"), currentState);
-                        var approve_reject = flagApproval(inApproval, currentState);
 
-                        change.setFlagApprove(approve_reject);
-                        change.setFlagReject(approve_reject);
-                        change.setFlagCancel(cancel);
-                        change.setFlagToApproval(flagToApproval(currentState));
+                        change.setFlagPermit(flagPermit(state));
+                        change.setFlagApprove(flagApproval(inApproval, state));
+                        change.setFlagReject(flagApproval(inApproval, state));
+                        change.setFlagCancel(flagCancel(getValueStringByID(entry, "SupportGroupId"), state));
 
                         changes.add(change);
                 }
@@ -160,18 +157,6 @@ public class Change {
                 return new ChangeResponse(entriesSize, changes);
         }
 
-        public boolean inApprovalList(String user, String changeNr) throws ARException {
-                var queryApprovalList = new Query.QueryBuilder("ASF:OverviewConsole_TicketsJoinAPDetailSignature")
-                                .addFieldId("Approvers", 13207).build();
-
-                var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"",
-                                queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0);
-
-                var approvers = approversOI.isEmpty() ? null
-                                : approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString();
-                return approvers != null ? approvers.contains(user) : false;
-        }
-
         public boolean flagApproval(boolean approval, int status) {
                 boolean approvableStatus = (status == 1 || status == 10);
                 return approval && approvableStatus;
@@ -186,13 +171,24 @@ public class Change {
 
                 boolean approvableStatus = status == 1;
                 boolean isChangeManager = role.equals("Change Manager");
+                
                 return approvableStatus && isChangeManager;
         }
 
-        public boolean flagToApproval(int status) {
+        public boolean flagPermit(int status) {
                 return status == 0;
         }
 
+        public boolean inApprovalList(String user, String changeNr) throws ARException {
+                var queryApprovalList = new Query.QueryBuilder("ASF:OverviewConsole_TicketsJoinAPDetailSignature")
+                                .addFieldId("Approvers", 13207).build();
+                var approversOI = api.queryFieldsById("\'Ticketnumber\' = \"" + changeNr + "\"",
+                                queryApprovalList.getFieldIds(), queryApprovalList.getFormName(), null, 0, 0);
+                var approvers = approversOI.isEmpty() ? null
+                                : approversOI.get(0).get(queryApprovalList.getFieldId("Approvers")).toString();
+                return approvers != null ? approvers.contains(user) : false;
+        }
+
         /**
          * Returns the {@link Value} of an entry based on the provided description.
          *
diff --git a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
index 9008c91..1f1f8f0 100644
--- a/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
+++ b/backend/src/main/java/com/nttdata/calender/changes/ChangeItem.java
@@ -31,7 +31,7 @@ public class ChangeItem {
     private Date D2;
     private Date D3;
     private Date D4;
-    private boolean flagToApproval;
+    private boolean flagPermit;
     private boolean flagApprove;
     private boolean flagReject;
     private boolean flagCancel;
@@ -160,12 +160,12 @@ public class ChangeItem {
         this.changeImplementerPersonId = changeImplementerPersonId;
     }
 
-    public boolean getFlagToApproval() {
-        return this.flagToApproval;
+    public boolean getFlagPermit() {
+        return this.flagPermit;
     }
 
-    public void setFlagToApproval(boolean flagToApproval) {
-        this.flagToApproval = flagToApproval;
+    public void setFlagPermit(boolean flagPermit) {
+        this.flagPermit = flagPermit;
     }
 
     public boolean getFlagApprove() {