diff --git a/source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java b/source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
index 17bbd88879..0b1f832f2e 100644
--- a/source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
+++ b/source/java/org/alfresco/repo/web/scripts/WebScriptTestSuite.java
@@ -31,7 +31,7 @@ import org.alfresco.repo.web.scripts.discussion.DiscussionRestApiTest;
 import org.alfresco.repo.web.scripts.forms.FormRestApiGet_Test;
 import org.alfresco.repo.web.scripts.forms.FormRestApiJsonPost_Test;
 import org.alfresco.repo.web.scripts.groups.GroupsTest;
-import org.alfresco.repo.web.scripts.invitation.InvitationTest;
+import org.alfresco.repo.web.scripts.invitation.InvitationWebScriptTest;
 import org.alfresco.repo.web.scripts.invite.InviteServiceTest;
 import org.alfresco.repo.web.scripts.person.PersonServiceTest;
 import org.alfresco.repo.web.scripts.preference.PreferenceServiceTest;
@@ -73,7 +73,7 @@ public class WebScriptTestSuite extends TestSuite
         suite.addTestSuite( FormRestApiGet_Test.class );
         suite.addTestSuite( FormRestApiJsonPost_Test.class );
         suite.addTestSuite( GroupsTest.class );
-        suite.addTestSuite( InvitationTest.class );
+        suite.addTestSuite( InvitationWebScriptTest.class );
         suite.addTestSuite( InviteServiceTest.class );
         suite.addTestSuite( LoginTest.class );
         suite.addTestSuite( PersonSearchTest.class );
diff --git a/source/java/org/alfresco/repo/web/scripts/invitation/InvitationTest.java b/source/java/org/alfresco/repo/web/scripts/invitation/InvitationWebScriptTest.java
similarity index 97%
rename from source/java/org/alfresco/repo/web/scripts/invitation/InvitationTest.java
rename to source/java/org/alfresco/repo/web/scripts/invitation/InvitationWebScriptTest.java
index 3786e4652e..00cd00ac7e 100644
--- a/source/java/org/alfresco/repo/web/scripts/invitation/InvitationTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/invitation/InvitationWebScriptTest.java
@@ -56,7 +56,7 @@ import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
  * 
  * @author Mark Rogers
  */
-public class InvitationTest extends BaseWebScriptTest
+public class InvitationWebScriptTest extends BaseWebScriptTest
 {
     private final static QName avatarQName = QName.createQName(NamespaceService.APP_MODEL_1_0_URI, "test");
 
diff --git a/source/java/org/alfresco/repo/web/scripts/invite/Invite.java b/source/java/org/alfresco/repo/web/scripts/invite/Invite.java
index 96abac1f3d..721cd312e8 100644
--- a/source/java/org/alfresco/repo/web/scripts/invite/Invite.java
+++ b/source/java/org/alfresco/repo/web/scripts/invite/Invite.java
@@ -21,8 +21,8 @@ package org.alfresco.repo.web.scripts.invite;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.alfresco.repo.invitation.InviteHelper;
 import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation;
-import org.alfresco.repo.invitation.site.InviteHelper;
 import org.alfresco.service.cmr.invitation.Invitation;
 import org.alfresco.service.cmr.invitation.InvitationExceptionForbidden;
 import org.alfresco.service.cmr.invitation.InvitationExceptionUserError;
@@ -35,8 +35,6 @@ import org.springframework.extensions.webscripts.DeclarativeWebScript;
 import org.springframework.extensions.webscripts.Status;
 import org.springframework.extensions.webscripts.WebScriptException;
 import org.springframework.extensions.webscripts.WebScriptRequest;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 /**
  * Web Script invoked by a Site Manager (Inviter) to either send
diff --git a/source/java/org/alfresco/repo/web/scripts/invite/Invites.java b/source/java/org/alfresco/repo/web/scripts/invite/Invites.java
index 3c1778b847..4a2ed022c5 100644
--- a/source/java/org/alfresco/repo/web/scripts/invite/Invites.java
+++ b/source/java/org/alfresco/repo/web/scripts/invite/Invites.java
@@ -25,9 +25,9 @@ import java.util.List;
 import java.util.Map;
 
 import org.alfresco.repo.invitation.InvitationSearchCriteriaImpl;
+import org.alfresco.repo.invitation.InviteHelper;
 import org.alfresco.service.cmr.invitation.InvitationSearchCriteria;
 import org.alfresco.repo.invitation.WorkflowModelNominatedInvitation;
-import org.alfresco.repo.invitation.site.InviteHelper;
 import org.alfresco.repo.invitation.site.InviteInfo;
 import org.alfresco.repo.template.TemplateNode;
 import org.alfresco.service.ServiceRegistry;