diff --git a/source/java/org/alfresco/repo/web/scripts/forms/TestFormRestAPI_Get.java b/source/java/org/alfresco/repo/web/scripts/forms/FormRestApiGet_Test.java
similarity index 98%
rename from source/java/org/alfresco/repo/web/scripts/forms/TestFormRestAPI_Get.java
rename to source/java/org/alfresco/repo/web/scripts/forms/FormRestApiGet_Test.java
index 7785c2323c..577f3d28c5 100644
--- a/source/java/org/alfresco/repo/web/scripts/forms/TestFormRestAPI_Get.java
+++ b/source/java/org/alfresco/repo/web/scripts/forms/FormRestApiGet_Test.java
@@ -34,7 +34,7 @@ import org.json.JSONArray;
 import org.json.JSONObject;
 import org.json.JSONTokener;
 
-public class TestFormRestAPI_Get extends AbstractTestFormRestApi {
+public class FormRestApiGet_Test extends AbstractTestFormRestApi {
 
     public void testResponseContentType() throws Exception
     {
diff --git a/source/java/org/alfresco/repo/web/scripts/forms/TestFormRestAPI_JsonPost.java b/source/java/org/alfresco/repo/web/scripts/forms/FormRestApiJsonPost_Test.java
similarity index 96%
rename from source/java/org/alfresco/repo/web/scripts/forms/TestFormRestAPI_JsonPost.java
rename to source/java/org/alfresco/repo/web/scripts/forms/FormRestApiJsonPost_Test.java
index cfe517b0a5..6b6cfa8dc7 100644
--- a/source/java/org/alfresco/repo/web/scripts/forms/TestFormRestAPI_JsonPost.java
+++ b/source/java/org/alfresco/repo/web/scripts/forms/FormRestApiJsonPost_Test.java
@@ -34,7 +34,7 @@ import org.alfresco.web.scripts.TestWebScriptServer.Response;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-public class TestFormRestAPI_JsonPost extends AbstractTestFormRestApi
+public class FormRestApiJsonPost_Test extends AbstractTestFormRestApi
 {
     private static final String PROP_CM_DESCRIPTION = "prop_cm_description";
     private static final String APPLICATION_JSON = "application/json";