diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
index 2529a69ce0..529a43182f 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/util/ServiceBaseImpl.java
@@ -81,7 +81,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
     /**
      * Gets the file plan component kind from the given node reference
      *
-     * @see org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService#getFilePlanComponentKind(org.alfresco.service.cmr.repository.NodeRef)
+     * @see FilePlanService#getFilePlanComponentKind(org.alfresco.service.cmr.repository.NodeRef)
      */
     public FilePlanComponentKind getFilePlanComponentKind(NodeRef nodeRef)
     {
@@ -191,7 +191,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
      * <p>
      * Exposed in the FilePlan service.
      *
-     * @see org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService#isFilePlanComponent(org.alfresco.service.cmr.repository.NodeRef)
+     * @see FilePlanService#isFilePlanComponent(org.alfresco.service.cmr.repository.NodeRef)
      */
     public boolean isFilePlanComponent(NodeRef nodeRef)
     {
@@ -213,7 +213,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
      * <p>
      * Exposed in the FilePlan service.
      *
-     * @see org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService#isFilePlan(org.alfresco.service.cmr.repository.NodeRef)
+     * @see FilePlanService#isFilePlan(org.alfresco.service.cmr.repository.NodeRef)
      */
     public boolean isFilePlan(NodeRef nodeRef)
     {
@@ -223,7 +223,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
     /**
      * Indicates whether the given node is a file plan container or not.
      *
-     * @see org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService#isFilePlanContainer(org.alfresco.service.cmr.repository.NodeRef)
+     * @see FilePlanService#isFilePlanContainer(org.alfresco.service.cmr.repository.NodeRef)
      */
     public boolean isFilePlanContainer(NodeRef nodeRef)
     {
@@ -233,7 +233,7 @@ public class ServiceBaseImpl implements RecordsManagementModel, ApplicationConte
     /**
      * Indicates whether the given node is a record category or not.
      *
-     * @see org.alfresco.module.org_alfresco_module_rm.fileplan.FilePlanService#isRecordCategory(org.alfresco.service.cmr.repository.NodeRef)
+     * @see FilePlanService#isRecordCategory(org.alfresco.service.cmr.repository.NodeRef)
      */
     public boolean isRecordCategory(NodeRef nodeRef)
     {
diff --git a/rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java b/rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
index 46efac6038..bab4d573f8 100755
--- a/rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
+++ b/rm-server/source/java/org/alfresco/repo/policy/annotation/BehaviourRegistry.java
@@ -20,10 +20,9 @@ package org.alfresco.repo.policy.annotation;
 
 import org.alfresco.repo.policy.Behaviour;
 
-
 /**
  * Interface for a behaviour registry.
- * 
+ *
  * @author Roy Wetherall
  * @since 2.2
  */
@@ -31,16 +30,16 @@ public interface BehaviourRegistry
 {
     /**
      * Register a behaviour against a given name.
-     * 
+     *
      * @param behaviour behaviour
      */
-    void registerBehaviour(String name, org.alfresco.repo.policy.Behaviour behaviour);
-    
+    void registerBehaviour(String name, Behaviour behaviour);
+
     /**
      * Gets the behaviour for a given name.
-     * 
+     *
      * @param name                  behaviour name
      * @return {@link Behaviour}    behaviour, null otherwise
      */
-    org.alfresco.repo.policy.Behaviour getBehaviour(String name);
+    Behaviour getBehaviour(String name);
 }