polygene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nic...@apache.org
Subject [73/80] zest-java git commit: Tightening everything up after massive namespace change. Removal of practically all "Qi4j" names and references.
Date Thu, 30 Jul 2015 19:49:12 GMT
http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java b/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java
index b473000..d64bf57 100644
--- a/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java
+++ b/extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreMixin.java
@@ -55,8 +55,8 @@ import org.apache.zest.spi.entitystore.helpers.MapEntityStore;
 public class MongoMapEntityStoreMixin
     implements ServiceActivation, MapEntityStore, MongoAccessors
 {
-    private static final String DEFAULT_DATABASE_NAME = "qi4j:entitystore";
-    private static final String DEFAULT_COLLECTION_NAME = "qi4j:entitystore:entities";
+    private static final String DEFAULT_DATABASE_NAME = "zest:entitystore";
+    private static final String DEFAULT_COLLECTION_NAME = "zest:entitystore:entities";
     public static final String IDENTITY_COLUMN = "_id";
     public static final String STATE_COLUMN = "state";
     @This
@@ -122,14 +122,14 @@ public class MongoMapEntityStoreMixin
             serverAddresses.addAll( config.nodes().get() );
         }
 
-        // If database name not configured, set it to qi4j:entitystore
+        // If database name not configured, set it to zest:entitystore
         databaseName = config.database().get();
         if( databaseName == null )
         {
             databaseName = DEFAULT_DATABASE_NAME;
         }
 
-        // If collection name not configured, set it to qi4j:entitystore:entities
+        // If collection name not configured, set it to zest:entitystore:entities
         collectionName = config.collection().get();
         if( collectionName == null )
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreTest.java b/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreTest.java
index 49b8949..4c84fab 100644
--- a/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreTest.java
+++ b/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreTest.java
@@ -60,8 +60,8 @@ public class MongoMapEntityStoreTest
 
         MongoEntityStoreConfiguration mongoConfig = config.forMixin( MongoEntityStoreConfiguration.class ).declareDefaults();
         mongoConfig.writeConcern().set( MongoEntityStoreConfiguration.WriteConcern.FSYNC_SAFE );
-        mongoConfig.database().set( "qi4j:test" );
-        mongoConfig.collection().set( "qi4j:test:entities" );
+        mongoConfig.database().set( "zest:test" );
+        mongoConfig.collection().set( "zest:test:entities" );
         // START SNIPPET: assembly
     }
     // END SNIPPET: assembly

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreWithCacheTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreWithCacheTest.java b/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreWithCacheTest.java
index c4132bb..cd25cf0 100644
--- a/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreWithCacheTest.java
+++ b/extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreWithCacheTest.java
@@ -55,8 +55,8 @@ public class MongoMapEntityStoreWithCacheTest
 
         MongoEntityStoreConfiguration mongoConfig = config.forMixin( MongoEntityStoreConfiguration.class ).declareDefaults();
         mongoConfig.writeConcern().set( MongoEntityStoreConfiguration.WriteConcern.FSYNC_SAFE );
-        mongoConfig.database().set( "qi4j:test" );
-        mongoConfig.collection().set( "qi4j:test:entities" );
+        mongoConfig.database().set( "zest:test" );
+        mongoConfig.collection().set( "zest:test:entities" );
     }
 
     private Mongo mongo;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-preferences/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/build.gradle b/extensions/entitystore-preferences/build.gradle
index 5d52095..bc4d23d 100644
--- a/extensions/entitystore-preferences/build.gradle
+++ b/extensions/entitystore-preferences/build.gradle
@@ -23,13 +23,13 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - Preferences" }
 
 dependencies {
 
-  compile( project( ":org.qi4j.core:org.qi4j.core.bootstrap" ) )
+  compile( project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) )
   compile libraries.slf4j_api
 
-  testCompile( project( ":org.qi4j.core:org.qi4j.core.testsupport" ) )
-  testCompile( project( ":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson" ) )
+  testCompile( project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) )
+  testCompile( project( ":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson" ) )
 
-  testRuntime( project( ":org.qi4j.core:org.qi4j.core.runtime" ) )
+  testRuntime( project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) )
   testRuntime( libraries.logback )
 }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-preferences/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/dev-status.xml b/extensions/entitystore-preferences/dev-status.xml
index ac63cda..22993de 100644
--- a/extensions/entitystore-preferences/dev-status.xml
+++ b/extensions/entitystore-preferences/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <!--none,early,beta,stable,mature-->
         <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/PreferencesEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/PreferencesEntityStoreMixin.java b/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/PreferencesEntityStoreMixin.java
index 73f1bb2..7bc4ddb 100644
--- a/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/PreferencesEntityStoreMixin.java
+++ b/extensions/entitystore-preferences/src/main/java/org/apache/zest/entitystore/prefs/PreferencesEntityStoreMixin.java
@@ -58,7 +58,7 @@ import org.apache.zest.io.Input;
 import org.apache.zest.io.Output;
 import org.apache.zest.io.Receiver;
 import org.apache.zest.io.Sender;
-import org.apache.zest.spi.Qi4jSPI;
+import org.apache.zest.spi.ZestSPI;
 import org.apache.zest.spi.entity.EntityState;
 import org.apache.zest.spi.entity.EntityStatus;
 import org.apache.zest.spi.entitystore.DefaultEntityStoreUnitOfWork;
