diff --git a/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java b/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
index ef7771fd80..d78658ee55 100644
--- a/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
+++ b/source/test-java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
@@ -258,7 +258,6 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
     {
         // Register the test model
         dictionaryDAO.putModel(model);
-        namespaceDao.addPrefix("test", TEST_NAMESPACE);
     }
 
     public void setUp() throws Exception
@@ -1519,7 +1518,7 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
         sp.addQueryTemplate("ANDY", "%cm:content");
         sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
         sp.excludeDataInTheCurrentTransaction(true);
-        sp.addSort("test:neverIndexed", false);
+        sp.addSort("lucene-test:neverIndexed", false);
         results = searcher.query(sp);
         assertEquals(16, results.length());
         results.close();
@@ -1686,7 +1685,7 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
         ftsQueryWithCount(searcher, qname + ":(<3.4 TO 4])", 0);
         ftsQueryWithCount(searcher, qname + ":(<3.4 TO 3.4>)", 0);
 
-        ftsQueryWithCount(searcher, "test:float_x002D_ista:3.40", 1);
+        ftsQueryWithCount(searcher, "lucene-test:float_x002D_ista:3.40", 1);
 
         ftsQueryWithCount(searcher, "lazy", 1);
         ftsQueryWithCount(searcher, "laz*", 1);
@@ -4228,11 +4227,11 @@ public class ADMLuceneTest extends TestCase implements DictionaryListener
         assertEquals(1, results.length());
         results.close();
 
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PRIMARYASSOCTYPEQNAME:\"test:assoc\"", null);
+        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "PRIMARYASSOCTYPEQNAME:\"lucene-test:assoc\"", null);
         assertEquals(11, results.length());
         results.close();
 
-        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "ASSOCTYPEQNAME:\"test:assoc\"", null);
+        results = searcher.query(rootNodeRef.getStoreRef(), "lucene", "ASSOCTYPEQNAME:\"lucene-test:assoc\"", null);
         assertEquals(11, results.length());
         results.close();
 
diff --git a/source/test-resources/org/alfresco/repo/node/NodeRefTestModel.xml b/source/test-resources/org/alfresco/repo/node/NodeRefTestModel.xml
index 64c11102c2..4275869080 100644
--- a/source/test-resources/org/alfresco/repo/node/NodeRefTestModel.xml
+++ b/source/test-resources/org/alfresco/repo/node/NodeRefTestModel.xml
@@ -1,4 +1,4 @@
-<model name="test:nodeservice"
+<model name="node-ref-test:nodeservice"
 	xmlns="http://www.alfresco.org/model/dictionary/1.0">
 	
 	<description>Test Model for NodeService tests</description>
@@ -14,31 +14,31 @@
 	
 	<namespaces>
 		<namespace uri="http://www.alfresco.org/test/NodeRefTestModel"
-			prefix="test"/>
+			prefix="node-ref-test"/>
 	</namespaces>
 	
 	<types>
-		<type name="test:testType">
+		<type name="node-ref-test:testType">
 			<title>Content</title>
 			<parent>cm:content</parent>
 			<archive>false</archive>
 			<properties>
-				<property name="test:category1">
+				<property name="node-ref-test:category1">
 					<type>d:category</type>
 					<mandatory>false</mandatory>
 					<multiple>false</multiple>
 				</property>
-				<property name="test:categories1">
+				<property name="node-ref-test:categories1">
 					<type>d:category</type>
 					<mandatory>false</mandatory>
 					<multiple>true</multiple>
 				</property>
-				<property name="test:noderef1">
+				<property name="node-ref-test:noderef1">
 					<type>d:noderef</type>
 					<mandatory>false</mandatory>
 					<multiple>false</multiple>
 				</property>
-				<property name="test:noderefs1">
+				<property name="node-ref-test:noderefs1">
 					<type>d:noderef</type>
 					<mandatory>false</mandatory>
 					<multiple>true</multiple>
@@ -49,10 +49,10 @@
 	
 	<aspects>
 		
-		<aspect name="test:singleCategory">
+		<aspect name="node-ref-test:singleCategory">
 			<title>Single Category</title>
 			<properties>
-				<property name="test:category">
+				<property name="node-ref-test:category">
 					<type>d:category</type>
 					<mandatory>false</mandatory>
 					<multiple>false</multiple>
@@ -60,10 +60,10 @@
 			</properties>
 		</aspect>
 		
-		<aspect name="test:multipleCategories">
+		<aspect name="node-ref-test:multipleCategories">
 			<title>Multiple Categories</title>
 			<properties>
