diff --git a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
index ede402b625..627a3feef5 100644
--- a/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
+++ b/rm-server/config/alfresco/module/org_alfresco_module_rm/alfresco-global.properties
@@ -73,7 +73,7 @@ rm.completerecord.mandatorypropertiescheck.enabled=true
 rm.patch.v22.convertToStandardFilePlan=false
 
 #
-# Extended auto-version behaviour.  If true and other auto-version properties are satisified, then
-# a document will be auto-versioned when it's type is changed.
+# Extended auto-version behaviour.  If true and other auto-version properties are satisfied, then
+# a document will be auto-versioned when its type is changed.
 #
 version.store.enableAutoVersionOnTypeChange=false
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java
index 27c1257166..31200792e8 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/version/ExtendedVersionableAspect.java
@@ -142,13 +142,13 @@ public class ExtendedVersionableAspect implements NodeServicePolicies.OnSetNodeT
     public void onSetNodeType(NodeRef nodeRef, QName oldType, QName newType)
     {
         if (isAutoVersionOnTypeChange &&
-            nodeService.exists(nodeRef) == true && 
+            nodeService.exists(nodeRef) && 
             !LockUtils.isLockedAndReadOnly(nodeRef, lockService) &&
-            nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) == true && 
-            nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY) == false)
+            nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE) && 
+            !nodeService.hasAspect(nodeRef, ContentModel.ASPECT_TEMPORARY))
         {
             Map<NodeRef, NodeRef> versionedNodeRefs = (Map)alfrescoTransactionSupport.getResource(KEY_VERSIONED_NODEREFS);
-            if (versionedNodeRefs == null || versionedNodeRefs.containsKey(nodeRef) == false)
+            if (versionedNodeRefs == null || !versionedNodeRefs.containsKey(nodeRef))
             {
                 // Determine whether the node is auto versionable (for content updates) or not
                 boolean autoVersion = false;