diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
index 0aac1e310a..730069dbe4 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMEntryVoter.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import net.sf.acegisecurity.Authentication;
 import net.sf.acegisecurity.ConfigAttribute;
@@ -59,7 +60,7 @@ public class RMEntryVoter extends RMSecurityCommon
     private CapabilityService capabilityService;
 
     /** Policy map */
-    private HashMap<String, Policy> policies = new HashMap<String, Policy>();
+    private Map<String, Policy> policies = new HashMap<String, Policy>();
 
     /**
      * @param capabilityService     capability service
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java
index fed2793d2a..be081c65a3 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/policy/ConfigAttributeDefinition.java
@@ -19,6 +19,7 @@
 package org.alfresco.module.org_alfresco_module_rm.capability.policy;
 
 import java.util.HashMap;
+import java.util.Map;
 import java.util.StringTokenizer;
 
 import net.sf.acegisecurity.ConfigAttribute;
@@ -40,19 +41,19 @@ public class ConfigAttributeDefinition
     public static final String RM_CAP = "RM_CAP";
     public static final String RM_ABSTAIN = "RM_ABSTAIN";
     public static final String RM_QUERY = "RM_QUERY";
-    
+
     private String typeString;
 
     private String policyName;
 
     private SimplePermissionReference required;
 
-    private HashMap<Integer, Integer> parameters = new HashMap<Integer, Integer>(2, 1.0f);
+    private Map<Integer, Integer> parameters = new HashMap<Integer, Integer>(2, 1.0f);
 
     private boolean parent = false;
-    
+
     public ConfigAttributeDefinition(ConfigAttribute attr, NamespacePrefixResolver namespacePrefixResolver)
-    {        
+    {
         StringTokenizer st = new StringTokenizer(attr.getAttribute(), ".", false);
         if (st.countTokens() < 1)
         {
@@ -97,27 +98,27 @@ public class ConfigAttributeDefinition
             }
         }
     }
-    
+
     public String getTypeString()
     {
         return typeString;
     }
-    
+
     public String getPolicyName()
     {
         return policyName;
     }
-    
+
     public SimplePermissionReference getRequired()
     {
         return required;
     }
-    
-    public HashMap<Integer, Integer> getParameters()
+
+    public Map<Integer, Integer> getParameters()
     {
         return parameters;
     }
-    
+
     public boolean isParent()
     {
         return parent;
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
index f539da1e07..e1b8165ed6 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/fileplan/FilePlanServiceImpl.java
@@ -20,6 +20,7 @@ package org.alfresco.module.org_alfresco_module_rm.fileplan;
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Deque;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -375,7 +376,7 @@ public class FilePlanServiceImpl extends ServiceBaseImpl
     /**
      * Helper method to build a <b>NodeRef</b> path from the node to the RM root
      */
-    private void getNodeRefPathRecursive(NodeRef nodeRef, LinkedList<NodeRef> nodeRefPath)
+    private void getNodeRefPathRecursive(NodeRef nodeRef, Deque<NodeRef> nodeRefPath)
     {
         if (!isFilePlanComponent(nodeRef))
         {