-				<property name="test:categories">
+				<property name="node-ref-test:categories">
 					<type>d:category</type>
 					<mandatory>false</mandatory>
 					<multiple>true</multiple>
@@ -71,10 +71,10 @@
 			</properties>
 		</aspect>
 		
-		<aspect name="test:singleNodeRef">
+		<aspect name="node-ref-test:singleNodeRef">
 			<title>Single Node Ref</title>
 			<properties>
-				<property name="test:noderef">
+				<property name="node-ref-test:noderef">
 					<type>d:noderef</type>
 					<mandatory>false</mandatory>
 					<multiple>false</multiple>
@@ -82,10 +82,10 @@
 			</properties>
 		</aspect>
 		
-		<aspect name="test:multipleNodeRefs">
+		<aspect name="node-ref-test:multipleNodeRefs">
 			<title>Mutliple Node Refs</title>
 			<properties>
-				<property name="test:noderefs">
+				<property name="node-ref-test:noderefs">
 					<type>d:noderef</type>
 					<mandatory>false</mandatory>
 					<multiple>true</multiple>
diff --git a/source/test-resources/org/alfresco/repo/search/impl/lucene/LuceneTest_model.xml b/source/test-resources/org/alfresco/repo/search/impl/lucene/LuceneTest_model.xml
index 32b82c8b08..6b1d70a16d 100644
--- a/source/test-resources/org/alfresco/repo/search/impl/lucene/LuceneTest_model.xml
+++ b/source/test-resources/org/alfresco/repo/search/impl/lucene/LuceneTest_model.xml
@@ -1,4 +1,4 @@
-<model name="test:lucenetest" xmlns="http://www.alfresco.org/model/dictionary/1.0">
+<model name="lucene-test:lucenetest" xmlns="http://www.alfresco.org/model/dictionary/1.0">
 
    <description>Test Model for Lucene tests</description>
    <author>Alfresco</author>
@@ -11,21 +11,21 @@
    </imports>
    
     <namespaces>
-        <namespace uri="http://www.alfresco.org/test/lucenetest" prefix="test"/>
+        <namespace uri="http://www.alfresco.org/test/lucenetest" prefix="lucene-test"/>
     </namespaces>
 
     <types>
-        <type name="test:testSuperType">
+        <type name="lucene-test:testSuperType">
             <title>Test Super Type</title>
             <parent>sys:container</parent>
             <properties>
-                <property name="test:neverIndexed">
+                <property name="lucene-test:neverIndexed">
                     <type>d:any</type>
                     <mandatory>false</mandatory>
                     <multiple>false</multiple>
                     <index enabled="false"/>
                 </property>
-                <property name="test:createdDate">
+                <property name="lucene-test:createdDate">
                     <type>d:date</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -35,7 +35,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:orderDouble">
+                <property name="lucene-test:orderDouble">
                     <type>d:double</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -45,7 +45,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:orderFloat">
+                <property name="lucene-test:orderFloat">
                     <type>d:float</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -55,7 +55,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:orderLong">
+                <property name="lucene-test:orderLong">
                     <type>d:long</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -65,7 +65,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:orderInt">
+                <property name="lucene-test:orderInt">
                     <type>d:int</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -75,7 +75,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-				<property name="test:orderText">
+				<property name="lucene-test:orderText">
                     <type>d:text</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -85,7 +85,7 @@
                         <tokenised>both</tokenised>
                     </index>
                 </property>
-				<property name="test:orderMLText">
+				<property name="lucene-test:orderMLText">
                     <type>d:mltext</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -97,7 +97,7 @@
                 </property>
             </properties>
             <associations>
-                <child-association name="test:assoc">
+                <child-association name="lucene-test:assoc">
                     <source>
                         <mandatory>false</mandatory>
                         <many>true</many>
@@ -111,11 +111,11 @@
             </associations>
         </type>
         
-        <type name="test:testType">
+        <type name="lucene-test:testType">
             <title>Test Type</title>
-            <parent>test:testSuperType</parent>
+            <parent>lucene-test:testSuperType</parent>
             <properties>
-                <property name="test:text-indexed-stored-tokenised-atomic">
+                <property name="lucene-test:text-indexed-stored-tokenised-atomic">
                     <type>d:text</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -125,7 +125,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:text-indexed-unstored-tokenised-atomic">
+                <property name="lucene-test:text-indexed-unstored-tokenised-atomic">
                     <type>d:text</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -135,7 +135,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:text-indexed-stored-tokenised-nonatomic">
+                <property name="lucene-test:text-indexed-stored-tokenised-nonatomic">
                     <type>d:text</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -145,7 +145,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:int-ista">
