diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
index a8ef0ea7bf..d23a9f7b37 100644
--- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
+++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
@@ -1132,11 +1132,11 @@
 		          <tokenised>false</tokenised>
 		       </index>
             </property>
-            <property name="rma:recordSearchDeclassificationReviewCompletedAt">
+            <property name="rma:declassificationReviewCompletedAt">
                <type>d:date</type>
                <protected>true</protected>
             </property>
-            <property name="rma:recordSearchDeclassificationReviewCompletedBy">
+            <property name="rma:declassificationReviewCompletedBy">
                <type>d:text</type>
                <protected>true</protected>
                <index enabled="true">
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java
index 9d59693d28..c8d474cac8 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionActionImpl.java
@@ -330,6 +330,7 @@ public class DispositionActionImpl implements DispositionAction,
                     props.put(PROP_EVENT_EXECUTION_COMPLETED_BY, completedByValue);
                     services.getNodeService().setProperties(eventNodeRef, props);
 
+                    // check a specific event from rmEventConfigBootstrap.json
                     if (eventName.equals("declassification_review"))
                     {
                         setDeclassificationReview(eventNodeRef, completedAtValue, completedByValue);
@@ -537,11 +538,7 @@ public class DispositionActionImpl implements DispositionAction,
     {
         NodeRef nextDispositionActionNodeRef = services.getNodeService().getPrimaryParent(eventNodeRef).getParentRef();
         NodeRef nodeRef = services.getNodeService().getPrimaryParent(nextDispositionActionNodeRef).getParentRef();
-
-        Map<QName, Serializable> nodeProps = services.getNodeService().getProperties(nodeRef);
-        nodeProps.put(PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_AT, completedAtValue);
-        nodeProps.put(PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_BY, completedByValue);
-        services.getNodeService().setProperties(nodeRef, nodeProps);
+        setPropsOnContent(nodeRef, completedAtValue, completedByValue);
 
         // check if the node is a record folder then set the declassification review on the records also
         if (services.getNodeService().getType(nodeRef).equals(RecordsManagementModel.TYPE_RECORD_FOLDER))
@@ -551,11 +548,16 @@ public class DispositionActionImpl implements DispositionAction,
             for (ChildAssociationRef child : records)
             {
                 NodeRef recordNodeRef = child.getChildRef();
-                Map<QName, Serializable> recordProps = services.getNodeService().getProperties(recordNodeRef);
-                recordProps.put(PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_AT, completedAtValue);
-                recordProps.put(PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_BY, completedByValue);
-                services.getNodeService().setProperties(recordNodeRef, recordProps);
+                setPropsOnContent(recordNodeRef, completedAtValue, completedByValue);
             }
         }
     }
+
+    private void setPropsOnContent(NodeRef nodeRef, Date completedAtValue, String completedByValue)
+    {
+        Map<QName, Serializable> nodeProps = services.getNodeService().getProperties(nodeRef);
+        nodeProps.put(PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_AT, completedAtValue);
+        nodeProps.put(PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_BY, completedByValue);
+        services.getNodeService().setProperties(nodeRef, nodeProps);
+    }
 }
diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
index e7f23fb9c9..0b77311cf4 100644
--- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
+++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/model/RecordsManagementModel.java
@@ -247,8 +247,8 @@ public interface RecordsManagementModel extends RecordsManagementCustomModel
     QName PROP_RS_HAS_DISPOITION_SCHEDULE = QName.createQName(RM_URI, "recordSearchHasDispositionSchedule");
     QName PROP_RS_DISPOITION_INSTRUCTIONS = QName.createQName(RM_URI, "recordSearchDispositionInstructions");
     QName PROP_RS_DISPOITION_AUTHORITY = QName.createQName(RM_URI, "recordSearchDispositionAuthority");
-    QName PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_AT = QName.createQName(RM_URI, "recordSearchDeclassificationReviewCompletedAt");
-    QName PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_BY = QName.createQName(RM_URI, "recordSearchDeclassificationReviewCompletedBy");
+    QName PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_AT = QName.createQName(RM_URI, "declassificationReviewCompletedAt");
+    QName PROP_RS_DECLASSIFICATION_REVIEW_COMPLETED_BY = QName.createQName(RM_URI, "declassificationReviewCompletedBy");
     /** @depreacted as of 2.2, because disposable items can now be in multiple holds */
     @Deprecated
     QName PROP_RS_HOLD_REASON = QName.createQName(RM_URI, "recordSearchHoldReason");