@@ -92,7 +92,7 @@ public class PreferencesEntityStoreMixin
     implements ServiceActivation, EntityStore, EntityStoreSPI
 {
     @Structure
-    private Qi4jSPI spi;
+    private ZestSPI spi;
 
     @This
     private EntityStoreSPI entityStoreSpi;
@@ -196,7 +196,7 @@ public class PreferencesEntityStoreMixin
                     public <ReceiverThrowableType extends Throwable> void sendTo( Receiver<? super EntityState, ReceiverThrowableType> receiver )
                         throws ReceiverThrowableType, EntityStoreException
                     {
-                        UsecaseBuilder builder = UsecaseBuilder.buildUsecase( "qi4j.entitystore.preferences.visit" );
+                        UsecaseBuilder builder = UsecaseBuilder.buildUsecase( "zest.entitystore.preferences.visit" );
                         Usecase visitUsecase = builder.withMetaInfo( CacheOptions.NEVER ).newUsecase();
                         final EntityStoreUnitOfWork uow =
                             newUnitOfWork( visitUsecase, module, System.currentTimeMillis() );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-preferences/src/test/java/org/apache/zest/entitystore/DocumentationSupport.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/src/test/java/org/apache/zest/entitystore/DocumentationSupport.java b/extensions/entitystore-preferences/src/test/java/org/apache/zest/entitystore/DocumentationSupport.java
index 3c4c7b6..4e664d9 100644
--- a/extensions/entitystore-preferences/src/test/java/org/apache/zest/entitystore/DocumentationSupport.java
+++ b/extensions/entitystore-preferences/src/test/java/org/apache/zest/entitystore/DocumentationSupport.java
@@ -20,10 +20,10 @@ package org.apache.zest.entitystore;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.entitystore.prefs.assembly.PreferenceEntityStoreAssembler;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 
 public class DocumentationSupport
-        extends AbstractQi4jTest
+        extends AbstractZestTest
 {
 
     // START SNIPPET: assembly

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-redis/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/build.gradle b/extensions/entitystore-redis/build.gradle
index 50e6c36..6c4760d 100644
--- a/extensions/entitystore-redis/build.gradle
+++ b/extensions/entitystore-redis/build.gradle
@@ -23,14 +23,14 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - Redis" }}
 
 dependencies {
     
-    compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
-    compile(project(":org.qi4j.libraries:org.qi4j.library.locking"))
+    compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap"))
+    compile(project(":org.apache.zest.libraries:org.apache.zest.library.locking"))
     compile(libraries.jedis)
 
-    testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
-    testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+    testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport"))
+    testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson"))
 
-    testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
+    testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime"))
     testRuntime(libraries.logback)
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-redis/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/dev-status.xml b/extensions/entitystore-redis/dev-status.xml
index 169068f..e33f94c 100644
--- a/extensions/entitystore-redis/dev-status.xml
+++ b/extensions/entitystore-redis/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <!--none,early,beta,stable,mature-->
         <codebase>beta</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-riak/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/build.gradle b/extensions/entitystore-riak/build.gradle
index ebdef59..1cbe770 100644
--- a/extensions/entitystore-riak/build.gradle
+++ b/extensions/entitystore-riak/build.gradle
@@ -23,15 +23,15 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - Riak" } }
 
 dependencies {
 
-  compile( project( ":org.qi4j.core:org.qi4j.core.bootstrap" ) )
-  compile( project( ":org.qi4j.libraries:org.qi4j.library.locking" ) )
+  compile( project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" ) )
+  compile( project( ":org.apache.zest.libraries:org.apache.zest.library.locking" ) )
   compile libraries.slf4j_api
   compile( libraries.riak )
 
-  testCompile( project( ":org.qi4j.core:org.qi4j.core.testsupport" ) )
-  testCompile( project( ":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson" ) )
+  testCompile( project( ":org.apache.zest.core:org.apache.zest.core.testsupport" ) )
+  testCompile( project( ":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson" ) )
 
-  testRuntime( project( ":org.qi4j.core:org.qi4j.core.runtime" ) )
+  testRuntime( project( ":org.apache.zest.core:org.apache.zest.core.runtime" ) )
   testRuntime( libraries.logback )
 }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-riak/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/dev-status.xml b/extensions/entitystore-riak/dev-status.xml
index 169068f..e33f94c 100644
--- a/extensions/entitystore-riak/dev-status.xml
+++ b/extensions/entitystore-riak/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <!--none,early,beta,stable,mature-->
         <codebase>beta</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/AbstractRiakMapEntityStore.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/AbstractRiakMapEntityStore.java b/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/AbstractRiakMapEntityStore.java
index ceddd2f..bcf0d88 100644
--- a/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/AbstractRiakMapEntityStore.java
+++ b/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/AbstractRiakMapEntityStore.java
@@ -47,10 +47,10 @@ import org.slf4j.LoggerFactory;
     implements ServiceActivation, MapEntityStore, RiakAccessors
 {
 
-    protected static final Logger LOGGER = LoggerFactory.getLogger( "org.qi4j.entitystore.riak" );
+    protected static final Logger LOGGER = LoggerFactory.getLogger( "org.apache.zest.entitystore.riak" );
     protected static final int DEFAULT_MAX_CONNECTIONS = 50;
 
-    /* package */ static final String DEFAULT_BUCKET_KEY = "qi4j:entities";
+    /* package */ static final String DEFAULT_BUCKET_KEY = "zest:entities";
     protected IRiakClient riakClient;
     protected String bucketKey;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakHttpEntityStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakHttpEntityStoreConfiguration.java b/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakHttpEntityStoreConfiguration.java
index 5d35984..5b04fac 100644
--- a/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakHttpEntityStoreConfiguration.java
+++ b/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakHttpEntityStoreConfiguration.java
@@ -42,7 +42,7 @@ public interface RiakHttpEntityStoreConfiguration
     /**
      * Riak Bucket where Entities state will be stored.
      *
-     * Defaulted to "qi4j:entities".
+     * Defaulted to "zest:entities".
      */
     @Optional
     Property<String> bucket();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakProtobufEntityStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakProtobufEntityStoreConfiguration.java b/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakProtobufEntityStoreConfiguration.java
index c8a6df5..6e1a67e 100644
--- a/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakProtobufEntityStoreConfiguration.java
+++ b/extensions/entitystore-riak/src/main/java/org/apache/zest/entitystore/riak/RiakProtobufEntityStoreConfiguration.java
@@ -45,7 +45,7 @@ public interface RiakProtobufEntityStoreConfiguration
     /**
      * Riak Bucket where Entities state will be stored.
      *
-     * Defaulted to "qi4j:entities".
+     * Defaulted to "zest:entities".
      */
     @Optional
     Property<String> bucket();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-sql/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/build.gradle b/extensions/entitystore-sql/build.gradle
index f8a0849..5acfae7 100644
--- a/extensions/entitystore-sql/build.gradle
+++ b/extensions/entitystore-sql/build.gradle
@@ -23,19 +23,19 @@ jar { manifest { name = "Apache Zest™ Extension - EntityStore - SQL" }}
 
 dependencies {
 
-  compile project(":org.qi4j.core:org.qi4j.core.bootstrap")
-  compile project(":org.qi4j.libraries:org.qi4j.library.sql")
+  compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap")
+  compile project(":org.apache.zest.libraries:org.apache.zest.library.sql")
   compile libraries.javaSqlGenerator
   compile( libraries.javaSqlGeneratorImpl ) { 
       exclude group: 'junit'
   }
 
-  testCompile project(":org.qi4j.core:org.qi4j.core.testsupport")
-  testCompile project(":org.qi4j.libraries:org.qi4j.library.sql-dbcp")
-  testCompile(project(":org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson"))
+  testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport")
+  testCompile project(":org.apache.zest.libraries:org.apache.zest.library.sql-dbcp")
+  testCompile(project(":org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson"))
   testCompile libraries.derby // Needed at compile time for polite test shutdown
 
-  testRuntime project(":org.qi4j.core:org.qi4j.core.runtime")
+  testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime")
   testRuntime libraries.logback
   testRuntime libraries.h2
   testRuntime libraries.mysql_connector

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-sql/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/dev-status.xml b/extensions/entitystore-sql/dev-status.xml
index 94d633f..9f20123 100644
--- a/extensions/entitystore-sql/dev-status.xml
+++ b/extensions/entitystore-sql/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <!--none,early,beta,stable,mature-->
         <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-sql/src/docs/es-sql.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/docs/es-sql.txt b/extensions/entitystore-sql/src/docs/es-sql.txt
index 97807c0..2649872 100644
--- a/extensions/entitystore-sql/src/docs/es-sql.txt
+++ b/extensions/entitystore-sql/src/docs/es-sql.txt
@@ -52,7 +52,7 @@ include::../../build/docs/buildinfo/artifact.txt[]
 == Configuration ==
 
 SQL EntityStore Configuration is optional and provides only one configuration property: `schemaName` defaulted to
-'qi4j_es'. On SQL databases that don't support schemas this configuration property is simply ignored.
+'zest_es'. On SQL databases that don't support schemas this configuration property is simply ignored.
 
 The assembly snippets below show the DataSource assembly alongside the SQL EntityStore assembly. Remember to configure
 the DataSource properly, see <<library-sql>> and <<howto-configure-service>>.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/SQLEntityStoreMixin.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/SQLEntityStoreMixin.java b/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/SQLEntityStoreMixin.java
index 16f7488..f79e5b6 100644
--- a/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/SQLEntityStoreMixin.java
+++ b/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/SQLEntityStoreMixin.java
@@ -63,7 +63,7 @@ import org.apache.zest.io.Output;
 import org.apache.zest.io.Receiver;
 import org.apache.zest.io.Sender;
 import org.apache.zest.library.sql.common.SQLUtil;
-import org.apache.zest.spi.Qi4jSPI;
+import org.apache.zest.spi.ZestSPI;
 import org.apache.zest.spi.entity.EntityState;
 import org.apache.zest.spi.entity.EntityStatus;
 import org.apache.zest.spi.entitystore.DefaultEntityStoreUnitOfWork;
@@ -91,7 +91,7 @@ import static org.apache.zest.functional.Iterables.map;
  */
 // TODO Rewrite reusing JSONMapEntityStoreMixin
 // Old notes:
-//      Most of this code is copy-paste from {@link org.qi4j.spi.entitystore.helpers.MapEntityStoreMixin}.
+//      Most of this code is copy-paste from {@link org.apache.zest.spi.entitystore.helpers.MapEntityStoreMixin}.
 //      Refactor stuff that has to do with general things than actual MapEntityStore from MapEntityStoreMixin
 //      so that this class could extend some "AbstractJSONEntityStoreMixin".
 public class SQLEntityStoreMixin
@@ -107,7 +107,7 @@ public class SQLEntityStoreMixin
     private EntityStoreSPI entityStoreSPI;
 
     @Structure
-    private Qi4jSPI spi;
+    private ZestSPI spi;
 
     @Structure
     private Application application;
@@ -306,7 +306,7 @@ public class SQLEntityStoreMixin
         Connection connection = null;
         PreparedStatement ps = null;
         ResultSet rs = null;
-        UsecaseBuilder builder = UsecaseBuilder.buildUsecase( "qi4j.entitystore.sql.visit" );
+        UsecaseBuilder builder = UsecaseBuilder.buildUsecase( "zest.entitystore.sql.visit" );
         Usecase usecase = builder.withMetaInfo( CacheOptions.NEVER ).newUsecase();
         final ModuleEntityStoreUnitOfWork uow =
             (ModuleEntityStoreUnitOfWork) newUnitOfWork( usecase, module, System.currentTimeMillis() );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/internal/SQLs.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/internal/SQLs.java b/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/internal/SQLs.java
index 35cc280..0fd9a5e 100644
--- a/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/internal/SQLs.java
+++ b/extensions/entitystore-sql/src/main/java/org/apache/zest/entitystore/sql/internal/SQLs.java
@@ -17,9 +17,9 @@ package org.apache.zest.entitystore.sql.internal;
 public interface SQLs
 {
 
-    String DEFAULT_SCHEMA_NAME = "qi4j_es";
+    String DEFAULT_SCHEMA_NAME = "zest_es";
 
-    String TABLE_NAME = "qi4j_entities";
+    String TABLE_NAME = "zest_entities";
 
     String ENTITY_PK_COLUMN_NAME = "entity_pk";
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/DerbySQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/DerbySQLEntityStoreTest.java b/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/DerbySQLEntityStoreTest.java
index e21bff3..c47bb9e 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/DerbySQLEntityStoreTest.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/DerbySQLEntityStoreTest.java
@@ -93,7 +93,7 @@ public class DerbySQLEntityStoreTest
                 stmt.execute( String.format( "DELETE FROM %s." + SQLs.TABLE_NAME, schemaName ) );
                 connection.commit();
             }
-            FileUtil.removeDirectory( new File( "target/qi4j-data" ) );
+            FileUtil.removeDirectory( new File( "target/zest-data" ) );
         }
         finally
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/H2SQLEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/H2SQLEntityStoreTest.java b/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/H2SQLEntityStoreTest.java
index 2caafd1..7b85c09 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/H2SQLEntityStoreTest.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/H2SQLEntityStoreTest.java
@@ -69,7 +69,7 @@ public class H2SQLEntityStoreTest
     {
         try
         {
-            FileUtil.removeDirectory( new File( "target/qi4j-data" ) );
+            FileUtil.removeDirectory( new File( "target/zest-data" ) );
         }
         finally
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/SQLiteEntityStoreTest.java
----------------------------------------------------------------------
diff --git a/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/SQLiteEntityStoreTest.java b/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/SQLiteEntityStoreTest.java
index 9a2c3a0..029bb3e 100644
--- a/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/SQLiteEntityStoreTest.java
+++ b/extensions/entitystore-sql/src/test/java/org/apache/zest/entitystore/sql/SQLiteEntityStoreTest.java
@@ -78,7 +78,7 @@ public class SQLiteEntityStoreTest
     {
         try
         {
-            FileUtil.removeDirectory( new File( "target/qi4j-data" ) );
+            FileUtil.removeDirectory( new File( "target/zest-data" ) );
         }
         finally
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/build.gradle b/extensions/indexing-elasticsearch/build.gradle
index f413afd..e9d522b 100644
--- a/extensions/indexing-elasticsearch/build.gradle
+++ b/extensions/indexing-elasticsearch/build.gradle
@@ -23,14 +23,14 @@ jar { manifest { name = "Apache Zest™ Extension - Index/Query - ElasticSearch"
 
 dependencies {
 
-  compile project(":org.qi4j.core:org.qi4j.core.bootstrap")
-  compile project(":org.qi4j.libraries:org.qi4j.library.fileconfig")
+  compile project(":org.apache.zest.core:org.apache.zest.core.bootstrap")
+  compile project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig")
   compile libraries.slf4j_api
   compile libraries.elasticsearch
 
-  testCompile project(":org.qi4j.core:org.qi4j.core.testsupport")
+  testCompile project(":org.apache.zest.core:org.apache.zest.core.testsupport")
 
-  testRuntime project(":org.qi4j.core:org.qi4j.core.runtime")
+  testRuntime project(":org.apache.zest.core:org.apache.zest.core.runtime")
   testRuntime libraries.logback
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/dev-status.xml b/extensions/indexing-elasticsearch/dev-status.xml
index e6ddc55..1e8f833 100644
--- a/extensions/indexing-elasticsearch/dev-status.xml
+++ b/extensions/indexing-elasticsearch/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
     <status>
         <!--none,early,beta,stable,mature-->
         <codebase>beta</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/ElasticSearchConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/ElasticSearchConfiguration.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/ElasticSearchConfiguration.java
index cc12c4d..b9cf049 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/ElasticSearchConfiguration.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/ElasticSearchConfiguration.java
@@ -29,13 +29,13 @@ public interface ElasticSearchConfiguration
 
     /**
      * Cluster name.
-     * Defaults to 'qi4j_cluster'.
+     * Defaults to 'zest_cluster'.
      */
     @Optional Property<String> clusterName();
 
     /**
      * Index name.
-     * Defaults to 'qi4j_index'.
+     * Defaults to 'zest_index'.
      */
     @Optional Property<String> index();
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/internal/AbstractElasticSearchSupport.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/internal/AbstractElasticSearchSupport.java b/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/internal/AbstractElasticSearchSupport.java
index a660067..142fbb8 100644
--- a/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/internal/AbstractElasticSearchSupport.java
+++ b/extensions/indexing-elasticsearch/src/main/java/org/apache/zest/index/elasticsearch/internal/AbstractElasticSearchSupport.java
@@ -30,11 +30,11 @@ public abstract class AbstractElasticSearchSupport
 
     protected static final Logger LOGGER = LoggerFactory.getLogger( ElasticSearchSupport.class );
 
-    protected static final String DEFAULT_CLUSTER_NAME = "qi4j_cluster";
+    protected static final String DEFAULT_CLUSTER_NAME = "zest_cluster";
 
-    protected static final String DEFAULT_INDEX_NAME = "qi4j_index";
+    protected static final String DEFAULT_INDEX_NAME = "zest_index";
 
-    protected static final String ENTITIES_TYPE = "qi4j_entities";
+    protected static final String ENTITIES_TYPE = "zest_entities";
 
     protected Client client;
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java
index a772bc9..c6e0bc3 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchComplexQueryTest.java
@@ -67,9 +67,9 @@ public class ElasticSearchComplexQueryTest
 
         // FileConfig
         FileConfigurationOverride override = new FileConfigurationOverride().
-            withData( new File( DATA_DIR, "qi4j-data" ) ).
-            withLog( new File( DATA_DIR, "qi4j-logs" ) ).
-            withTemporary( new File( DATA_DIR, "qi4j-temp" ) );
+            withData( new File( DATA_DIR, "zest-data" ) ).
+            withLog( new File( DATA_DIR, "zest-logs" ) ).
+            withTemporary( new File( DATA_DIR, "zest-temp" ) );
         module.services( FileConfigurationService.class ).setMetaInfo( override );
     }
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java
index f103bf4..26572f7 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchFinderTest.java
@@ -64,9 +64,9 @@ public class ElasticSearchFinderTest
 
         // FileConfig
         FileConfigurationOverride override = new FileConfigurationOverride().
-            withData( new File( DATA_DIR, "qi4j-data" ) ).
-            withLog( new File( DATA_DIR, "qi4j-logs" ) ).
-            withTemporary( new File( DATA_DIR, "qi4j-temp" ) );
+            withData( new File( DATA_DIR, "zest-data" ) ).
+            withLog( new File( DATA_DIR, "zest-logs" ) ).
+            withTemporary( new File( DATA_DIR, "zest-temp" ) );
         module.services( FileConfigurationService.class ).
             setMetaInfo( override );
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
index 062416d..4c1e79f 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchQueryTest.java
@@ -69,9 +69,9 @@ public class ElasticSearchQueryTest
 
         // FileConfig
         FileConfigurationOverride override = new FileConfigurationOverride().
-            withData( new File( DATA_DIR, "qi4j-data" ) ).
-            withLog( new File( DATA_DIR, "qi4j-logs" ) ).
-            withTemporary( new File( DATA_DIR, "qi4j-temp" ) );
+            withData( new File( DATA_DIR, "zest-data" ) ).
+            withLog( new File( DATA_DIR, "zest-logs" ) ).
+            withTemporary( new File( DATA_DIR, "zest-temp" ) );
         module.services( FileConfigurationService.class ).
             setMetaInfo( override );
     }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java
index 17c1cac..f5efe83 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ElasticSearchTest.java
@@ -38,7 +38,7 @@ import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler;
 import org.apache.zest.library.fileconfig.FileConfigurationOverride;
 import org.apache.zest.library.fileconfig.FileConfigurationService;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 import org.apache.zest.test.util.DelTreeAfter;
 
@@ -51,7 +51,7 @@ import static org.apache.zest.api.query.QueryExpressions.templateFor;
 import static org.apache.zest.test.util.Assume.assumeNoIbmJdk;
 
 public class ElasticSearchTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
 
     private static final File DATA_DIR = new File( "build/tmp/es-test" );
@@ -142,9 +142,9 @@ public class ElasticSearchTest
 
         // FileConfig
         FileConfigurationOverride override = new FileConfigurationOverride().
-            withData( new File( DATA_DIR, "qi4j-data" ) ).
-            withLog( new File( DATA_DIR, "qi4j-logs" ) ).
-            withTemporary( new File( DATA_DIR, "qi4j-temp" ) );
+            withData( new File( DATA_DIR, "zest-data" ) ).
+            withLog( new File( DATA_DIR, "zest-logs" ) ).
+            withTemporary( new File( DATA_DIR, "zest-temp" ) );
         module.services( FileConfigurationService.class ).
             setMetaInfo( override );
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java
index 060451c..9947de2 100644
--- a/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java
+++ b/extensions/indexing-elasticsearch/src/test/java/org/apache/zest/index/elasticsearch/ImmenseTermTest.java
@@ -33,7 +33,7 @@ import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.index.elasticsearch.assembly.ESFilesystemIndexQueryAssembler;
 import org.apache.zest.library.fileconfig.FileConfigurationOverride;
 import org.apache.zest.library.fileconfig.FileConfigurationService;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 import org.apache.zest.test.util.DelTreeAfter;
 
@@ -49,7 +49,7 @@ import static org.apache.zest.test.util.Assume.assumeNoIbmJdk;
  * See <a href="https://ops4j1.jira.com/browse/QI-412">QI-412</a>.
  */
 public class ImmenseTermTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private static final File DATA_DIR = new File( "build/tmp/immense-term-test" );
     @Rule
@@ -101,9 +101,9 @@ public class ImmenseTermTest
 
         // FileConfig
         FileConfigurationOverride override = new FileConfigurationOverride().
-            withData( new File( DATA_DIR, "qi4j-data" ) ).
-            withLog( new File( DATA_DIR, "qi4j-logs" ) ).
-            withTemporary( new File( DATA_DIR, "qi4j-temp" ) );
+            withData( new File( DATA_DIR, "zest-data" ) ).
+            withLog( new File( DATA_DIR, "zest-logs" ) ).
+            withTemporary( new File( DATA_DIR, "zest-temp" ) );
         module.services( FileConfigurationService.class ).
             setMetaInfo( override );
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/build.gradle b/extensions/indexing-rdf/build.gradle
index a612974..77ac7f8 100644
--- a/extensions/indexing-rdf/build.gradle
+++ b/extensions/indexing-rdf/build.gradle
@@ -23,18 +23,18 @@ jar { manifest { name = "Apache Zest™ Extension - Index/Query - RDF" } }
 
 dependencies {
 
-    compile project( ":org.qi4j.core:org.qi4j.core.bootstrap" )
-    compile project( ":org.qi4j.libraries:org.qi4j.library.rdf" )
+    compile project( ":org.apache.zest.core:org.apache.zest.core.bootstrap" )
+    compile project( ":org.apache.zest.libraries:org.apache.zest.library.rdf" )
     compile libraries.sesame
     compile libraries.commons_lang
     compile libraries.slf4j_api
 
-    testCompile project( ':org.qi4j.extensions:org.qi4j.extension.valueserialization-orgjson' )
-    testCompile project( ':org.qi4j.extensions:org.qi4j.extension.entitystore-preferences' )
-    testCompile project( ':org.qi4j.extensions:org.qi4j.extension.entitystore-jdbm' )
-    testCompile project( ":org.qi4j.core:org.qi4j.core.testsupport" )
+    testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.valueserialization-orgjson' )
+    testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.entitystore-preferences' )
+    testCompile project( ':org.apache.zest.extensions:org.apache.zest.extension.entitystore-jdbm' )
+    testCompile project( ":org.apache.zest.core:org.apache.zest.core.testsupport" )
 
-    testRuntime project( ":org.qi4j.core:org.qi4j.core.runtime" )
+    testRuntime project( ":org.apache.zest.core:org.apache.zest.core.runtime" )
     testRuntime libraries.logback
 
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/dev-status.xml b/extensions/indexing-rdf/dev-status.xml
index ac63cda..22993de 100644
--- a/extensions/indexing-rdf/dev-status.xml
+++ b/extensions/indexing-rdf/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <!--none,early,beta,stable,mature-->
         <codebase>stable</codebase>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/RdfQueryParserFactory.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/RdfQueryParserFactory.java b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/RdfQueryParserFactory.java
index e9a1403..068f4d7 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/RdfQueryParserFactory.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/RdfQueryParserFactory.java
@@ -27,7 +27,7 @@ import org.apache.zest.api.value.ValueSerialization;
 import org.apache.zest.api.value.ValueSerializer;
 import org.apache.zest.index.rdf.UnsupportedLanguageException;
 import org.apache.zest.index.rdf.query.internal.RdfQueryParserImpl;
-import org.apache.zest.spi.Qi4jSPI;
+import org.apache.zest.spi.ZestSPI;
 
 @Mixins( RdfQueryParserFactory.RdfQueryParserFactoryMixin.class )
 public interface RdfQueryParserFactory
@@ -39,7 +39,7 @@ public interface RdfQueryParserFactory
         implements RdfQueryParserFactory
     {
         @Structure
-        private Qi4jSPI spi;
+        private ZestSPI spi;
         @Service
         @Tagged( ValueSerialization.Formats.JSON )
         private ValueSerializer valueSerializer;

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
index e839c85..2a4202f 100644
--- a/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
+++ b/extensions/indexing-rdf/src/main/java/org/apache/zest/index/rdf/query/internal/RdfQueryParserImpl.java
@@ -57,7 +57,7 @@ import org.apache.zest.api.value.ValueSerializer.Options;
 import org.apache.zest.functional.Iterables;
 import org.apache.zest.functional.Specification;
 import org.apache.zest.index.rdf.query.RdfQueryParser;
-import org.apache.zest.spi.Qi4jSPI;
+import org.apache.zest.spi.ZestSPI;
 import org.slf4j.LoggerFactory;
 
 import static java.lang.String.format;
@@ -84,7 +84,7 @@ public class RdfQueryParserImpl
 
     private final Namespaces namespaces = new Namespaces();
     private final Triples triples = new Triples( namespaces );
-    private final Qi4jSPI spi;
+    private final ZestSPI spi;
     private final ValueSerializer valueSerializer;
     private Map<String, Object> variables;
 
@@ -103,7 +103,7 @@ public class RdfQueryParserImpl
         ) );
     }
 
-    public RdfQueryParserImpl( Qi4jSPI spi, ValueSerializer valueSerializer )
+    public RdfQueryParserImpl( ZestSPI spi, ValueSerializer valueSerializer )
     {
         this.spi = spi;
         this.valueSerializer = valueSerializer;
@@ -560,7 +560,7 @@ public class RdfQueryParserImpl
         }
         else if( value instanceof EntityComposite )
         {
-            return "urn:qi4j:entity:" + value.toString();
+            return "urn:zest:entity:" + value.toString();
         }
         else if( value instanceof Variable )
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java
index 614a990..5a166c8 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsAllTest.java
@@ -38,7 +38,7 @@ import org.apache.zest.functional.Iterables;
 import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler;
 import org.apache.zest.library.fileconfig.FileConfigurationService;
 import org.apache.zest.library.rdf.repository.NativeConfiguration;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import java.util.Arrays;
@@ -49,7 +49,7 @@ import org.apache.zest.test.util.DelTreeAfter;
 
 // A test to verify that containsAll QueryExpression works properly.
 public class ContainsAllTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     private static final File DATA_DIR = new File( "build/tmp/contains-all-test" );
     @Rule

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java
index a1b0e1d..3d0ab4a 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/ContainsTest.java
@@ -35,7 +35,7 @@ import org.apache.zest.index.rdf.ContainsAllTest.ExampleValue2;
 import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler;
 import org.apache.zest.library.fileconfig.FileConfigurationService;
 import org.apache.zest.library.rdf.repository.NativeConfiguration;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import java.util.Arrays;
@@ -44,7 +44,7 @@ import java.util.Set;
 import org.junit.Rule;
 import org.apache.zest.test.util.DelTreeAfter;
 
-public class ContainsTest extends AbstractQi4jTest
+public class ContainsTest extends AbstractZestTest
 {
 
    private static final File DATA_DIR = new File( "build/tmp/contains-test" );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java
index 45f8d69..f051935 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RDFPerformanceTest.java
@@ -36,7 +36,7 @@ import org.apache.zest.index.rdf.assembly.RdfNativeSesameStoreAssembler;
 import org.apache.zest.library.fileconfig.FileConfigurationService;
 import org.apache.zest.library.rdf.repository.NativeConfiguration;
 import org.apache.zest.spi.query.IndexExporter;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -47,7 +47,7 @@ import java.util.List;
 import org.junit.Rule;
 import org.apache.zest.test.util.DelTreeAfter;
 
-public class RDFPerformanceTest extends AbstractQi4jTest
+public class RDFPerformanceTest extends AbstractZestTest
 {
     private static final Logger LOG = LoggerFactory.getLogger( RDFPerformanceTest.class );
     private static final File DATA_DIR = new File( "build/tmp/rdf-performance-test" );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java
index 22b9fa8..1e30994 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/RdfNamedQueryTest.java
@@ -57,193 +57,193 @@ public class RdfNamedQueryTest extends AbstractNamedQueryTest
 
     private static String[] queryStrings =
     {
-        "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "\n" + "}", // script01
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Domain>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Domain>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "?entity ns1:name ?v0. \n"
             + "FILTER (?v0 = \"Gaming\")\n" + "}", // script02
 
-        "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "\n" + "}", // script03
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns2: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "?entity ns1:placeOfBirth ?v0. \n" + "?v0 ns2:name ?v1. \n" + "FILTER (?v1 = \"Kuala Lumpur\")\n" + "}", // script04
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns2: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "?entity ns1:mother ?v0. \n"
             + "?v0 ns1:placeOfBirth ?v1. \n" + "?v1 ns2:name ?v2. \n" + "FILTER (?v2 = \"Kuala Lumpur\")\n" + "}", // script05
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "?entity ns1:yearOfBirth ?v0. \n" + "FILTER (?v0 >= \"1973\")\n" + "}", // script06
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns2: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "?entity ns1:yearOfBirth ?v0. \n" + "?entity ns1:placeOfBirth ?v1. \n" + "?v1 ns2:name ?v2. \n"
             + "FILTER ((?v0 >= \"1900\") && (?v2 = \"Penang\"))\n" + "}", // script07
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "?entity ns1:yearOfBirth ?v0. \n" + "FILTER ((?v0 = \"1970\") || (?v0 = \"1975\"))\n" + "}", // script08
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Female>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Female>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "?entity ns1:yearOfBirth ?v0. \n" + "FILTER ((?v0 = \"1970\") || (?v0 = \"1975\"))\n" + "}", // script09
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "?entity ns1:yearOfBirth ?v0. \n" + "FILTER (!(?v0 = \"1975\"))\n" + "}", // script10
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "OPTIONAL {?entity ns1:email ?v0}. \n" + "FILTER (bound(?v0))\n" + "}", // script11
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "OPTIONAL {?entity ns1:email ?v0}. \n" + "FILTER (! bound(?v0))\n" + "}", // script12
 
-        "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
-            + "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Male#> \n"
+            + "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Male#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "OPTIONAL {?entity ns1:wife ?v0}. \n" + "FILTER (bound(?v0))\n" + "}", // script13
 
-        "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
-            + "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Male#> \n"
+            + "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Male#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Male>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Male>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "OPTIONAL {?entity ns1:wife ?v0}. \n" + "FILTER (! bound(?v0))\n" + "}", // script14
 
-        "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
-            + "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Male#> \n"
+            + "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Male#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "OPTIONAL {?entity ns1:wife ?v0}. \n" + "FILTER (! bound(?v0))\n" + "}", // script15
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "?entity ns1:name ?v0. \n"
             + "\n" + "}", // script16
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "?entity ns1:name ?v0. \n"
             + "\n" + "} ", // script17
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "?entity ns1:name ?v0. \n"
             + "\n" + "}\n", // script18
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "?entity ns1:name ?v0. \n"
             + "FILTER (?v0 > \"D\")\n" + "} ", // script19
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns2: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "?entity ns1:yearOfBirth ?v0. \n" + "?entity ns2:name ?v1. \n" + "FILTER (?v0 > \"1973\")\n" + "}\n"
             , // script20
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Person#> \n"
-            + "PREFIX ns2: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Person#> \n"
+            + "PREFIX ns2: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Person>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Person>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n"
             + "?entity ns1:placeOfBirth ?v0. \n" + "?v0 ns2:name ?v1. \n" + "?entity ns1:yearOfBirth ?v2. \n" + "\n"
             + "}", // script21
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Nameable>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "?entity ns1:name ?v0. \n"
             + "FILTER regex(?v0,\"J.*Doe\")\n" + "}", // script22
 
         "", // script23
 
-        "PREFIX ns1: <urn:qi4j:type:org.qi4j.test.indexing.model.Nameable#> \n"
-            + "PREFIX ns0: <urn:qi4j:type:org.qi4j.api.entity.Identity#> \n"
+        "PREFIX ns1: <urn:zest:type:org.apache.zest.test.indexing.model.Nameable#> \n"
+            + "PREFIX ns0: <urn:zest:type:org.apache.zest.api.entity.Identity#> \n"
             + "PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> \n"
             + "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> \n" + "SELECT DISTINCT ?identity\n"
-            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:qi4j:type:org.qi4j.test.indexing.model.Domain>. \n"
+            + "WHERE {\n" + "?entityType rdfs:subClassOf <urn:zest:type:org.apache.zest.test.indexing.model.Domain>. \n"
             + "?entity rdf:type ?entityType. \n" + "?entity ns0:identity ?identity. \n" + "?entity ns1:name ?v0. \n"
             + "FILTER (?v0 = ?domain)\n" + "}" // script24
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi173/Qi173IssueTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi173/Qi173IssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi173/Qi173IssueTest.java
index 9713bcc..009a5cd 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi173/Qi173IssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi173/Qi173IssueTest.java
@@ -31,7 +31,7 @@ import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.index.rdf.assembly.RdfMemoryStoreAssembler;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 import java.util.Iterator;
@@ -39,7 +39,7 @@ import java.util.Iterator;
 import static org.apache.zest.api.query.QueryExpressions.orderBy;
 
 public class Qi173IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
     public void assemble( ModuleAssembly module )
         throws AssemblyException

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/AbstractIssueTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/AbstractIssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/AbstractIssueTest.java
index 82fbc51..f09d95c 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/AbstractIssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/AbstractIssueTest.java
@@ -22,23 +22,23 @@ import org.apache.zest.api.unitofwork.UnitOfWorkCompletionException;
 import org.apache.zest.bootstrap.AssemblyException;
 import org.apache.zest.bootstrap.ModuleAssembly;
 import org.apache.zest.library.rdf.repository.MemoryRepositoryService;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 
 public abstract class AbstractIssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
-    private static final String DEFAULT_ACCOUNT_NAME = "qi4j";
+    private static final String DEFAULT_ACCOUNT_NAME = "zest";
 
     /**
-     * Creates a new qi4j account.
+     * Creates a new Apaxhe Zest account.
      *
      * @return The new account identity.
      *
      * @throws org.apache.zest.api.unitofwork.UnitOfWorkCompletionException
      *          Thrown if creational fail.
      */
-    protected final String newQi4jAccount()
+    protected final String newZestAccount()
         throws UnitOfWorkCompletionException
     {
         UnitOfWork work = module.newUnitOfWork();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationMandatory/IssueTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationMandatory/IssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationMandatory/IssueTest.java
index f464040..f39421d 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationMandatory/IssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationMandatory/IssueTest.java
@@ -50,7 +50,7 @@ public final class IssueTest
         throws Throwable
     {
         // Bootstrap the account
-        String id = newQi4jAccount();
+        String id = newZestAccount();
 
         // Make sure there's no unit of work
         assertNull( module.currentUnitOfWork() );
@@ -63,7 +63,7 @@ public final class IssueTest
         throws Throwable
     {
         // Bootstrap the account
-        String id = newQi4jAccount();
+        String id = newZestAccount();
 
         // Make sure there's no unit of work
         assertFalse( module.isUnitOfWorkActive() );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequired/IssueTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequired/IssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequired/IssueTest.java
index 9529bbf..40f692a 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequired/IssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequired/IssueTest.java
@@ -46,7 +46,7 @@ public final class IssueTest
         throws Throwable
     {
         // Bootstrap the account
-        String id = newQi4jAccount();
+        String id = newZestAccount();
 
         // Make sure there's no unit of work
         assertFalse( module.isUnitOfWorkActive() );
@@ -62,7 +62,7 @@ public final class IssueTest
         throws Throwable
     {
         // Bootstrap the account
-        String id = newQi4jAccount();
+        String id = newZestAccount();
 
         // Make sure there's no unit of work
         assertFalse( module.isUnitOfWorkActive() );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
index 7170081..18dc869 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi64/withPropagationRequiresNew/IssueTest.java
@@ -46,7 +46,7 @@ public class IssueTest
         throws Throwable
     {
         // Bootstrap the account
-        String id = newQi4jAccount();
+        String id = newZestAccount();
 
         // Make sure there's no unit of work
         assertFalse( module.isUnitOfWorkActive() );
@@ -62,7 +62,7 @@ public class IssueTest
         throws Throwable
     {
         // Bootstrap the account
-        String id = newQi4jAccount();
+        String id = newZestAccount();
 
         // Make sure there's no unit of work
         assertFalse( module.isUnitOfWorkActive() );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi66/Qi66IssueTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi66/Qi66IssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi66/Qi66IssueTest.java
index 22496fd..f655b32 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi66/Qi66IssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi66/Qi66IssueTest.java
@@ -28,7 +28,7 @@ import org.apache.zest.index.rdf.query.RdfQueryService;
 import org.apache.zest.library.rdf.entity.EntityStateSerializer;
 import org.apache.zest.library.rdf.entity.EntityTypeSerializer;
 import org.apache.zest.library.rdf.repository.MemoryRepositoryService;
-import org.apache.zest.test.AbstractQi4jTest;
+import org.apache.zest.test.AbstractZestTest;
 import org.apache.zest.test.EntityTestAssembler;
 import org.apache.zest.valueserialization.orgjson.OrgJsonValueSerializationService;
 
@@ -39,15 +39,15 @@ import static org.junit.Assert.fail;
  * Test for Qi-66
  */
 public class Qi66IssueTest
-    extends AbstractQi4jTest
+    extends AbstractZestTest
 {
-    private static final String ACCOUNT_NAME = "qi4j";
+    private static final String ACCOUNT_NAME = "zest";
 
     @Test
     public final void testCompleteAfterFind()
         throws Exception
     {
-        String accountIdentity = newQi4jAccount();
+        String accountIdentity = newZestAccount();
 
         UnitOfWork work = module.newUnitOfWork();
         AccountComposite account = work.get( AccountComposite.class, accountIdentity );
@@ -65,13 +65,13 @@ public class Qi66IssueTest
     }
 
     /**
-     * Creates a new qi4j account.
+     * Creates a new Apache Zest account.
      *
-     * @return The identity of qi4j account.
+     * @return The identity of Zest account.
      *
      * @throws UnitOfWorkCompletionException Thrown if creational fail.
      */
-    private String newQi4jAccount()
+    private String newZestAccount()
         throws UnitOfWorkCompletionException
     {
         UnitOfWork work = module.newUnitOfWork();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java
----------------------------------------------------------------------
diff --git a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java
index c4c78ba..bb7f78f 100644
--- a/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java
+++ b/extensions/indexing-rdf/src/test/java/org/apache/zest/index/rdf/qi95/Qi95IssueTest.java
@@ -175,8 +175,8 @@ public class Qi95IssueTest
     )
         throws AssemblyException
     {
-        Energy4Java qi4j = new Energy4Java();
-        Application application = qi4j.newApplication( new ApplicationAssembler()
+        Energy4Java zest = new Energy4Java();
+        Application application = zest.newApplication( new ApplicationAssembler()
         {
             @Override
             public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-solr/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/build.gradle b/extensions/indexing-solr/build.gradle
index 944d851..acbe7c5 100644
--- a/extensions/indexing-solr/build.gradle
+++ b/extensions/indexing-solr/build.gradle
@@ -22,15 +22,15 @@ description = "Apache Zest™ Solr Indexing Extension"
 jar { manifest {name = "Apache Zest™ Extension - Indexing - Solr" }}
 
 dependencies {
-  compile(project(":org.qi4j.core:org.qi4j.core.bootstrap"))
-  compile(project(":org.qi4j.libraries:org.qi4j.library.fileconfig"))
-  compile(project(":org.qi4j.libraries:org.qi4j.library.rdf"))
+  compile(project(":org.apache.zest.core:org.apache.zest.core.bootstrap"))
+  compile(project(":org.apache.zest.libraries:org.apache.zest.library.fileconfig"))
+  compile(project(":org.apache.zest.libraries:org.apache.zest.library.rdf"))
   compile(libraries.solr)
   compile libraries.slf4j_api
 
-  testCompile(project(":org.qi4j.core:org.qi4j.core.testsupport"))
+  testCompile(project(":org.apache.zest.core:org.apache.zest.core.testsupport"))
 
-  testRuntime(project(":org.qi4j.core:org.qi4j.core.runtime"))
+  testRuntime(project(":org.apache.zest.core:org.apache.zest.core.runtime"))
   testRuntime(libraries.servlet_api)
   testRuntime(libraries.logback)
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/95d31c05/extensions/indexing-solr/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/indexing-solr/dev-status.xml b/extensions/indexing-solr/dev-status.xml
index 9052325..da4d59f 100644
--- a/extensions/indexing-solr/dev-status.xml
+++ b/extensions/indexing-solr/dev-status.xml
@@ -15,10 +15,10 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<module xmlns="http://www.qi4j.org/schemas/2008/dev-status/1"
+<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.qi4j.org/schemas/2008/dev-status/1
-        http://www.qi4j.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
+        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <!--none,early,beta,stable,mature-->
         <codebase>stable</codebase>


Mime
View raw message