+                <property name="lucene-test:int-ista">
                     <type>d:int</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -155,7 +155,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:long-ista">
+                <property name="lucene-test:long-ista">
                     <type>d:long</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -165,7 +165,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:float-ista">
+                <property name="lucene-test:float-ista">
                     <type>d:float</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -175,7 +175,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:double-ista">
+                <property name="lucene-test:double-ista">
                     <type>d:double</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -185,7 +185,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:date-ista">
+                <property name="lucene-test:date-ista">
                     <type>d:date</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -195,7 +195,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:datetime-ista">
+                <property name="lucene-test:datetime-ista">
                     <type>d:datetime</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -205,7 +205,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:boolean-ista">
+                <property name="lucene-test:boolean-ista">
                     <type>d:boolean</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -215,7 +215,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:qname-ista">
+                <property name="lucene-test:qname-ista">
                     <type>d:qname</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -225,7 +225,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:category-ista">
+                <property name="lucene-test:category-ista">
                     <type>d:category</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -235,7 +235,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:noderef-ista">
+                <property name="lucene-test:noderef-ista">
                     <type>d:noderef</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -245,7 +245,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-                <property name="test:verbatim">
+                <property name="lucene-test:verbatim">
                     <type>d:text</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -255,7 +255,7 @@
                         <tokenised>false</tokenised>
                     </index>
                 </property>
-				<property name="test:ml">
+				<property name="lucene-test:ml">
                     <type>d:mltext</type>
                     <mandatory>true</mandatory>
                     <multiple>false</multiple>
@@ -265,7 +265,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-				<property name="test:null">
+				<property name="lucene-test:null">
                     <type>d:text</type>
                     <mandatory>false</mandatory>
                     <multiple>false</multiple>
@@ -275,7 +275,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-				<property name="test:path-ista">
+				<property name="lucene-test:path-ista">
                     <type>d:path</type>
                     <mandatory>false</mandatory>
                     <multiple>false</multiple>
@@ -285,7 +285,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-				<property name="test:locale-ista">
+				<property name="lucene-test:locale-ista">
                     <type>d:locale</type>
                     <mandatory>false</mandatory>
                     <multiple>false</multiple>
@@ -296,7 +296,7 @@
                     </index>
                 </property>
 				<!-- Any -->
-				<property name="test:any-many-ista">
+				<property name="lucene-test:any-many-ista">
                     <type>d:any</type>
                     <mandatory>false</mandatory>
                     <multiple>true</multiple>
@@ -307,7 +307,7 @@
                     </index>
                 </property>
 				<!-- Complex multiples -->
-				<property name="test:content-many-ista">
+				<property name="lucene-test:content-many-ista">
                     <type>d:any</type>
                     <mandatory>false</mandatory>
                     <multiple>true</multiple>
@@ -317,7 +317,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-				<property name="test:mltext-many-ista">
+				<property name="lucene-test:mltext-many-ista">
                     <type>d:mltext</type>
                     <mandatory>false</mandatory>
                     <multiple>true</multiple>
@@ -327,7 +327,7 @@
                         <tokenised>true</tokenised>
                     </index>
                 </property>
-				<property name="test:period-ista">
+				<property name="lucene-test:period-ista">
                     <type>d:period</type>
                     <mandatory>false</mandatory>
                     <multiple>false</multiple>
@@ -339,16 +339,16 @@
                 </property>
             </properties>
             <mandatory-aspects>
-                <aspect>test:testAspect</aspect>
+                <aspect>lucene-test:testAspect</aspect>
             </mandatory-aspects>
         </type>
     </types>
    
    <aspects>
-      <aspect name="test:aspectWithChildren">
+      <aspect name="lucene-test:aspectWithChildren">
          <title>Aspect With Children</title>
          <associations>
-             <child-association name="test:unused">
+             <child-association name="lucene-test:unused">
                  <source>
                      <mandatory>false</mandatory>
                      <many>true</many>
@@ -361,14 +361,14 @@
              </child-association>
          </associations>
       </aspect>
-      <aspect name="test:testSuperAspect">
+      <aspect name="lucene-test:testSuperAspect">
          <title>Test Super Aspect</title>
       </aspect>
-      <aspect name="test:testAspect">
+      <aspect name="lucene-test:testAspect">
          <title>Titled</title>
-         <parent>test:testSuperAspect</parent>
+         <parent>lucene-test:testSuperAspect</parent>
 			<properties>
-				<property name="test:aspectProperty">
+				<property name="lucene-test:aspectProperty">
 					<type>d:text</type>
 					<mandatory>false</mandatory>
 					<multiple>false</multiple>