You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by ni...@apache.org on 2016/12/17 10:28:33 UTC

[57/81] [abbrv] zest-java git commit: ZEST-195 ; Replace all "zest" with "polygene"

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/property/PropertyEqualityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/property/PropertyEqualityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/property/PropertyEqualityTest.java
index 1dc9df9..fbccfa2 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/property/PropertyEqualityTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/property/PropertyEqualityTest.java
@@ -127,11 +127,11 @@ public class PropertyEqualityTest
     public void givenValuesOfTheSameTypeWhenTestingPropertyDescriptorEqualityExpectEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = polygene.api().valueDescriptorFor( some );
         PropertyDescriptor someCharPropDesc = someDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         Some other = buildSomeValue( valueBuilderFactory );
-        ValueDescriptor otherDescriptor = zest.api().valueDescriptorFor( other );
+        ValueDescriptor otherDescriptor = polygene.api().valueDescriptorFor( other );
         PropertyDescriptor otherCharPropDesc = otherDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         assertThat( "PropertyDescriptors equal",
@@ -146,11 +146,11 @@ public class PropertyEqualityTest
     public void givenValuesOfCommonTypesWhenTestingPropertyDescriptorEqualityExpectEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = polygene.api().valueDescriptorFor( some );
         PropertyDescriptor someCharPropDesc = someDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         PrimitivesValue primitive = buildPrimitivesValue( valueBuilderFactory );
-        ValueDescriptor primitiveDescriptor = zest.api().valueDescriptorFor( primitive );
+        ValueDescriptor primitiveDescriptor = polygene.api().valueDescriptorFor( primitive );
         PropertyDescriptor primitiveCharPropDesc = primitiveDescriptor.state()
             .findPropertyModelByName( "characterProperty" );
 
@@ -166,11 +166,11 @@ public class PropertyEqualityTest
     public void givenValuesOfDifferentTypesWhenTestingPropertyDescriptorEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = polygene.api().valueDescriptorFor( some );
         PropertyDescriptor someCharPropDesc = someDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         Other other = buildOtherValue( valueBuilderFactory );
-        ValueDescriptor otherDescriptor = zest.api().valueDescriptorFor( other );
+        ValueDescriptor otherDescriptor = polygene.api().valueDescriptorFor( other );
         PropertyDescriptor otherCharPropDesc = otherDescriptor.state().findPropertyModelByName( "characterProperty" );
 
         assertThat( "PropertyDescriptors not equal",

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java
index 6a00cea..d59b6ed 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/service/ServiceVisibilityTest.java
@@ -49,7 +49,7 @@ public class ServiceVisibilityTest
 {
     public static final Identity TEST_IDENTITY = new StringIdentity( "123" );
 
-    private Energy4Java zest;
+    private Energy4Java polygene;
     private Module module;
     private Application app;
     private UnitOfWorkFactory uowf;
@@ -58,7 +58,7 @@ public class ServiceVisibilityTest
     public void setup()
         throws Exception
     {
-        zest = new Energy4Java();
+        polygene = new Energy4Java();
 
         Assembler[][][] assemblers = new Assembler[][][]
             {
@@ -81,7 +81,7 @@ public class ServiceVisibilityTest
                   }
                 }
             };
-        app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         app.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java
index 4b7f500..19b91e2 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/transients/TransientVisibilityTest.java
@@ -49,7 +49,7 @@ import org.junit.Test;
 public class TransientVisibilityTest
 {
     public static final Identity TEST_IDENTITY = new StringIdentity( "123" );
-    private Energy4Java zest;
+    private Energy4Java polygene;
     private Module module;
     private Application app;
     private UnitOfWorkFactory uowf;
@@ -58,7 +58,7 @@ public class TransientVisibilityTest
     public void setup()
         throws Exception
     {
-        zest = new Energy4Java();
+        polygene = new Energy4Java();
 
         Assembler[][][] assemblers = new Assembler[][][]
             {
@@ -81,7 +81,7 @@ public class TransientVisibilityTest
                   }
                 }
             };
-        app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         app.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueEqualityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueEqualityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueEqualityTest.java
index aae3503..fa57b28 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueEqualityTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueEqualityTest.java
@@ -65,10 +65,10 @@ public class ValueEqualityTest
     public void givenValuesOfTheSameTypeWhenTestingValueDescriptorEqualityExpectEquals()
     {
         Some some = buildSomeValue(valueBuilderFactory);
-        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = polygene.api().valueDescriptorFor( some );
 
         Some other = buildSomeValue( valueBuilderFactory );
-        ValueDescriptor otherDescriptor = zest.api().valueDescriptorFor( other );
+        ValueDescriptor otherDescriptor = polygene.api().valueDescriptorFor( other );
 
         assertThat( "ValueDescriptors equal",
                     someDescriptor,
@@ -82,10 +82,10 @@ public class ValueEqualityTest
     public void givenValuesOfCommonTypesWhenTestingValueDescriptorEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = polygene.api().valueDescriptorFor( some );
 
         PrimitivesValue primitive = buildPrimitivesValue( valueBuilderFactory );
-        ValueDescriptor primitiveDescriptor = zest.api().valueDescriptorFor( primitive );
+        ValueDescriptor primitiveDescriptor = polygene.api().valueDescriptorFor( primitive );
 
         assertThat( "ValueDescriptors not equal",
                     someDescriptor,
@@ -99,10 +99,10 @@ public class ValueEqualityTest
     public void givenValuesOfDifferentTypesWhenTestingValueDescriptorEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        ValueDescriptor someDescriptor = zest.api().valueDescriptorFor( some );
+        ValueDescriptor someDescriptor = polygene.api().valueDescriptorFor( some );
 
         Other other = buildOtherValue( valueBuilderFactory );
-        ValueDescriptor otherDescriptor = zest.api().valueDescriptorFor( other );
+        ValueDescriptor otherDescriptor = polygene.api().valueDescriptorFor( other );
 
         assertThat( "ValueDescriptors not equal",
                     someDescriptor,
@@ -119,10 +119,10 @@ public class ValueEqualityTest
     public void givenValuesOfSameTypesAndSameStateWhenTestingValueStateEqualityExpectEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        AssociationStateHolder someState = zest.spi().stateOf( (ValueComposite) some );
+        AssociationStateHolder someState = polygene.spi().stateOf( (ValueComposite) some );
 
         Some some2 = buildSomeValue( valueBuilderFactory );
-        AssociationStateHolder some2State = zest.spi().stateOf( (ValueComposite) some2 );
+        AssociationStateHolder some2State = polygene.spi().stateOf( (ValueComposite) some2 );
 
         assertThat( "ValueStates equal",
                     someState,
@@ -136,10 +136,10 @@ public class ValueEqualityTest
     public void givenValuesOfSameTypesAndDifferentStateWhenTestingValueStateEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        AssociationStateHolder someState = zest.spi().stateOf( (ValueComposite) some );
+        AssociationStateHolder someState = polygene.spi().stateOf( (ValueComposite) some );
 
         Some some2 = buildSomeValueWithDifferentState( valueBuilderFactory );
-        AssociationStateHolder some2State = zest.spi().stateOf( (ValueComposite) some2 );
+        AssociationStateHolder some2State = polygene.spi().stateOf( (ValueComposite) some2 );
 
         assertThat( "ValueStates not equal",
                     someState,
@@ -153,10 +153,10 @@ public class ValueEqualityTest
     public void givenValuesOfDifferentTypesAndSameStateWhenTestingValueStateEqualityExpectEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        AssociationStateHolder someState = zest.spi().stateOf( (ValueComposite) some );
+        AssociationStateHolder someState = polygene.spi().stateOf( (ValueComposite) some );
 
         AnotherSome anotherSome = buildAnotherSomeValue( valueBuilderFactory );
-        AssociationStateHolder anotherSomeState = zest.spi().stateOf( (ValueComposite) anotherSome );
+        AssociationStateHolder anotherSomeState = polygene.spi().stateOf( (ValueComposite) anotherSome );
 
         assertThat( "ValueStates equal",
                     someState,
@@ -170,10 +170,10 @@ public class ValueEqualityTest
     public void givenValuesOfDifferentTypesAndDifferentStateWhenTestingValueStateEqualityExpectNotEquals()
     {
         Some some = buildSomeValue( valueBuilderFactory );
-        AssociationStateHolder someState = zest.spi().stateOf( (ValueComposite) some );
+        AssociationStateHolder someState = polygene.spi().stateOf( (ValueComposite) some );
 
         AnotherSome anotherSome = buildAnotherSomeValueWithDifferentState( valueBuilderFactory );
-        AssociationStateHolder anotherSomeState = zest.spi().stateOf( (ValueComposite) anotherSome );
+        AssociationStateHolder anotherSomeState = polygene.spi().stateOf( (ValueComposite) anotherSome );
 
         assertThat( "ValueStates not equal",
                     someState,

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java
index 018e8fa..4dff8ae 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/value/ValueVisibilityTest.java
@@ -50,7 +50,7 @@ public class ValueVisibilityTest
 {
 
     public static final Identity TEST_IDENTIY = new StringIdentity( "123" );
-    private Energy4Java zest;
+    private Energy4Java polygene;
     private Module module;
     private Application app;
     private UnitOfWorkFactory uowf;
@@ -59,7 +59,7 @@ public class ValueVisibilityTest
     public void setup()
         throws Exception
     {
-        zest = new Energy4Java();
+        polygene = new Energy4Java();
 
         Assembler[][][] assemblers = new Assembler[][][]
             {
@@ -82,7 +82,7 @@ public class ValueVisibilityTest
                   }
                 }
             };
-        app = zest.newApplication( new ApplicationAssemblerAdapter( assemblers )
+        app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers )
         {
         } );
         app.activate();

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java
index 70ef489..b7dfe66 100644
--- a/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/runtime/visibility/VisibilityInUnitOfWorkTest.java
@@ -141,8 +141,8 @@ public class VisibilityInUnitOfWorkTest
     private Application createApplication()
         throws AssemblyException
     {
-        Energy4Java zest = new Energy4Java();
-        return zest.newApplication( appFactory -> {
+        Energy4Java polygene = new Energy4Java();
+        return polygene.newApplication( appFactory -> {
             ApplicationAssembly appAssembly = appFactory.newApplicationAssembly();
             LayerAssembly layer1 = appAssembly.layer( "layer1" );
             ModuleAssembly myModule = layer1.module( "My Module" );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/runtime/src/test/java/org/apache/polygene/test/ASMTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/polygene/test/ASMTest.java b/core/runtime/src/test/java/org/apache/polygene/test/ASMTest.java
index f24a487..5179e8f 100644
--- a/core/runtime/src/test/java/org/apache/polygene/test/ASMTest.java
+++ b/core/runtime/src/test/java/org/apache/polygene/test/ASMTest.java
@@ -172,8 +172,8 @@ public class ASMTest
         MethodVisitor mv;
         AnnotationVisitor av0;
 
-        cw.visit( V1_6, ACC_PUBLIC + ACC_SUPER, "org/apache/zest/satisfiedBy/SomeMixin_Stub", null,
-                  "org/apache/zest/satisfiedBy/SomeMixin", null );
+        cw.visit( V1_6, ACC_PUBLIC + ACC_SUPER, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", null,
+                  "org/apache/polygene/satisfiedBy/SomeMixin", null );
 
         {
             fv = cw.visitField( ACC_PUBLIC, "_instance", "Lorg/apache/polygene/spi/composite/CompositeInvoker;", null, null );
@@ -203,7 +203,7 @@ public class ASMTest
             mv = cw.visitMethod( ACC_PUBLIC, "<init>", "()V", null, null );
             mv.visitCode();
             mv.visitVarInsn( ALOAD, 0 );
-            mv.visitMethodInsn( INVOKESPECIAL, "org/apache/zest/satisfiedBy/SomeMixin", "<init>", "()V", false );
+            mv.visitMethodInsn( INVOKESPECIAL, "org/apache/polygene/satisfiedBy/SomeMixin", "<init>", "()V", false );
             mv.visitInsn( RETURN );
             mv.visitMaxs( 1, 1 );
             mv.visitEnd();
@@ -213,7 +213,7 @@ public class ASMTest
             mv.visitCode();
             mv.visitVarInsn( ALOAD, 0 );
             mv.visitVarInsn( ALOAD, 1 );
-            mv.visitMethodInsn( INVOKESPECIAL, "org/apache/zest/satisfiedBy/SomeMixin", "<init>", "(Ljava/lang/String;)V", false );
+            mv.visitMethodInsn( INVOKESPECIAL, "org/apache/polygene/satisfiedBy/SomeMixin", "<init>", "(Ljava/lang/String;)V", false );
             mv.visitInsn( RETURN );
             mv.visitMaxs( 2, 2 );
             mv.visitEnd();
@@ -227,11 +227,11 @@ public class ASMTest
             mv.visitTryCatchBlock( l0, l1, l2, "java/lang/Throwable" );
             mv.visitLabel( l0 );
             mv.visitVarInsn( ALOAD, 0 );
-            mv.visitFieldInsn( GETFIELD, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "_instance",
+            mv.visitFieldInsn( GETFIELD, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "_instance",
                                "Lorg/apache/polygene/spi/composite/CompositeInvoker;" );
-            mv.visitFieldInsn( GETSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m1", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( GETSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m1", "Ljava/lang/reflect/Method;" );
             mv.visitInsn( ACONST_NULL );
-            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/zest/spi/composite/CompositeInvoker", "invokeComposite",
+            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/polygene/spi/composite/CompositeInvoker", "invokeComposite",
                                 "(Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;", true );
             mv.visitTypeInsn( CHECKCAST, "java/lang/String" );
             mv.visitLabel( l1 );
@@ -260,9 +260,9 @@ public class ASMTest
             mv.visitTryCatchBlock( l0, l1, l3, "java/lang/Throwable" );
             mv.visitLabel( l0 );
             mv.visitVarInsn( ALOAD, 0 );
-            mv.visitFieldInsn( GETFIELD, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "_instance",
+            mv.visitFieldInsn( GETFIELD, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "_instance",
                                "Lorg/apache/polygene/spi/composite/CompositeInvoker;" );
-            mv.visitFieldInsn( GETSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m2", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( GETSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m2", "Ljava/lang/reflect/Method;" );
             mv.visitInsn( ICONST_2 );
             mv.visitTypeInsn( ANEWARRAY, "java/lang/Object" );
             mv.visitInsn( DUP );
@@ -274,7 +274,7 @@ public class ASMTest
             mv.visitVarInsn( ILOAD, 2 );
             mv.visitMethodInsn( INVOKESTATIC, "java/lang/Integer", "valueOf", "(I)Ljava/lang/Integer;", false );
             mv.visitInsn( AASTORE );
-            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/zest/spi/composite/CompositeInvoker", "invokeComposite",
+            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/polygene/spi/composite/CompositeInvoker", "invokeComposite",
                                 "(Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;", true );
             mv.visitTypeInsn( CHECKCAST, "java/lang/String" );
             mv.visitLabel( l1 );
@@ -305,9 +305,9 @@ public class ASMTest
             mv.visitTryCatchBlock( l0, l1, l2, "java/lang/Throwable" );
             mv.visitLabel( l0 );
             mv.visitVarInsn( ALOAD, 0 );
-            mv.visitFieldInsn( GETFIELD, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "_instance",
+            mv.visitFieldInsn( GETFIELD, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "_instance",
                                "Lorg/apache/polygene/spi/composite/CompositeInvoker;" );
-            mv.visitFieldInsn( GETSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m3", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( GETSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m3", "Ljava/lang/reflect/Method;" );
             mv.visitIntInsn( BIPUSH, 11 );
             mv.visitTypeInsn( ANEWARRAY, "java/lang/Object" );
             mv.visitInsn( DUP );
@@ -362,7 +362,7 @@ public class ASMTest
             mv.visitIntInsn( BIPUSH, 10 );
             mv.visitVarInsn( ALOAD, 13 );
             mv.visitInsn( AASTORE );
-            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/zest/spi/composite/CompositeInvoker", "invokeComposite",
+            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/polygene/spi/composite/CompositeInvoker", "invokeComposite",
                                 "(Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;", true );
             mv.visitInsn( POP );
             mv.visitLabel( l1 );
@@ -385,40 +385,40 @@ public class ASMTest
         }
         {
             mv = cw.visitMethod( ACC_PUBLIC, "multiEx", "(Ljava/lang/String;)V", null,
-                                 new String[]{ "org/apache/zest/satisfiedBy/Exception1", "org/apache/zest/satisfiedBy/Exception2" } );
+                                 new String[]{ "org/apache/polygene/satisfiedBy/Exception1", "org/apache/polygene/satisfiedBy/Exception2" } );
             mv.visitCode();
             Label l0 = new Label();
             Label l1 = new Label();
             Label l2 = new Label();
-            mv.visitTryCatchBlock( l0, l1, l2, "org/apache/zest/satisfiedBy/Exception1" );
+            mv.visitTryCatchBlock( l0, l1, l2, "org/apache/polygene/satisfiedBy/Exception1" );
             Label l3 = new Label();
-            mv.visitTryCatchBlock( l0, l1, l3, "org/apache/zest/satisfiedBy/Exception2" );
+            mv.visitTryCatchBlock( l0, l1, l3, "org/apache/polygene/satisfiedBy/Exception2" );
             Label l4 = new Label();
             mv.visitTryCatchBlock( l0, l1, l4, "java/lang/Throwable" );
             mv.visitLabel( l0 );
             mv.visitVarInsn( ALOAD, 0 );
-            mv.visitFieldInsn( GETFIELD, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "_instance",
+            mv.visitFieldInsn( GETFIELD, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "_instance",
                                "Lorg/apache/polygene/spi/composite/CompositeInvoker;" );
-            mv.visitFieldInsn( GETSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m4", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( GETSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m4", "Ljava/lang/reflect/Method;" );
             mv.visitInsn( ICONST_1 );
             mv.visitTypeInsn( ANEWARRAY, "java/lang/Object" );
             mv.visitInsn( DUP );
             mv.visitInsn( ICONST_0 );
             mv.visitVarInsn( ALOAD, 1 );
             mv.visitInsn( AASTORE );
-            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/zest/spi/composite/CompositeInvoker", "invokeComposite",
+            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/polygene/spi/composite/CompositeInvoker", "invokeComposite",
                                 "(Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;", true );
             mv.visitInsn( POP );
             mv.visitLabel( l1 );
             Label l5 = new Label();
             mv.visitJumpInsn( GOTO, l5 );
             mv.visitLabel( l2 );
-            mv.visitFrame( Opcodes.F_SAME1, 0, null, 1, new Object[]{ "org/apache/zest/satisfiedBy/Exception1" } );
+            mv.visitFrame( Opcodes.F_SAME1, 0, null, 1, new Object[]{ "org/apache/polygene/satisfiedBy/Exception1" } );
             mv.visitVarInsn( ASTORE, 2 );
             mv.visitVarInsn( ALOAD, 2 );
             mv.visitInsn( ATHROW );
             mv.visitLabel( l3 );
-            mv.visitFrame( Opcodes.F_SAME1, 0, null, 1, new Object[]{ "org/apache/zest/satisfiedBy/Exception2" } );
+            mv.visitFrame( Opcodes.F_SAME1, 0, null, 1, new Object[]{ "org/apache/polygene/satisfiedBy/Exception2" } );
             mv.visitVarInsn( ASTORE, 2 );
             mv.visitVarInsn( ALOAD, 2 );
             mv.visitInsn( ATHROW );
@@ -446,11 +446,11 @@ public class ASMTest
             mv.visitTryCatchBlock( l0, l1, l2, "java/lang/Throwable" );
             mv.visitLabel( l0 );
             mv.visitVarInsn( ALOAD, 0 );
-            mv.visitFieldInsn( GETFIELD, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "_instance",
+            mv.visitFieldInsn( GETFIELD, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "_instance",
                                "Lorg/apache/polygene/spi/composite/CompositeInvoker;" );
-            mv.visitFieldInsn( GETSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m5", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( GETSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m5", "Ljava/lang/reflect/Method;" );
             mv.visitInsn( ACONST_NULL );
-            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/zest/spi/composite/CompositeInvoker", "invokeComposite",
+            mv.visitMethodInsn( INVOKEINTERFACE, "org/apache/polygene/spi/composite/CompositeInvoker", "invokeComposite",
                                 "(Ljava/lang/reflect/Method;[Ljava/lang/Object;)Ljava/lang/Object;", true );
             mv.visitTypeInsn( CHECKCAST, "java/lang/Integer" );
             mv.visitMethodInsn( INVOKEVIRTUAL, "java/lang/Integer", "intValue", "()I", false );
@@ -482,7 +482,7 @@ public class ASMTest
             mv.visitTypeInsn( ANEWARRAY, "java/lang/Class" );
             mv.visitMethodInsn( INVOKEVIRTUAL, "java/lang/Class", "getMethod",
                                 "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;", false );
-            mv.visitFieldInsn( PUTSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m1", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( PUTSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m1", "Ljava/lang/reflect/Method;" );
             mv.visitLdcInsn( Type.getType( "Lorg/apache/polygene/satisfiedBy/Other;" ) );
             mv.visitLdcInsn( "foo" );
             mv.visitInsn( ICONST_2 );
@@ -497,7 +497,7 @@ public class ASMTest
             mv.visitInsn( AASTORE );
             mv.visitMethodInsn( INVOKEVIRTUAL, "java/lang/Class", "getMethod",
                                 "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;", false );
-            mv.visitFieldInsn( PUTSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m2", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( PUTSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m2", "Ljava/lang/reflect/Method;" );
             mv.visitLdcInsn( Type.getType( "Lorg/apache/polygene/satisfiedBy/Other;" ) );
             mv.visitLdcInsn( "bar" );
             mv.visitIntInsn( BIPUSH, 11 );
@@ -548,7 +548,7 @@ public class ASMTest
             mv.visitInsn( AASTORE );
             mv.visitMethodInsn( INVOKEVIRTUAL, "java/lang/Class", "getMethod",
                                 "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;", false );
-            mv.visitFieldInsn( PUTSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m3", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( PUTSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m3", "Ljava/lang/reflect/Method;" );
             mv.visitLdcInsn( Type.getType( "Lorg/apache/polygene/satisfiedBy/Other;" ) );
             mv.visitLdcInsn( "multiEx" );
             mv.visitInsn( ICONST_1 );
@@ -559,14 +559,14 @@ public class ASMTest
             mv.visitInsn( AASTORE );
             mv.visitMethodInsn( INVOKEVIRTUAL, "java/lang/Class", "getMethod",
                                 "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;", false );
-            mv.visitFieldInsn( PUTSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m4", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( PUTSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m4", "Ljava/lang/reflect/Method;" );
             mv.visitLdcInsn( Type.getType( "Lorg/apache/polygene/satisfiedBy/Other;" ) );
             mv.visitLdcInsn( "unwrapResult" );
             mv.visitInsn( ICONST_0 );
             mv.visitTypeInsn( ANEWARRAY, "java/lang/Class" );
             mv.visitMethodInsn( INVOKEVIRTUAL, "java/lang/Class", "getMethod",
                                 "(Ljava/lang/String;[Ljava/lang/Class;)Ljava/lang/reflect/Method;", false );
-            mv.visitFieldInsn( PUTSTATIC, "org/apache/zest/satisfiedBy/SomeMixin_Stub", "m5", "Ljava/lang/reflect/Method;" );
+            mv.visitFieldInsn( PUTSTATIC, "org/apache/polygene/satisfiedBy/SomeMixin_Stub", "m5", "Ljava/lang/reflect/Method;" );
             mv.visitLabel( l1 );
             Label l3 = new Label();
             mv.visitJumpInsn( GOTO, l3 );

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/spi/build.gradle
----------------------------------------------------------------------
diff --git a/core/spi/build.gradle b/core/spi/build.gradle
index 05d6f4a..7aa42b4 100644
--- a/core/spi/build.gradle
+++ b/core/spi/build.gradle
@@ -21,11 +21,11 @@
 jar { manifest { name = "Apache Polygene\u2122 Core SPI" } }
 
 dependencies {
-  compile zest.core.api
+  compile polygene.core.api
   compile libraries.org_json
 
-  testCompile zest.core.testsupport
+  testCompile polygene.core.testsupport
 
-  testRuntime zest.core.runtime
+  testRuntime polygene.core.runtime
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/spi/dev-status.xml
----------------------------------------------------------------------
diff --git a/core/spi/dev-status.xml b/core/spi/dev-status.xml
index 994ff62..ba367e6 100644
--- a/core/spi/dev-status.xml
+++ b/core/spi/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <codebase>stable</codebase>
     <!--none,early,beta,stable,mature-->

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/testsupport/build.gradle
----------------------------------------------------------------------
diff --git a/core/testsupport/build.gradle b/core/testsupport/build.gradle
index 5099a20..932d44a 100644
--- a/core/testsupport/build.gradle
+++ b/core/testsupport/build.gradle
@@ -21,8 +21,8 @@
 jar { manifest { name = "Apache Polygene\u2122 Core TestSupport" } }
 
 dependencies {
-  compile zest.core.bootstrap
+  compile polygene.core.bootstrap
   compile libraries.junit
 
-  testRuntime zest.core.runtime
+  testRuntime polygene.core.runtime
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/testsupport/dev-status.xml
----------------------------------------------------------------------
diff --git a/core/testsupport/dev-status.xml b/core/testsupport/dev-status.xml
index 06868c6..2e7c7ff 100644
--- a/core/testsupport/dev-status.xml
+++ b/core/testsupport/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <codebase>stable</codebase>
     <!--none,early,beta,stable,mature-->

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/testsupport/src/docs/testsupport.txt
----------------------------------------------------------------------
diff --git a/core/testsupport/src/docs/testsupport.txt b/core/testsupport/src/docs/testsupport.txt
index 4163a5b..d0abd44 100644
--- a/core/testsupport/src/docs/testsupport.txt
+++ b/core/testsupport/src/docs/testsupport.txt
@@ -36,7 +36,7 @@ In most cases, you will probably use the AbstractPolygeneTest class to simplify
 
 [snippet,java]
 --------------
-source=tutorials/hello/src/test/java/org/apache/zest/tutorials/hello/HelloTest.java
+source=tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java
 tag=step1
 --------------
 
@@ -45,7 +45,7 @@ What goes into that module is declared in the assembly() method;
 
 [snippet,java]
 --------------
-source=tutorials/hello/src/test/java/org/apache/zest/tutorials/hello/HelloTest.java
+source=tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java
 tag=step2
 --------------
 
@@ -53,7 +53,7 @@ In this case we declare that we have a ValueComposite of type org.apache.polygen
 
 [snippet,java]
 --------------
-source=tutorials/hello/src/main/java/org/apache/zest/tutorials/hello/Hello.java
+source=tutorials/hello/src/main/java/org/apache/polygene/tutorials/hello/Hello.java
 tag=body
 --------------
 
@@ -64,7 +64,7 @@ And then we create the actual test;
 
 [snippet,java]
 --------------
-source=tutorials/hello/src/test/java/org/apache/zest/tutorials/hello/HelloTest.java
+source=tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java
 tag=step3
 --------------
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java
index 7d81352..18e1c24 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestBaseTest.java
@@ -40,7 +40,7 @@ public abstract class AbstractPolygeneBaseTest
     protected PolygeneAPI api;
     protected PolygeneSPI spi;
 
-    protected Energy4Java zest;
+    protected Energy4Java polygene;
     protected ApplicationDescriptor applicationModel;
     protected Application application;
 
@@ -48,7 +48,7 @@ public abstract class AbstractPolygeneBaseTest
     public void setUp()
         throws Exception
     {
-        zest = new Energy4Java();
+        polygene = new Energy4Java();
         applicationModel = newApplication();
         if( applicationModel == null )
         {
@@ -57,7 +57,7 @@ public abstract class AbstractPolygeneBaseTest
         }
         application = newApplicationInstance( applicationModel );
         initApplication( application );
-        api = spi = zest.spi();
+        api = spi = polygene.spi();
         application.activate();
     }
 
@@ -73,7 +73,7 @@ public abstract class AbstractPolygeneBaseTest
 
     protected Application newApplicationInstance( ApplicationDescriptor applicationModel )
     {
-        return applicationModel.newInstance( zest.api() );
+        return applicationModel.newInstance( polygene.api() );
     }
 
     protected ApplicationDescriptor newApplication()
@@ -94,7 +94,7 @@ public abstract class AbstractPolygeneBaseTest
 
         try
         {
-            return zest.newApplicationModel( assembler );
+            return polygene.newApplicationModel( assembler );
         }
         catch( AssemblyException e )
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java
index dc47566..4f85962 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/AbstractZestScenarioTest.java
@@ -43,7 +43,7 @@ public abstract class AbstractPolygeneScenarioTest
     static protected PolygeneAPI api;
     static protected PolygeneSPI spi;
 
-    static protected Energy4Java zest;
+    static protected Energy4Java polygene;
     static protected ApplicationDescriptor applicationModel;
     static protected Application application;
 
@@ -56,16 +56,16 @@ public abstract class AbstractPolygeneScenarioTest
     public static void setUp()
         throws Exception
     {
-        zest = new Energy4Java();
+        polygene = new Energy4Java();
         applicationModel = newApplication();
         if( applicationModel == null )
         {
             // An AssemblyException has occurred that the Test wants to check for.
             return;
         }
-        application = applicationModel.newInstance( zest.spi() );
+        application = applicationModel.newInstance( polygene.spi() );
         initApplication( application );
-        api = spi = zest.spi();
+        api = spi = polygene.spi();
         application.activate();
 
         // Assume only one module
@@ -81,7 +81,7 @@ public abstract class AbstractPolygeneScenarioTest
         ApplicationAssembler assembler = applicationFactory -> applicationFactory.newApplicationAssembly( asm );
         try
         {
-            return zest.newApplicationModel( assembler );
+            return polygene.newApplicationModel( assembler );
         }
         catch( AssemblyException e )
         {

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractPlainValueSerializationTest.java
----------------------------------------------------------------------
diff --git a/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractPlainValueSerializationTest.java b/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractPlainValueSerializationTest.java
index 6ce5076..29d17ef 100644
--- a/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractPlainValueSerializationTest.java
+++ b/core/testsupport/src/main/java/org/apache/polygene/test/value/AbstractPlainValueSerializationTest.java
@@ -232,7 +232,7 @@ public abstract class AbstractPlainValueSerializationTest
     }
 
     @Test
-    public void zest142RegressionTest()
+    public void polygene142RegressionTest()
         throws Exception
     {
         if( getClass().getName().equals( "org.apache.polygene.valueserialization.stax.StaxPlainValueSerializationTest" ) )

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/doap.rdf
----------------------------------------------------------------------
diff --git a/doap.rdf b/doap.rdf
index 1159202..9fbc5de 100644
--- a/doap.rdf
+++ b/doap.rdf
@@ -29,17 +29,17 @@
 
   =======================================================================
 -->
-  <Project rdf:about="http://zest.apache.org/">
+  <Project rdf:about="http://polygene.apache.org/">
     <created>2008-12-17</created>
     <license rdf:resource="http://usefulinc.com/doap/licenses/asl20" />
     <name>Apache Polygene</name>
-    <homepage rdf:resource="https://zest.apache.org/" />
-    <asfext:pmc rdf:resource="https://zest.apache.org" />
+    <homepage rdf:resource="https://polygene.apache.org/" />
+    <asfext:pmc rdf:resource="https://polygene.apache.org" />
     <shortdesc>Apache Polygene is a community based effort exploring Composite Oriented Programming for domain centric application development.</shortdesc>
     <description>Apache Polygene is a community based effort exploring Composite Oriented Programming for domain centric application development. This includes evolved concepts from Aspect Oriented Programming, Dependency Injection and Domain Driven Design. Composite Oriented Programming allows developers to work with 'fragments', smaller than classes, and 'compose' fragments into larger 'composites' which acts like the regular objects. Polygene also tackles the enforcement of application composition, i.e. composites are declared in modules, modules are contained in layers and access between layers are controlled/enforced. Apache Polygene\u2122 (Java Edition), first Apache Polygene sub-project, is an implementation of Composite Oriented Programming, using the standard Java platform, without the use of any pre-processors or new language elements. Everything you know from Java still applies and you can leverage both your experience and toolkits to become more productive with Composite Or
 iented Programming today.</description>
     <bug-database rdf:resource="https://issues.apache.org/jira/browse/ZEST" />
     <mailing-list rdf:resource="https://www.apache.org/foundation/mailinglists.html" />
-    <download-page rdf:resource="https://zest.apache.org/download.html" />
+    <download-page rdf:resource="https://polygene.apache.org/download.html" />
     <programming-language>Java</programming-language>
     <programming-language>C#</programming-language>
     <programming-language>Scala</programming-language>
@@ -48,14 +48,14 @@
     <category rdf:resource="http://projects.apache.org/category/library" />
     <repository>
       <SVNRepository>
-        <location rdf:resource="http://svn.apache.org/repos/asf/zest/"/>
-        <browse rdf:resource="http://svn.apache.org/viewcvs.cgi/zest/"/>
+        <location rdf:resource="http://svn.apache.org/repos/asf/polygene/"/>
+        <browse rdf:resource="http://svn.apache.org/viewcvs.cgi/polygene/"/>
       </SVNRepository>
     </repository>
     <repository>
       <GitRepository>
-        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/zest-java.git"/>
-        <browse rdf:resource="https://github.com/apache/zest-java"/>
+        <location rdf:resource="https://git-wip-us.apache.org/repos/asf/polygene-java.git"/>
+        <browse rdf:resource="https://github.com/apache/polygene-java"/>
       </GitRepository>
     </repository>
     <maintainer>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/cache-ehcache/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/build.gradle b/extensions/cache-ehcache/build.gradle
index 2cdd3bc..9845cb1 100644
--- a/extensions/cache-ehcache/build.gradle
+++ b/extensions/cache-ehcache/build.gradle
@@ -23,14 +23,14 @@ description = "Apache Polygene\u2122 Ehcache Cache Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension: EhCache" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'constraints' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'constraints' )
   compile libraries.ehcache
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/cache-ehcache/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/dev-status.xml b/extensions/cache-ehcache/dev-status.xml
index dd1f1d9..e6cf5af 100644
--- a/extensions/cache-ehcache/dev-status.xml
+++ b/extensions/cache-ehcache/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/cache-ehcache/src/docs/cache-ehcache.txt
----------------------------------------------------------------------
diff --git a/extensions/cache-ehcache/src/docs/cache-ehcache.txt b/extensions/cache-ehcache/src/docs/cache-ehcache.txt
index 36444f6..3ffcfbd 100644
--- a/extensions/cache-ehcache/src/docs/cache-ehcache.txt
+++ b/extensions/cache-ehcache/src/docs/cache-ehcache.txt
@@ -40,7 +40,7 @@ Assembly is done using the provided Assembler:
 
 [snippet,java]
 ----
-source=extensions/cache-ehcache/src/test/java/org/apache/zest/cache/ehcache/EhCacheTest.java
+source=extensions/cache-ehcache/src/test/java/org/apache/polygene/cache/ehcache/EhCacheTest.java
 tag=assembly
 ----
 
@@ -51,6 +51,6 @@ Here are the configuration properties for the EhCache EntityStore Cache:
 
 [snippet,java]
 ----
-source=extensions/cache-ehcache/src/main/java/org/apache/zest/cache/ehcache/EhCacheConfiguration.java
+source=extensions/cache-ehcache/src/main/java/org/apache/polygene/cache/ehcache/EhCacheConfiguration.java
 tag=config
 ----

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/cache-memcache/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/build.gradle b/extensions/cache-memcache/build.gradle
index e1b58ed..597c41c 100644
--- a/extensions/cache-memcache/build.gradle
+++ b/extensions/cache-memcache/build.gradle
@@ -23,13 +23,13 @@ description = "Apache Polygene\u2122 Memcache Cache Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - Cache - Memcache" } }
 
 dependencies {
-  compile zest.core.bootstrap
+  compile polygene.core.bootstrap
   compile libraries.spymemcached
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/cache-memcache/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/dev-status.xml b/extensions/cache-memcache/dev-status.xml
index dd1f1d9..e6cf5af 100644
--- a/extensions/cache-memcache/dev-status.xml
+++ b/extensions/cache-memcache/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/cache-memcache/src/docs/cache-memcache.txt
----------------------------------------------------------------------
diff --git a/extensions/cache-memcache/src/docs/cache-memcache.txt b/extensions/cache-memcache/src/docs/cache-memcache.txt
index 12a075e..ef2adf3 100644
--- a/extensions/cache-memcache/src/docs/cache-memcache.txt
+++ b/extensions/cache-memcache/src/docs/cache-memcache.txt
@@ -47,7 +47,7 @@ Assembly is done using the +MemcacheAssembler+:
 
 [snippet,java]
 ----
-source=extensions/cache-memcache/src/test/java/org/apache/zest/cache/memcache/MemcacheCachePoolTest.java
+source=extensions/cache-memcache/src/test/java/org/apache/polygene/cache/memcache/MemcacheCachePoolTest.java
 tag=assembly
 ----
 
@@ -58,7 +58,7 @@ Here are the configuration properties for the Memcache EntityStore Cache:
 
 [snippet,java]
 ----
-source=extensions/cache-memcache/src/main/java/org/apache/zest/cache/memcache/MemcacheConfiguration.java
+source=extensions/cache-memcache/src/main/java/org/apache/polygene/cache/memcache/MemcacheConfiguration.java
 tag=config
 ----
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-file/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/build.gradle b/extensions/entitystore-file/build.gradle
index 6235259..83789b2 100644
--- a/extensions/entitystore-file/build.gradle
+++ b/extensions/entitystore-file/build.gradle
@@ -21,15 +21,15 @@
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - File system" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
-  compile zest.library( 'constraints' )
-  compile zest.library( 'fileconfig' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
+  compile polygene.library( 'constraints' )
+  compile polygene.library( 'fileconfig' )
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-file/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/dev-status.xml b/extensions/entitystore-file/dev-status.xml
index f4cca09..8d582e2 100644
--- a/extensions/entitystore-file/dev-status.xml
+++ b/extensions/entitystore-file/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/entitystore-file/src/docs/es-file.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-file/src/docs/es-file.txt b/extensions/entitystore-file/src/docs/es-file.txt
index 6a383f0..72946dc 100644
--- a/extensions/entitystore-file/src/docs/es-file.txt
+++ b/extensions/entitystore-file/src/docs/es-file.txt
@@ -37,7 +37,7 @@ Assembly is done as follows:
 
 [snippet,java]
 ----
-source=extensions/entitystore-file/src/test/java/org/apache/zest/entitystore/file/FileEntityStoreTest.java
+source=extensions/entitystore-file/src/test/java/org/apache/polygene/entitystore/file/FileEntityStoreTest.java
 tag=assembly
 ----
 
@@ -47,13 +47,13 @@ Here are the configuration properties for the File EntityStore:
 
 [snippet,java]
 ----
-source=extensions/entitystore-file/src/main/java/org/apache/zest/entitystore/file/FileEntityStoreConfiguration.java
+source=extensions/entitystore-file/src/main/java/org/apache/polygene/entitystore/file/FileEntityStoreConfiguration.java
 tag=config
 ----
 
 +directory+ is optional and represent the directory where the File EntityStore will keep its persisted state.
 
-It defaults to System.getProperty( "user.dir" ) + "/zest/filestore"
+It defaults to System.getProperty( "user.dir" ) + "/polygene/filestore"
 If the given path is not absolute, then it's relative to the current working directory.
 If you use the <<library-fileconfig>> then this property value is ignored and FileConfig is prefered.
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-geode/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-geode/build.gradle b/extensions/entitystore-geode/build.gradle
index 5855834..79ef02b 100644
--- a/extensions/entitystore-geode/build.gradle
+++ b/extensions/entitystore-geode/build.gradle
@@ -23,14 +23,14 @@ description = "Apache Polygene\u2122 Geode EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - Geode" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
   compile libraries.geode
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-geode/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-geode/dev-status.xml b/extensions/entitystore-geode/dev-status.xml
index 331defe..c79727f 100644
--- a/extensions/entitystore-geode/dev-status.xml
+++ b/extensions/entitystore-geode/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/entitystore-geode/src/docs/es-geode.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-geode/src/docs/es-geode.txt b/extensions/entitystore-geode/src/docs/es-geode.txt
index 944df47..301fa21 100644
--- a/extensions/entitystore-geode/src/docs/es-geode.txt
+++ b/extensions/entitystore-geode/src/docs/es-geode.txt
@@ -36,7 +36,7 @@ Assembly is done using the provided Assembler:
 
 [snippet,java]
 ----
-source=extensions/entitystore-geode/src/test/java/org/apache/zest/entitystore/geode/GeodeEntityStoreTest.java
+source=extensions/entitystore-geode/src/test/java/org/apache/polygene/entitystore/geode/GeodeEntityStoreTest.java
 tag=assembly
 ----
 
@@ -46,6 +46,6 @@ Here are the configuration properties for the Geode EntityStore:
 
 [snippet,java]
 ----
-source=extensions/entitystore-geode/src/main/java/org/apache/zest/entitystore/geode/GeodeConfiguration.java
+source=extensions/entitystore-geode/src/main/java/org/apache/polygene/entitystore/geode/GeodeConfiguration.java
 tag=config
 ----

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-hazelcast/README.persistent
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/README.persistent b/extensions/entitystore-hazelcast/README.persistent
index e8baf5b..70bc272 100644
--- a/extensions/entitystore-hazelcast/README.persistent
+++ b/extensions/entitystore-hazelcast/README.persistent
@@ -17,7 +17,7 @@ Implementation is set as follow:
 
     <?xml version="1.0" encoding="UTF-8"?>
     <hazelcast>
-        <map name="zest.data">
+        <map name="polygene.data">
             <map-store enabled="true">
                 <!--
                    Name of the class implementing MapLoader and/or MapStore.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-hazelcast/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/build.gradle b/extensions/entitystore-hazelcast/build.gradle
index be18394..bf88c81 100644
--- a/extensions/entitystore-hazelcast/build.gradle
+++ b/extensions/entitystore-hazelcast/build.gradle
@@ -23,14 +23,14 @@ description = "Apache Polygene\u2122 Hazelcast EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - Hazelcast" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
   compile libraries.hazelcast
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-hazelcast/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/dev-status.xml b/extensions/entitystore-hazelcast/dev-status.xml
index b99d6bc..762e250 100644
--- a/extensions/entitystore-hazelcast/dev-status.xml
+++ b/extensions/entitystore-hazelcast/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt b/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt
index cb02522..1f3ef5a 100644
--- a/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt
+++ b/extensions/entitystore-hazelcast/src/docs/es-hazelcast.txt
@@ -35,7 +35,7 @@ Assembly is done using the provided Assembler:
 
 [snippet,java]
 ----
-source=extensions/entitystore-hazelcast/src/test/java/org/apache/zest/entitystore/hazelcast/HazelcastEntityStoreTest.java
+source=extensions/entitystore-hazelcast/src/test/java/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreTest.java
 tag=assembly
 ----
 
@@ -45,7 +45,7 @@ Here are the configuration properties for the Hazelcast EntityStore:
 
 [snippet,java]
 ----
-source=extensions/entitystore-hazelcast/src/main/java/org/apache/zest/entitystore/hazelcast/HazelcastConfiguration.java
+source=extensions/entitystore-hazelcast/src/main/java/org/apache/polygene/entitystore/hazelcast/HazelcastConfiguration.java
 tag=config
 ----
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreService.properties
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreService.properties b/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreService.properties
index 1d1abe0..e898a18 100644
--- a/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreService.properties
+++ b/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/HazelcastEntityStoreService.properties
@@ -18,4 +18,4 @@
 #
 #
 
-mapName=zest.data
\ No newline at end of file
+mapName=polygene.data
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/hazelcast.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/hazelcast.xml b/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/hazelcast.xml
index d69073e..cc52305 100644
--- a/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/hazelcast.xml
+++ b/extensions/entitystore-hazelcast/src/test/resources/org/apache/polygene/entitystore/hazelcast/hazelcast.xml
@@ -19,7 +19,7 @@
   ~
   -->
 <hazelcast>
-  <map name="zest.data">
+  <map name="polygene.data">
     <map-store enabled="true">
       <!--
          Name of the class implementing MapLoader and/or MapStore.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-jclouds/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/build.gradle b/extensions/entitystore-jclouds/build.gradle
index 8a4c4ef..32a56d2 100644
--- a/extensions/entitystore-jclouds/build.gradle
+++ b/extensions/entitystore-jclouds/build.gradle
@@ -23,17 +23,17 @@ description = "Apache Polygene\u2122 JClouds EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - JClouds" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
-  compile zest.library( 'fileconfig' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
+  compile polygene.library( 'fileconfig' )
   compile libraries.jclouds_core
   compile libraries.jclouds_blobstore
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
   runtime libraries.jaxb_api
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
   testCompile libraries.jclouds_filesystem
 
   testRuntime libraries.logback

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-jclouds/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/dev-status.xml b/extensions/entitystore-jclouds/dev-status.xml
index a58277d..ff99de4 100644
--- a/extensions/entitystore-jclouds/dev-status.xml
+++ b/extensions/entitystore-jclouds/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <codebase>stable</codebase>
         <!--none,early,beta,stable,mature-->

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-jclouds/src/docs/es-jclouds.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jclouds/src/docs/es-jclouds.txt b/extensions/entitystore-jclouds/src/docs/es-jclouds.txt
index 6067168..7f8b053 100644
--- a/extensions/entitystore-jclouds/src/docs/es-jclouds.txt
+++ b/extensions/entitystore-jclouds/src/docs/es-jclouds.txt
@@ -44,7 +44,7 @@ Assembly is done using the provided Assembler:
 
 [snippet,java]
 ----
-source=extensions/entitystore-jclouds/src/test/java/org/apache/zest/entitystore/jclouds/JCloudsTransientTest.java
+source=extensions/entitystore-jclouds/src/test/java/org/apache/polygene/entitystore/jclouds/JCloudsTransientTest.java
 tag=assembly
 ----
 
@@ -54,6 +54,6 @@ Here are the configuration properties for the JClouds EntityStore:
 
 [snippet,java]
 ----
-source=extensions/entitystore-jclouds/src/main/java/org/apache/zest/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java
+source=extensions/entitystore-jclouds/src/main/java/org/apache/polygene/entitystore/jclouds/JCloudsMapEntityStoreConfiguration.java
 tag=config
 ----

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-jdbm/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/build.gradle b/extensions/entitystore-jdbm/build.gradle
index 0cc01c7..822686f 100644
--- a/extensions/entitystore-jdbm/build.gradle
+++ b/extensions/entitystore-jdbm/build.gradle
@@ -23,15 +23,15 @@ description = "Apache Polygene\u2122 JDBM EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - JDBM" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
-  compile zest.library( 'fileconfig' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
+  compile polygene.library( 'fileconfig' )
   compile libraries.jdbm
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-jdbm/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/dev-status.xml b/extensions/entitystore-jdbm/dev-status.xml
index b99d6bc..762e250 100644
--- a/extensions/entitystore-jdbm/dev-status.xml
+++ b/extensions/entitystore-jdbm/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-jdbm/src/docs/es-jdbm.txt b/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
index 3ef8224..c50edb5 100644
--- a/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
+++ b/extensions/entitystore-jdbm/src/docs/es-jdbm.txt
@@ -35,7 +35,7 @@ Assembly is done using the provided Assembler:
 
 [snippet,java]
 ----
-source=extensions/entitystore-jdbm/src/test/java/org/apache/zest/entitystore/jdbm/DocumentationSupport.java
+source=extensions/entitystore-jdbm/src/test/java/org/apache/polygene/entitystore/jdbm/DocumentationSupport.java
 tag=UsingAssembler
 ----
 
@@ -45,12 +45,12 @@ Here are the configuration properties for the JDBM EntityStore:
 
 [snippet,java]
 ----
-source=extensions/entitystore-jdbm/src/main/java/org/apache/zest/entitystore/jdbm/JdbmConfiguration.java
+source=extensions/entitystore-jdbm/src/main/java/org/apache/polygene/entitystore/jdbm/JdbmConfiguration.java
 tag=config
 ----
 
 +file+ is optional and represent the file where the JDBM EntityStore will keep its persisted state.
 
-It defaults to System.getProperty( "user.dir" ) + "/zest/jdbmstore.data"
+It defaults to System.getProperty( "user.dir" ) + "/polygene/jdbmstore.data"
 If the given path is not absolute, then it's relative to the current working directory.
 If you use the <<library-fileconfig>> then this property value is ignored and FileConfig is prefered.

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-leveldb/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/build.gradle b/extensions/entitystore-leveldb/build.gradle
index 6b7b401..cd98455 100644
--- a/extensions/entitystore-leveldb/build.gradle
+++ b/extensions/entitystore-leveldb/build.gradle
@@ -23,17 +23,17 @@ description = "Apache Polygene\u2122 LevelDB EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - LevelDB" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
-  compile zest.library( 'fileconfig' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
+  compile polygene.library( 'fileconfig' )
   compile libraries.leveldb_api
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
   runtime libraries.leveldb_java
   runtime libraries.leveldb_jni_all
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-leveldb/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/dev-status.xml b/extensions/entitystore-leveldb/dev-status.xml
index 331defe..c79727f 100644
--- a/extensions/entitystore-leveldb/dev-status.xml
+++ b/extensions/entitystore-leveldb/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/entitystore-leveldb/src/docs/es-leveldb.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/docs/es-leveldb.txt b/extensions/entitystore-leveldb/src/docs/es-leveldb.txt
index 8fae082..940a645 100644
--- a/extensions/entitystore-leveldb/src/docs/es-leveldb.txt
+++ b/extensions/entitystore-leveldb/src/docs/es-leveldb.txt
@@ -43,7 +43,7 @@ Assembly is done using the provided Assembler:
 
 [snippet,java]
 ----
-source=extensions/entitystore-leveldb/src/test/java/org/apache/zest/entitystore/leveldb/JavaLevelDBEntityStoreTest.java
+source=extensions/entitystore-leveldb/src/test/java/org/apache/polygene/entitystore/leveldb/JavaLevelDBEntityStoreTest.java
 tag=assembly
 ----
 
@@ -53,7 +53,7 @@ Here are the configuration properties for the LevelDB EntityStore:
 
 [snippet,java]
 ----
-source=extensions/entitystore-leveldb/src/main/java/org/apache/zest/entitystore/leveldb/LevelDBEntityStoreConfiguration.java
+source=extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/LevelDBEntityStoreConfiguration.java
 tag=config
 ----
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/package.html
----------------------------------------------------------------------
diff --git a/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/package.html b/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/package.html
index cce0867..bda6cf6 100644
--- a/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/package.html
+++ b/extensions/entitystore-leveldb/src/main/java/org/apache/polygene/entitystore/leveldb/package.html
@@ -27,7 +27,7 @@
         <p>
             By default use the native implementation through JNI bindings and fallback to the pure java implementation
             if not available on the current platform. Used implementation can be forced using the
-            {@link org.apache.zest.entitystore.leveldb.LevelDBEntityStoreConfiguration#flavour()} property.
+            {@link org.apache.polygene.entitystore.leveldb.LevelDBEntityStoreConfiguration#flavour()} property.
         </p>
         <p>See:</p>
         <ul>

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-memory/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/build.gradle b/extensions/entitystore-memory/build.gradle
index 339f40c..4833d92 100644
--- a/extensions/entitystore-memory/build.gradle
+++ b/extensions/entitystore-memory/build.gradle
@@ -21,12 +21,12 @@
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - Memory" } }
 
 dependencies {
-  compile zest.core.bootstrap
+  compile polygene.core.bootstrap
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-memory/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/dev-status.xml b/extensions/entitystore-memory/dev-status.xml
index 3ab4fb7..b307e0b 100644
--- a/extensions/entitystore-memory/dev-status.xml
+++ b/extensions/entitystore-memory/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
     <codebase>stable</codebase>
     <!--none,early,beta,stable,mature-->

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-memory/src/docs/es-memory.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-memory/src/docs/es-memory.txt b/extensions/entitystore-memory/src/docs/es-memory.txt
index 9bba9af..f2adf4a 100644
--- a/extensions/entitystore-memory/src/docs/es-memory.txt
+++ b/extensions/entitystore-memory/src/docs/es-memory.txt
@@ -35,7 +35,7 @@ Assembly is done as follows:
 
 [snippet,java]
 ----
-source=extensions/entitystore-memory/src/test/java/org/apache/zest/entitystore/memory/MemoryEntityStoreTest.java
+source=extensions/entitystore-memory/src/test/java/org/apache/polygene/entitystore/memory/MemoryEntityStoreTest.java
 tag=assembly
 ----
 

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-mongodb/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/build.gradle b/extensions/entitystore-mongodb/build.gradle
index d3d57bb..5b78435 100644
--- a/extensions/entitystore-mongodb/build.gradle
+++ b/extensions/entitystore-mongodb/build.gradle
@@ -23,14 +23,14 @@ description = "Apache Polygene\u2122 MongoDB EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - MongoDB" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
   compile libraries.mongodb
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
   testCompile libraries.embed_mongo
 
   testRuntime libraries.logback

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-mongodb/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/dev-status.xml b/extensions/entitystore-mongodb/dev-status.xml
index b99d6bc..762e250 100644
--- a/extensions/entitystore-mongodb/dev-status.xml
+++ b/extensions/entitystore-mongodb/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/entitystore-mongodb/src/docs/es-mongodb.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-mongodb/src/docs/es-mongodb.txt b/extensions/entitystore-mongodb/src/docs/es-mongodb.txt
index 8c7e55e..658e2a9 100644
--- a/extensions/entitystore-mongodb/src/docs/es-mongodb.txt
+++ b/extensions/entitystore-mongodb/src/docs/es-mongodb.txt
@@ -36,7 +36,7 @@ Assembly is done using the provided Assembler:
 
 [snippet,java]
 ----
-source=extensions/entitystore-mongodb/src/test/java/org/apache/zest/entitystore/mongodb/MongoMapEntityStoreTest.java
+source=extensions/entitystore-mongodb/src/test/java/org/apache/polygene/entitystore/mongodb/MongoMapEntityStoreTest.java
 tag=assembly
 ----
 
@@ -46,6 +46,6 @@ Here are the configuration properties for the MongoDB EntityStore:
 
 [snippet,java]
 ----
-source=extensions/entitystore-mongodb/src/main/java/org/apache/zest/entitystore/mongodb/MongoEntityStoreConfiguration.java
+source=extensions/entitystore-mongodb/src/main/java/org/apache/polygene/entitystore/mongodb/MongoEntityStoreConfiguration.java
 tag=config
 ----

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-preferences/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/build.gradle b/extensions/entitystore-preferences/build.gradle
index f26d9c7..1339e8e 100644
--- a/extensions/entitystore-preferences/build.gradle
+++ b/extensions/entitystore-preferences/build.gradle
@@ -23,13 +23,13 @@ description = "Apache Polygene\u2122 Preferences EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - Preferences" } }
 
 dependencies {
-  compile zest.core.bootstrap
+  compile polygene.core.bootstrap
   compile libraries.slf4j_api
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-preferences/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/dev-status.xml b/extensions/entitystore-preferences/dev-status.xml
index b99d6bc..762e250 100644
--- a/extensions/entitystore-preferences/dev-status.xml
+++ b/extensions/entitystore-preferences/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/entitystore-preferences/src/docs/es-preferences.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-preferences/src/docs/es-preferences.txt b/extensions/entitystore-preferences/src/docs/es-preferences.txt
index dfb111b..e93e26d 100644
--- a/extensions/entitystore-preferences/src/docs/es-preferences.txt
+++ b/extensions/entitystore-preferences/src/docs/es-preferences.txt
@@ -37,6 +37,6 @@ Assembly is done using the provided Assembler:
 
 [snippet,java]
 ----
-source=extensions/entitystore-preferences/src/test/java/org/apache/zest/entitystore/DocumentationSupport.java
+source=extensions/entitystore-preferences/src/test/java/org/apache/polygene/entitystore/DocumentationSupport.java
 tag=assembly
 ----

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-redis/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/build.gradle b/extensions/entitystore-redis/build.gradle
index dd062f4..44a0dd6 100644
--- a/extensions/entitystore-redis/build.gradle
+++ b/extensions/entitystore-redis/build.gradle
@@ -23,14 +23,14 @@ description = "Apache Polygene\u2122 Redis EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - Redis" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
   compile libraries.jedis
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-redis/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/dev-status.xml b/extensions/entitystore-redis/dev-status.xml
index 7ff397b..273df00 100644
--- a/extensions/entitystore-redis/dev-status.xml
+++ b/extensions/entitystore-redis/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.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/54b69c48/extensions/entitystore-redis/src/docs/es-redis.txt
----------------------------------------------------------------------
diff --git a/extensions/entitystore-redis/src/docs/es-redis.txt b/extensions/entitystore-redis/src/docs/es-redis.txt
index 11d1def..20ac8e1 100644
--- a/extensions/entitystore-redis/src/docs/es-redis.txt
+++ b/extensions/entitystore-redis/src/docs/es-redis.txt
@@ -35,7 +35,7 @@ Assembly is done using the provided Assembler.
 
 [snippet,java]
 ----
-source=extensions/entitystore-redis/src/test/java/org/apache/zest/entitystore/redis/RedisMapEntityStoreTest.java
+source=extensions/entitystore-redis/src/test/java/org/apache/polygene/entitystore/redis/RedisMapEntityStoreTest.java
 tag=assembly
 ----
 
@@ -46,6 +46,6 @@ Here are the configuration properties for the Redis client:
 
 [snippet,java]
 ----
-source=extensions/entitystore-redis/src/main/java/org/apache/zest/entitystore/redis/RedisEntityStoreConfiguration.java
+source=extensions/entitystore-redis/src/main/java/org/apache/polygene/entitystore/redis/RedisEntityStoreConfiguration.java
 tag=config
 ----

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-riak/build.gradle
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/build.gradle b/extensions/entitystore-riak/build.gradle
index dff2f13..7b6de87 100644
--- a/extensions/entitystore-riak/build.gradle
+++ b/extensions/entitystore-riak/build.gradle
@@ -23,15 +23,15 @@ description = "Apache Polygene\u2122 Riak EntityStore Extension"
 jar { manifest { name = "Apache Polygene\u2122 Extension - EntityStore - Riak" } }
 
 dependencies {
-  compile zest.core.bootstrap
-  compile zest.library( 'locking' )
-  compile zest.library( 'constraints' )
+  compile polygene.core.bootstrap
+  compile polygene.library( 'locking' )
+  compile polygene.library( 'constraints' )
   compile libraries.riak
 
-  runtime zest.core.runtime
+  runtime polygene.core.runtime
 
-  testCompile zest.core.testsupport
-  testCompile zest.extension( 'valueserialization-orgjson' )
+  testCompile polygene.core.testsupport
+  testCompile polygene.extension( 'valueserialization-orgjson' )
 
   testRuntime libraries.logback
 }

http://git-wip-us.apache.org/repos/asf/zest-java/blob/54b69c48/extensions/entitystore-riak/dev-status.xml
----------------------------------------------------------------------
diff --git a/extensions/entitystore-riak/dev-status.xml b/extensions/entitystore-riak/dev-status.xml
index 7ff397b..273df00 100644
--- a/extensions/entitystore-riak/dev-status.xml
+++ b/extensions/entitystore-riak/dev-status.xml
@@ -18,10 +18,10 @@
   ~
   ~
   -->
-<module xmlns="http://zest.apache.org/schemas/2008/dev-status/1"
+<module xmlns="http://polygene.apache.org/schemas/2008/dev-status/1"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://zest.apache.org/schemas/2008/dev-status/1
-        http://zest.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
+        xsi:schemaLocation="http://polygene.apache.org/schemas/2008/dev-status/1
+        http://polygene.apache.org/schemas/2008/dev-status/1/dev-status.xsd">
   <status>
         <!--none,early,beta,stable,mature-->
         <codebase>beta</codebase>