diff --git a/README.md b/README.md
index c69d73bd2396e106a6c1615cce97bdfe013e2fc5..b529ffcc769e4ecf81cf26bfa0e649c2b821343d 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # Aparapi
 
 [![License](http://img.shields.io/:license-apache-blue.svg?style=flat-square)](http://www.apache.org/licenses/LICENSE-2.0.html)
-[![Javadocs](http://www.javadoc.io/badge/com.syncleus.aparapi/aparapi.svg)](http://www.javadoc.io/doc/com.syncleus.aparapi/aparapi)
+[![Javadocs](http://www.javadoc.io/badge/com.aparapi/aparapi.svg)](http://www.javadoc.io/doc/com.aparapi/aparapi)
 [![Gitter](https://badges.gitter.im/Syncleus/aparapi.svg)](https://gitter.im/Syncleus/aparapi?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 A framework for executing native Java code on the GPU.
@@ -27,7 +27,7 @@ To include Aparapi in your project of choice include the following Maven depende
 ```xml
 
 <dependency>
-    <groupId>com.syncleus.aparapi</groupId>
+    <groupId>com.aparapi</groupId>
     <artifactId>aparapi</artifactId>
     <version>1.0.0</version>
 </dependency>
diff --git a/doc/BuildingNBody.md b/doc/BuildingNBody.md
index b6fab1a0dc792eeaefa968b7ba2b188c96e39bba..2aaad05777f354588ed06a862520f8a9dcc4b1a2 100644
--- a/doc/BuildingNBody.md
+++ b/doc/BuildingNBody.md
@@ -8,7 +8,7 @@ The NBody example is located in the/ examples subdirectory under the Aparapi tru
        examples/
          ...
          nbody/
-            src/java/com.syncleus.aparapi.nbody/
+            src/java/com.aparapi.nbody/
             build.xml
             nbody.sh
             nbody.bat
diff --git a/doc/ConvertingBytecodeToOpenCL.md b/doc/ConvertingBytecodeToOpenCL.md
index e839c0d527a5b2ab80a1d735f7d3bf426047919f..4f59124125d17c98eb693e96fa4be21cbe7de5fe 100644
--- a/doc/ConvertingBytecodeToOpenCL.md
+++ b/doc/ConvertingBytecodeToOpenCL.md
@@ -20,7 +20,7 @@ The classfile format is well documented here and we will not go into too much de
 
 Lets start with a simple Kernel.
 
-    import com.syncleus.aparapi.Kernel;
+    import com.aparapi.Kernel;
 
     public class Squarer extends Kernel{
        int[] in;
@@ -41,7 +41,7 @@ and then we can look at the bytecode using javap
 
 Compiled from "Squarer.java"
 
-    public class Squarer extends com.syncleus.aparapi.Kernel
+    public class Squarer extends com.aparapi.Kernel
       SourceFile: "Squarer.java"
       minor version: 0
       major version: 50
diff --git a/doc/DevelopersGuideLinux.md b/doc/DevelopersGuideLinux.md
index 3a8e77869dafed0712833a49dbf34e2fd94ffc50..0dd29a82b5afe6cd41664f9e701ed448e1378442 100644
--- a/doc/DevelopersGuideLinux.md
+++ b/doc/DevelopersGuideLinux.md
@@ -88,7 +88,7 @@ Download JUnit from http://www.junit.org/ and note the location of your JUnit in
 
 ##Eclipse
 
-Eclipse is not required to build Aparapi; however, the developers of Aparapi do use Eclipse and have made the Eclipse artifacts (.classpath and .project files) available so that projects can be imported into Eclipse. The com.syncleus.aparapi.jni subproject (containing C++ JNI source) should be imported as a resource project. We do not recommend importing com.syncleus.aparapi.jni as a CDT project, and we do not recommend trying to configure a CDT build, the existing build.xml files has been customized for multiplatform C++ compilations.
+Eclipse is not required to build Aparapi; however, the developers of Aparapi do use Eclipse and have made the Eclipse artifacts (.classpath and .project files) available so that projects can be imported into Eclipse. The com.aparapi.jni subproject (containing C++ JNI source) should be imported as a resource project. We do not recommend importing com.aparapi.jni as a CDT project, and we do not recommend trying to configure a CDT build, the existing build.xml files has been customized for multiplatform C++ compilations.
 
 ##Building
 
@@ -99,43 +99,43 @@ Check out the Aparapi SVN trunk:
 Checkout provides the following:
 
     aparapi/
-       com.syncleus.aparapi/
-          src/java/com.syncleus.aparapi/*.java
+       com.aparapi/
+          src/java/com.aparapi/*.java
           build.xml
-       com.syncleus.aparapi.jni/
+       com.aparapi.jni/
           src/cpp/*.cpp
           src/cpp/*.h
           build.xml
        test/
           codegen/
              src/java/
-                com.syncleus.aparapi/
-                com.syncleus.aparapi.test/
+                com.aparapi/
+                com.aparapi.test/
              build.xml
           runtime/
              src/java/
-                com.syncleus.aparapi/
-                com.syncleus.aparapi.test/
+                com.aparapi/
+                com.aparapi.test/
              build.xml
        samples/
           mandel
-             src/java/com.syncleus.aparapi.samples.mandel/*.java
+             src/java/com.aparapi.samples.mandel/*.java
              build.xml
              mandel.sh
              mandel.bat
           squares/
-             src/java/com.syncleus.aparapi.samples.squares/*.java
+             src/java/com.aparapi.samples.squares/*.java
              build.xml
              squares.sh
              squares.bat
           convolution/
-             src/java/com.syncleus.aparapi.samples.convolution/*.java
+             src/java/com.aparapi.samples.convolution/*.java
              build.xml
              conv.sh
              conv.bat
        examples/
           nbody/
-             src/java/com.syncleus.aparapi.nbody/
+             src/java/com.aparapi.nbody/
              build.xml
              nbody.sh
              nbody.bat
@@ -146,16 +146,16 @@ Checkout provides the following:
 
 ##Sub Directories
 
-The com.syncleus.aparapi and com.syncleus.aparapi.jni subdirectories contain the source for building and using Aparapi.
+The com.aparapi and com.aparapi.jni subdirectories contain the source for building and using Aparapi.
 
 The ant build.xml file, in each folder accept common 'clean' and 'build' targets. You can use the build.xml file at the root of the tree for two purposes:
 
-    To initiate a build com.syncleus.aparapi of com.syncleus.aparapi.jni.
+    To initiate a build com.aparapi of com.aparapi.jni.
     To create a binary ‘distribution’ directory and zip file. This zip file is same as those available from the download section of the code.google.com/p/aparapi site.
 
 ##Preparing for your first build
 
-Edit com.syncleus.aparapi.jni\build.properties and ensure that the properties are valid for your platform.
+Edit com.aparapi.jni\build.properties and ensure that the properties are valid for your platform.
 
 View the comments in the properties file for assistance. The build.xml ant file contains some simple checks to help diagnose simple configuration errors in case something gets messed up.
 
diff --git a/doc/DevelopersGuideWindows.md b/doc/DevelopersGuideWindows.md
index d03e70f74f094aac5789c3e8ab7a39a5ed112c18..9aa9978553b14769a6bc9443028dd430f543faaa 100644
--- a/doc/DevelopersGuideWindows.md
+++ b/doc/DevelopersGuideWindows.md
@@ -60,7 +60,7 @@ Once you have a suitable driver, download a copy of AMD APP SDK v2.5 from http:/
 Download the installation guide for Microsoft® Windows® (and Linux®) from http://developer.amd.com/sdks/AMDAPPSDK/assets/AMD_APP_SDK_Installation_Notes.pdf. Note that if you updating from a previous version of AMD APP SDK (or its predecessor ATI STREAM SDK), first uninstall the previous version. The release notes are available here http://developer.amd.com/sdks/AMDAPPSDK/assets/AMD_APP_SDK_Release_Notes_Developer.pdf
 ##A C++ compiler
 
-For Microsoft® Windows® platforms the JNI build can support either Microsoft® Visual Studio® 2008, 2009 or 2010 compiler or MinGW (Minimal GNU for Windows) from GNU. Now that Visual Studio express is available for free, we would recommend using Visual studio. If you wish to use another compiler then you will have to tweak the com.syncleus.aparapi.jni/build.xml file to get your compiler to work.
+For Microsoft® Windows® platforms the JNI build can support either Microsoft® Visual Studio® 2008, 2009 or 2010 compiler or MinGW (Minimal GNU for Windows) from GNU. Now that Visual Studio express is available for free, we would recommend using Visual studio. If you wish to use another compiler then you will have to tweak the com.aparapi.jni/build.xml file to get your compiler to work.
 Microsoft® Visual Studio® 2008/2010 for 32-bit or 64-bit platforms
 
 Aparapi has been tested with various versions of Microsoft® Visual Studio® 2008, 2009 and 2010 including Enterprise, Professional and Express editions, if you encounter any version specific issues please let us know so we can address it and/or update this documentation.
@@ -69,7 +69,7 @@ If you already have Microsoft® Visual Studio® installed you will need to know
 
 And an SDK, such as. c:\Program Files\Microsoft SDKs\Windows\v6.0A
 
-Note the location of both of these as this information will be needed to configure the com.syncleus.aparapi.jni\build.property file (later).
+Note the location of both of these as this information will be needed to configure the com.aparapi.jni\build.property file (later).
 For Visual Studio Express 64 bit users
 
 Visual studio express does not include the 64 bit compiler or libraries. You will need to also install the SDK from Microsoft. this link should help
@@ -99,7 +99,7 @@ Note the location of your JUnit installation; the location is needed to configur
 
 Eclipse is not required to build Aparapi, however the developers of Aparapi do use Eclipse and have made the Eclipse artifacts (.classpath and .project files) available so that projects can be imported into Eclipse.
 
-The com.syncleus.aparapi.jni subproject (containing C++ JNI source) should be imported as a resource project, we do not recommend importing com.syncleus.aparapi.jni as a CDT project, and we do not recommend trying to configure a CDT build, the existing build.xml files has been customized for multiplatform C++ compilations.
+The com.aparapi.jni subproject (containing C++ JNI source) should be imported as a resource project, we do not recommend importing com.aparapi.jni as a CDT project, and we do not recommend trying to configure a CDT build, the existing build.xml files has been customized for multiplatform C++ compilations.
 ##Building
 
 Check out the Aparapi SVN trunk:
@@ -109,43 +109,43 @@ svn checkout http://aparapi.googlecode.com/svn/trunk
 You will end up with the following files/directories
 
     aparapi/
-       com.syncleus.aparapi/
-          src/java/com.syncleus.aparapi/*.java
+       com.aparapi/
+          src/java/com.aparapi/*.java
           build.xml
-       com.syncleus.aparapi.jni/
+       com.aparapi.jni/
           src/cpp/*.cpp
           src/cpp/*.h
           build.xml
        test/
           codegen/
              src/java/
-                com.syncleus.aparapi/
-                com.syncleus.aparapi.test/
+                com.aparapi/
+                com.aparapi.test/
              build.xml
           runtime/
              src/java/
-                com.syncleus.aparapi/
-                com.syncleus.aparapi.test/
+                com.aparapi/
+                com.aparapi.test/
              build.xml
        samples/
           mandel
-             src/java/com.syncleus.aparapi.samples.mandel/*.java
+             src/java/com.aparapi.samples.mandel/*.java
              build.xml
              mandel.sh
              mandel.bat
           squares/
-             src/java/com.syncleus.aparapi.samples.squares/*.java
+             src/java/com.aparapi.samples.squares/*.java
              build.xml
              squares.sh
              squares.bat
           convolution/
-             src/java/com.syncleus.aparapi.samples.convolution/*.java
+             src/java/com.aparapi.samples.convolution/*.java
              build.xml
              conv.sh
              conv.bat
        examples/
           nbody/
-             src/java/com.syncleus.aparapi.nbody/
+             src/java/com.aparapi.nbody/
              build.xml
              nbody.sh
              nbody.bat
@@ -156,18 +156,18 @@ You will end up with the following files/directories
 
 ##Sub Directories
 
-The com.syncleus.aparapi and com.syncleus.aparapi.jni subdirectories contain the source for building and using Aparapi.
+The com.aparapi and com.aparapi.jni subdirectories contain the source for building and using Aparapi.
 
 The ant build.xml file, in each folder accept 'clean' and 'build' targets.
 
 Use the build.xml file at the root of the tree for two purposes:
 
-    To initiate a build of com.syncleus.aparapi and com.syncleus.aparapi.jni.
+    To initiate a build of com.aparapi and com.aparapi.jni.
     To create a binary distribution directory and zip file. This zip file is same as those available from the download section of the code.google.com/p/aparapi site.
 
 ##Preparing for your first build
 
-You should only need to edit com.syncleus.aparapi.jni\build.xml file if you wish to use mingw or if you Visual Studio or gcc compiler is in an unusual place.
+You should only need to edit com.aparapi.jni\build.xml file if you wish to use mingw or if you Visual Studio or gcc compiler is in an unusual place.
 
 Perform a build from the root directory using the following command:
 
diff --git a/doc/FrequentlyAskedQuestions.md b/doc/FrequentlyAskedQuestions.md
index fc0ba8cd383c69bd811cda376202f6e05394280d..5ad0408c3349ca0ac4aa0b76e82c6519967be1ef 100644
--- a/doc/FrequentlyAskedQuestions.md
+++ b/doc/FrequentlyAskedQuestions.md
@@ -49,7 +49,7 @@ Due to Java's lack of vector types (float4 for example) Aparapi can't directly u
 
 ##Is there a way I can see the generated OpenCL?
 
-Yes, by using adding -Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true to your command line when you start your JVM.
+Yes, by using adding -Dcom.aparapi.enableShowGeneratedOpenCL=true to your command line when you start your JVM.
 
 ##Does Aparapi support sharing buffers with JOGL? Can I exploit the features of JOGAMP/glugen?
 
@@ -94,7 +94,7 @@ From within the Java code itself you can query the execution mode after Kernel.e
 
 The above code fragment will print either ‘GPU’ if the kernel executed on the GPU or JTP if Aparapi executed the Kernel in a Java Thread Pool.
 
-Alternatively, setting the property –Dcom.syncleus.aparapi.enableShowExecutionModes=true when you start your JVM will cause Aparapi to automatically report the execution mode of all kernels to stdout.
+Alternatively, setting the property –Dcom.aparapi.enableShowExecutionModes=true when you start your JVM will cause Aparapi to automatically report the execution mode of all kernels to stdout.
 
 ##Why does Aparapi need me to compile my code with -g?
 
diff --git a/doc/PrivateMemorySpace.md b/doc/PrivateMemorySpace.md
index 4b51d2f8aded645703376d97724d192cf0d65ddd..e47120f93165abe00f87e7c7c0e54c8b47996975 100644
--- a/doc/PrivateMemorySpace.md
+++ b/doc/PrivateMemorySpace.md
@@ -29,6 +29,6 @@ Without modification, an Aparapi kernel which uses private buffers may fail to w
 
 The Kernel.NoCL annotation exists to allow specialised code to be executed when running in Java (or JTP) which is not invoked when running on the GPU. A NoCL method can be inserted at the begining of a Kernel's run() method which sets the private array to a value obtained from a static ThreadLocal<foo[]> where foo is the primitive type of the array in question. This will have no effect upon OpenCL execution, but will allow threadsafe execution when running in java.
 
-In the project samples, there is a package com.syncleus.com.syncleus.aparapi.examples.median which gives an example of a median image filter which uses a private array of pixel data to apply a distructive median algorithm to a "window" of local pixels. This sample also demonstrates how to use the ThreadLocal trick to allow correct behaviour when running in JTP execution mode.
+In the project samples, there is a package com.syncleus.com.aparapi.examples.median which gives an example of a median image filter which uses a private array of pixel data to apply a distructive median algorithm to a "window" of local pixels. This sample also demonstrates how to use the ThreadLocal trick to allow correct behaviour when running in JTP execution mode.
 
 [http://code.google.com/p/aparapi/source/browse/trunk/samples/median/src/com/amd/aparapi/sample/median/MedianDemo.java](http://code.google.com/p/aparapi/source/browse/trunk/samples/median/src/com/amd/aparapi/sample/median/MedianDemo.java)
\ No newline at end of file
diff --git a/doc/ProfilingKernelExecution.md b/doc/ProfilingKernelExecution.md
index 5ee1fb95ef221e855f18d24c0a83a6caea8216ee..5e9806f1bfe77e8f2f2987a1a86c808a06bedf2d 100644
--- a/doc/ProfilingKernelExecution.md
+++ b/doc/ProfilingKernelExecution.md
@@ -3,7 +3,7 @@
 
 If you want to extract OpenCL performance info from a kernel at runtime you need to set the property :-
 
-    -Dcom.syncleus.aparapi.enableProfiling=true
+    -Dcom.aparapi.enableProfiling=true
 
 Your application can then call kernel.getProfileInfo() after a successful call to kernel.execute(range) to extract a List List<ProfileInfo>.
 
@@ -42,7 +42,7 @@ And here is the tabular output from
 
         java
            -Djava.library.path=${APARAPI_HOME}
-           -Dcom.syncleus.aparapi.enableProfiling=true
+           -Dcom.aparapi.enableProfiling=true
            -cp ${APARAPI_HOME}:.
            MyClass
 
diff --git a/doc/UnitTestGuide.md b/doc/UnitTestGuide.md
index 1f928f1c5e6e56b6f202d84dd384b1c75809bc65..7af91240b2ba3fedc4411832223dd7aa156e71e7 100644
--- a/doc/UnitTestGuide.md
+++ b/doc/UnitTestGuide.md
@@ -9,14 +9,14 @@ OpenCLâ„¢ code generation tests
 The initial open source tree includes the codegen subdirectory (test/codegen), which used to validate the Aparapi bytecode to OpenCLâ„¢ conversion.
 
     aparapi/trunk/
-       com.syncleus.aparapi/
-          src/java/com.syncleus.aparapi/
+       com.aparapi/
+          src/java/com.aparapi/
           build.xml
        test/
           codegen/
              src/java/
-                com.syncleus.aparapi/
-                com.syncleus.aparapi.test/
+                com.aparapi/
+                com.aparapi.test/
              build.xml
        build.xml
 
@@ -24,7 +24,7 @@ The code generation tests to not require OpenCLâ„¢ , AMD APP SDK or a GPU device
 
 ##Running the OpenCLâ„¢ code generation JUnit tests
 
-Before executing the code generation tests, build the com.syncleus.aparapi sub-project and ensure that you have JUnit 4 installed.
+Before executing the code generation tests, build the com.aparapi sub-project and ensure that you have JUnit 4 installed.
 
 Edit the junit.jar property in test/codegen/build.xml to point to your install directory.
 
@@ -49,13 +49,13 @@ On Linux(r) platforms just invoke your browser (Firefox in this case).
 
 The test cases for OpenCLâ„¢ code generation are not strictly JUnit tests. Instead the codegen Java tree contains a tool (CreateJUnitTests) to create JUnit test cases from specially formatted test source files.
 
-The package `com.syncleus.aparapi.test (codegen/src/java/com/amd/aparapi/test)` contains all of the existing code generation tests.
+The package `com.aparapi.test (codegen/src/java/com/amd/aparapi/test)` contains all of the existing code generation tests.
 
-Here is an example that tests the code generation resulting from a call to Kernel.getPassId(), this is taken from com.syncleus.aparapi.test.CallGetPassId
+Here is an example that tests the code generation resulting from a call to Kernel.getPassId(), this is taken from com.aparapi.test.CallGetPassId
 
-    package com.syncleus.aparapi.test;
+    package com.aparapi.test;
 
-    import com.syncleus.aparapi.Kernel;
+    import com.aparapi.Kernel;
 
     public class CallGetPassId extends Kernel{
        public void run() {
@@ -90,7 +90,7 @@ The test source takes the form of a simple class that extends the kernel and a b
 The code-generating ant build.xml file performs the following steps to generate its report:
 
 * compiles the src/java tree. This compiles all the test cases as well as a few ‘utility’ classes.
-* executes the com.syncleus.aparapi.test.CreateJUnitTests program. This iterates through all of the test source files and converts them to JUnit form. The generated source is written to the src/genjava tree.
+* executes the com.aparapi.test.CreateJUnitTests program. This iterates through all of the test source files and converts them to JUnit form. The generated source is written to the src/genjava tree.
 * compiles the src/genjava tree to create the required JUnit classes
 * initiates the JUnit test phase (result data in junit/data)
 * creates the JUnit report (in junit/html/junit from junit/data)
@@ -122,7 +122,7 @@ Logically either of the above are correct. However, to accommodate the alternate
 
 Here is the complete BooleanToggle code.
 
-    package com.syncleus.aparapi.test;
+    package com.aparapi.test;
 
     public class BooleanToggle{
        public void run() {
diff --git a/doc/UsersGuide.md b/doc/UsersGuide.md
index e9b1a0afda81fc3567d28d360643af19ea99160b..1a78269713fb063ef0eaf15c3ec1897f5d7ea8c4 100644
--- a/doc/UsersGuide.md
+++ b/doc/UsersGuide.md
@@ -48,7 +48,7 @@ Java developers should recognize the general pattern as similar to that used to
     });
     thread.start();
     thread.join();
-The Aparapi developer extends the com.syncleus.aparapi.Kernel and overrides the public void Kernel.run() method. It is this Kernel.run() method that is executed in parallel.
+The Aparapi developer extends the com.aparapi.Kernel and overrides the public void Kernel.run() method. It is this Kernel.run() method that is executed in parallel.
 
 The base class also exposes the Kernel.execute(range) method which is used to initiate the execution of Kernel.run() over the range 0...n.
 
@@ -88,9 +88,9 @@ An application can detect whether a kernel was executed on the GPU or by a Java
        System.out.println(“Kernel nid not execute on the GPU!”);
     }
 
-To obtain a runtime report of the execution mode of all kernel executions, set the com.syncleus.aparapi.enableExecutionModeReporting property to true when the JVM is launched.
+To obtain a runtime report of the execution mode of all kernel executions, set the com.aparapi.enableExecutionModeReporting property to true when the JVM is launched.
 
-    $ java –Djava.library.path=${APARAPI_DIR} –Dcom.syncleus.aparapi.enableExecutionModeReporting=true –cp ${APARAPI_DIR}/aparapi.jar;. Squares
+    $ java –Djava.library.path=${APARAPI_DIR} –Dcom.aparapi.enableExecutionModeReporting=true –cp ${APARAPI_DIR}/aparapi.jar;. Squares
 
 ##Running the sample applications
 Aparapi includes two sample applications in the /samples subdirectory of the binary distribution zip file.
@@ -104,7 +104,7 @@ You will need an appropriate GPU card, OpenCL® enabled Catalyst® driver and a
 Set the environment variable JAVA_HOME to point to the root of your JRE or JDK.
 Change to the appropriate samples directory (samples/squares or samples/mandel)
 Run either the .bat or .sh script. On Linux® , you might have to initially chmod +x script.sh to add execute permissions.
-The sample scripts pass the first arg (%1 or $1) to -Dcom.syncleus.aparapi.executionMode when the JVM is launched. This allows the sample to be tested in either GPU or JTP execution modes by passing the requested mode.
+The sample scripts pass the first arg (%1 or $1) to -Dcom.aparapi.executionMode when the JVM is launched. This allows the sample to be tested in either GPU or JTP execution modes by passing the requested mode.
 
     $ cd samples/mandel
     $ bash ./mandel.sh GPU
diff --git a/doc/UsingAparapiLambdaBranchWithHSASimulator.md b/doc/UsingAparapiLambdaBranchWithHSASimulator.md
index e4c7a68660f38c349fc13a633191984e5334d774..f5aab6c671c76ee87f8f1abdfad686ece534ed7e 100644
--- a/doc/UsingAparapiLambdaBranchWithHSASimulator.md
+++ b/doc/UsingAparapiLambdaBranchWithHSASimulator.md
@@ -42,5 +42,5 @@ Assuming your aparapi svn trunk is /home/gfrost/aparapi
     $ cd /home/gfrost/aparapi/branches/lambda
     $ ant
     $ export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${OKRA}/dist/bin
-    $ java -agentpath:com.syncleus.aparapi.jni/dist/libaparapi_x86_64.so -cp com.syncleus.aparapi/dist/aparapi.jar:${OKRA}/dist/okra.jar hsailtest.Squares
+    $ java -agentpath:com.aparapi.jni/dist/libaparapi_x86_64.so -cp com.aparapi/dist/aparapi.jar:${OKRA}/dist/okra.jar hsailtest.Squares
     $
\ No newline at end of file
diff --git a/doc/UsingConstantMemory.md b/doc/UsingConstantMemory.md
index cc049d8f969cc653aec7865d76c2805e2438a3a5..1e7a9580ea740e7c7599b3b4f69bfd0cc7eced1d 100644
--- a/doc/UsingConstantMemory.md
+++ b/doc/UsingConstantMemory.md
@@ -1,7 +1,7 @@
 #UsingConstantMemory
 *How to make use of constant memory in a Kernel Updated Feb 28, 2012 by frost.g...@gmail.com*
 ##How to make use of new constant memory feature
-By default all primitive arrays accessed by an Aparapi Kernel is considered global. If we look at the generated code using `-Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true` we will see that primitive arrays (such as `int buf[]`) are mapped to `__global` pointers (such as `__global int *buf`) in OpenCL.
+By default all primitive arrays accessed by an Aparapi Kernel is considered global. If we look at the generated code using `-Dcom.aparapi.enableShowGeneratedOpenCL=true` we will see that primitive arrays (such as `int buf[]`) are mapped to `__global` pointers (such as `__global int *buf`) in OpenCL.
 
 Although this makes Aparapi easy to use (especially to Java developers who are unfamiliar to tiered memory hierarchies), it does limit the ability of the 'power developer' wanting to extract more performance from Aparapi on the GPU.
 
diff --git a/doc/UsingLocalMemory.md b/doc/UsingLocalMemory.md
index a78594c4e500ead7b3dcda52c2de1198b8495950..d23579115e965fb390e8d1b8526129ea46fc2e85 100644
--- a/doc/UsingLocalMemory.md
+++ b/doc/UsingLocalMemory.md
@@ -1,7 +1,7 @@
 #UsingLocalMemory
 *How to make use of local memory in a Kernel Updated Feb 28, 2012 by frost.g...@gmail.com*
 ##How to make use of new local memory feature
-By default all primitive arrays accessed by an Aparapi Kernel is considered global. If we look at the generated code using -Dcom.syncleus.aparapi.enableShowGeneratedOpenCL=true we will see that primitive arrays (such as int buf[]) are mapped to __global pointers (such as __global int *buf) in OpenCL.
+By default all primitive arrays accessed by an Aparapi Kernel is considered global. If we look at the generated code using -Dcom.aparapi.enableShowGeneratedOpenCL=true we will see that primitive arrays (such as int buf[]) are mapped to __global pointers (such as __global int *buf) in OpenCL.
 
 Although this makes Aparapi easy to use (especially to Java developers who are unfamiliar to tiered memory hierarchies), it does limit the ability of the 'power developer' wanting to extract more performance from Aparapi on the GPU.
 
diff --git a/doc/UsingMultiDimExecutionRanges.md b/doc/UsingMultiDimExecutionRanges.md
index 99761c7eb3e233915ee0515fd2161a3ca5e1d722..39919e79e8bf2f974aef243ad1a25a6e5c3cadc1 100644
--- a/doc/UsingMultiDimExecutionRanges.md
+++ b/doc/UsingMultiDimExecutionRanges.md
@@ -3,7 +3,7 @@
 
 Aparapi now allows developers to execute over one, two or three dimensional ranges. OpenCL natively allows the user to execute over 1, 2 or 3 dimension grids via the clEnqueueNDRangeKernel() method.
 
-Initially we chose not to expose 2D or 3D ranges (Aparapi's Kernel.execute(range) allowed only !d ranges, but following a specific request we added the notion of a Range via the new com.syncleus.aparapi.Range class.
+Initially we chose not to expose 2D or 3D ranges (Aparapi's Kernel.execute(range) allowed only !d ranges, but following a specific request we added the notion of a Range via the new com.aparapi.Range class.
 
 A range is created using various static factory methods. For example to create a simple range {0..1024} we would use.
 
diff --git a/examples/correlation-matrix/build.xml b/examples/correlation-matrix/build.xml
index 52ef485609a2582a1ec43402405a97c9120811cd..3cdd75d8e4b5fb62b80ab551cc2e7a57325b5493 100644
--- a/examples/correlation-matrix/build.xml
+++ b/examples/correlation-matrix/build.xml
@@ -32,7 +32,7 @@
 	<property name="ant.build.javac.target" value="1.7" />
 
 	<path id="classpath">
-		<pathelement path="${basedir}/../../com.syncleus.aparapi/dist/aparapi.jar" />
+		<pathelement path="${basedir}/../../com.aparapi/dist/aparapi.jar" />
 		<pathelement path="${libs.root}/${commons.lang.jar}" />
 		<pathelement path="${libs.root}/${log4j.jar}" />
 		<pathelement path="${libs.root}/${lucene.jar}" />
@@ -79,7 +79,7 @@
 
 		<!-- Even though fork is slower we need to set the library path and this requires fork -->
 		<junit printsummary="false" fork="true" haltonfailure="false" failureproperty="tests.failed" showoutput="true">
-			<sysproperty key="java.library.path" value="${basedir}/../../com.syncleus.aparapi.jni/dist" />
+			<sysproperty key="java.library.path" value="${basedir}/../../com.aparapi.jni/dist" />
 
 			<!-- USER DEFINED PROPERTIES -->
 			<sysproperty key="numRows" value="1024" />
diff --git a/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixHost.java b/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixHost.java
index 3569a9f41f607b6d0599777c814e38d2616d6b42..e2a5a2ce6bb492758dbb3385eddfa8f04be3da79 100644
--- a/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixHost.java
+++ b/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixHost.java
@@ -10,11 +10,11 @@ package gov.pnnl.aparapi.matrix;
 
 import org.apache.log4j.Logger;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Kernel.EXECUTION_MODE;
-import com.syncleus.aparapi.Range;
-import com.syncleus.aparapi.device.Device;
-import com.syncleus.aparapi.device.OpenCLDevice;
+import com.aparapi.Kernel;
+import com.aparapi.Kernel.EXECUTION_MODE;
+import com.aparapi.Range;
+import com.aparapi.device.Device;
+import com.aparapi.device.OpenCLDevice;
 
 /**
  * GPU calculations using OpenBitSet Intersection for OpenBitSets
diff --git a/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixKernel.java b/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixKernel.java
index da1bec4b0e0d5e57ef0139e34e5b0bffb58208d9..ba338a52726ef6d37326d176be173ec1afa5faad 100644
--- a/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixKernel.java
+++ b/examples/correlation-matrix/src/java/gov/pnnl/aparapi/matrix/CorrMatrixKernel.java
@@ -8,7 +8,7 @@
  */
 package gov.pnnl.aparapi.matrix;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 /**
  * This kernel attempts to re-implement the Lucene OpenBitSet functionality on a GPU
diff --git a/examples/correlation-matrix/src/test/gov/pnnl/aparapi/test/CorrMatrixTest.java b/examples/correlation-matrix/src/test/gov/pnnl/aparapi/test/CorrMatrixTest.java
index bc4151bf1f10f48289b3d3e4524080a01dcde584..df57dce1f7bce82c1d9a010f4dd7deead1fa9a6a 100644
--- a/examples/correlation-matrix/src/test/gov/pnnl/aparapi/test/CorrMatrixTest.java
+++ b/examples/correlation-matrix/src/test/gov/pnnl/aparapi/test/CorrMatrixTest.java
@@ -25,7 +25,7 @@ import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
-import com.syncleus.aparapi.Kernel.EXECUTION_MODE;
+import com.aparapi.Kernel.EXECUTION_MODE;
 
 /**
  * This test class performs the following functions:
diff --git a/examples/movie/build.xml b/examples/movie/build.xml
index 0aa4c9a5a0995619d3d3b1aac4f7d4ff83651d6b..bbfd7ae5d1e13d156cf6e41ae4ce6a3bf4315dc9 100644
--- a/examples/movie/build.xml
+++ b/examples/movie/build.xml
@@ -110,7 +110,7 @@
       <mkdir dir="classes"/>
       <javac srcdir="src" destdir="classes" debug="on" includeantruntime="false" >
          <classpath>
-            <pathelement path="..\..\com.syncleus.aparapi\dist\aparapi.jar"/>
+            <pathelement path="..\..\com.aparapi\dist\aparapi.jar"/>
             <pathelement path="jjmpeg\jjmpeg-0.0\dist\jjmpeg.jar/"/>
             <pathelement path="..\jviolajones\jviolajones.jar/"/>
          </classpath>
diff --git a/examples/movie/movie.bat b/examples/movie/movie.bat
index 050eeb397ad64dd0ae47fb69ffe44d78e2b6d27d..9273c3c2fd573a6e2ed1b67d3f4dfc0a99f27df2 100644
--- a/examples/movie/movie.bat
+++ b/examples/movie/movie.bat
@@ -9,7 +9,7 @@ echo "win32!"
 set PATH=%PATH%;ffmpeg\ffmpeg-git-9c2651a-win32-shared\bin
 set PATH=%PATH%;jjmpeg\jjmpeg-0.0\native\mswin-i386
 :win64
-set PATH=%PATH%;..\..\com.syncleus.aparapi.jni\dist
-java -classpath jjmpeg\jjmpeg-0.0\dist\jjmpeg.jar;..\..\com.syncleus.aparapi\dist\aparapi.jar;movie.jar; com.syncleus.aparapi.examples.movie.%1 %2
+set PATH=%PATH%;..\..\com.aparapi.jni\dist
+java -classpath jjmpeg\jjmpeg-0.0\dist\jjmpeg.jar;..\..\com.aparapi\dist\aparapi.jar;movie.jar; com.aparapi.examples.movie.%1 %2
 
 ENDLOCAL
diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/AparapiSolution.java b/examples/movie/src/com/amd/aparapi/examples/movie/AparapiSolution.java
index 05e6b7bdcac353216a90b4d63f2e3375ad3beb2f..29fdc9460a8ddd91d60c91c9f21c848bb83dcb65 100644
--- a/examples/movie/src/com/amd/aparapi/examples/movie/AparapiSolution.java
+++ b/examples/movie/src/com/amd/aparapi/examples/movie/AparapiSolution.java
@@ -35,14 +35,14 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi.examples.movie;
+package com.aparapi.examples.movie;
 
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
 
 public class AparapiSolution{
 
diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/ConvMatrix3x3Editor.java b/examples/movie/src/com/amd/aparapi/examples/movie/ConvMatrix3x3Editor.java
index 252cd74514cfd04fd680f8e054f17d729dd281cf..d3140806e23685e110f1c9ad90a908f54993cc2c 100644
--- a/examples/movie/src/com/amd/aparapi/examples/movie/ConvMatrix3x3Editor.java
+++ b/examples/movie/src/com/amd/aparapi/examples/movie/ConvMatrix3x3Editor.java
@@ -36,7 +36,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.movie;
+package com.aparapi.examples.movie;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/JJMPEGPlayer.java b/examples/movie/src/com/amd/aparapi/examples/movie/JJMPEGPlayer.java
index bf3e362c9e54a48d0f6041513816442c3f213c6c..79f546b69c384bb88fc3e03c10c6e311c1b3503b 100644
--- a/examples/movie/src/com/amd/aparapi/examples/movie/JJMPEGPlayer.java
+++ b/examples/movie/src/com/amd/aparapi/examples/movie/JJMPEGPlayer.java
@@ -35,7 +35,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi.examples.movie;
+package com.aparapi.examples.movie;
 
 import java.awt.BorderLayout;
 import java.awt.Graphics;
diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/PureJavaSolution.java b/examples/movie/src/com/amd/aparapi/examples/movie/PureJavaSolution.java
index b38b537117677cd017a4764bb795bd39a41ca5a0..a7b32024122f78e97ed6427ef839e47cd2c3c9c1 100644
--- a/examples/movie/src/com/amd/aparapi/examples/movie/PureJavaSolution.java
+++ b/examples/movie/src/com/amd/aparapi/examples/movie/PureJavaSolution.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.examples.movie;
+package com.aparapi.examples.movie;
 
 import java.awt.Graphics2D;
 import java.awt.image.ConvolveOp;
diff --git a/examples/movie/src/com/amd/aparapi/examples/movie/ReferenceSolution.java b/examples/movie/src/com/amd/aparapi/examples/movie/ReferenceSolution.java
index 09680219086725f8e12d55a23588537e638b99bc..1c39d1d032b607eb7610ffd697b4edadc9137d14 100644
--- a/examples/movie/src/com/amd/aparapi/examples/movie/ReferenceSolution.java
+++ b/examples/movie/src/com/amd/aparapi/examples/movie/ReferenceSolution.java
@@ -35,14 +35,14 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi.examples.movie;
+package com.aparapi.examples.movie;
 
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 import java.awt.image.DataBufferByte;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
 
 public class ReferenceSolution{
 
diff --git a/pom.xml b/pom.xml
index f4eddb634a5c611d28d709b31d23aa450f6b7d05..c2220845c9c1dfbffa4c58472e60fb5c7fcfaff8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,9 +8,9 @@
         <version>3</version>
     </parent>
 
-    <groupId>com.syncleus.aparapi</groupId>
+    <groupId>com.aparapi</groupId>
     <artifactId>aparapi-examples</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -79,9 +79,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.syncleus.aparapi</groupId>
+            <groupId>com.aparapi</groupId>
             <artifactId>aparapi</artifactId>
-            <version>1.0.0</version>
+            <version>1.1.0</version>
         </dependency>
         <dependency>
             <groupId>org.jogamp.jogl</groupId>
@@ -102,10 +102,10 @@
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>exec-maven-plugin</artifactId>
                 <configuration>
-                    <mainClass>com.syncleus.aparapi.examples.All</mainClass>
+                    <mainClass>com.aparapi.examples.All</mainClass>
                     <arguments>
-                        <argument>com.syncleus.aparapi.executionMode=GPU</argument>
-                        <argument>com.syncleus.aparapi.enableShowGeneratedOpenCL=true</argument>
+                        <argument>com.aparapi.executionMode=GPU</argument>
+                        <argument>com.aparapi.enableShowGeneratedOpenCL=true</argument>
                     </arguments>
                 </configuration>
             </plugin>
diff --git a/src/main/java/com/syncleus/aparapi/examples/All.java b/src/main/java/com/aparapi/examples/All.java
similarity index 63%
rename from src/main/java/com/syncleus/aparapi/examples/All.java
rename to src/main/java/com/aparapi/examples/All.java
index 084a40fbc59b6fba961d03d969210fee71c15062..035ca41c0b0d3da6e379da9fbd2fc0c88093b7cf 100644
--- a/src/main/java/com/syncleus/aparapi/examples/All.java
+++ b/src/main/java/com/aparapi/examples/All.java
@@ -8,7 +8,24 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples;
+package com.aparapi.examples;
+
+import com.aparapi.examples.blackscholes.Main;
+import com.aparapi.examples.configuration.*;
+import com.aparapi.examples.convolution.Convolution;
+import com.aparapi.examples.convolution.ConvolutionOpenCL;
+import com.aparapi.examples.convolution.PureJava;
+import com.aparapi.examples.extension.*;
+import com.aparapi.examples.javaonedemo.Life;
+import com.aparapi.examples.javaonedemo.Mandel;
+import com.aparapi.examples.javaonedemo.NBody;
+import com.aparapi.examples.mandel.Main2D;
+import com.aparapi.examples.mdarray.MDArray;
+import com.aparapi.examples.median.MedianDemo;
+import com.aparapi.examples.nbody.Local;
+import com.aparapi.examples.nbody.Seq;
+import com.aparapi.examples.progress.MultiPassKernelSwingWorkerDemo;
+import com.aparapi.examples.progress.ProgressAndCancelDemo;
 
 import java.util.Scanner;
 
@@ -80,106 +97,106 @@ public class All {
         switch(line)
         {
             case "1":
-                com.syncleus.aparapi.examples.life.Main.main(args);
+                com.aparapi.examples.life.Main.main(args);
                 break;
             case "2":
-                com.syncleus.aparapi.examples.mandel.Main.main(args);
+                com.aparapi.examples.mandel.Main.main(args);
                 break;
             case "3":
-                com.syncleus.aparapi.examples.mandel.Main2D.main(args);
+                Main2D.main(args);
                 break;
             case "4":
-                com.syncleus.aparapi.examples.convolution.Convolution.main(args);
+                Convolution.main(args);
                 break;
             case "5":
-                com.syncleus.aparapi.examples.convolution.ConvolutionOpenCL.main(args);
+                ConvolutionOpenCL.main(args);
                 break;
             case "6":
-                com.syncleus.aparapi.examples.convolution.PureJava.main(args);
+                PureJava.main(args);
                 break;
             case "7":
-                com.syncleus.aparapi.examples.blackscholes.Main.main(args);
+                Main.main(args);
                 break;
             case "8":
-                com.syncleus.aparapi.examples.squares.Main.main(args);
+                com.aparapi.examples.squares.Main.main(args);
                 break;
             case "9":
-                com.syncleus.aparapi.examples.progress.MultiPassKernelSwingWorkerDemo.main(args);
+                MultiPassKernelSwingWorkerDemo.main(args);
                 break;
             case "10":
-                com.syncleus.aparapi.examples.progress.ProgressAndCancelDemo.main(args);
+                ProgressAndCancelDemo.main(args);
                 break;
             case "11":
-                com.syncleus.aparapi.examples.info.Main.main(args);
+                com.aparapi.examples.info.Main.main(args);
                 break;
             case "12":
-                com.syncleus.aparapi.examples.median.MedianDemo.main(args);
+                MedianDemo.main(args);
                 break;
             case "13":
-                com.syncleus.aparapi.examples.mdarray.MDArray.main(args);
+                MDArray.main(args);
                 break;
             case "14":
-                com.syncleus.aparapi.examples.add.Main.main(args);
+                com.aparapi.examples.add.Main.main(args);
                 break;
             case "15":
-                com.syncleus.aparapi.examples.extension.FFTExample.main(args);
+                FFTExample.main(args);
                 break;
             case "16":
-                com.syncleus.aparapi.examples.extension.Histogram.main(args);
+                Histogram.main(args);
                 break;
             case "17":
-                com.syncleus.aparapi.examples.extension.HistogramIdeal.main(args);
+                HistogramIdeal.main(args);
                 break;
             case "18":
-                com.syncleus.aparapi.examples.extension.MandelExample.main(args);
+                MandelExample.main(args);
                 break;
             case "19":
-                com.syncleus.aparapi.examples.extension.SquareExample.main(args);
+                SquareExample.main(args);
                 break;
             case "20":
-                com.syncleus.aparapi.examples.configuration.AutoCleanUpArraysDemo.main(args);
+                AutoCleanUpArraysDemo.main(args);
                 break;
             case "21":
-                com.syncleus.aparapi.examples.configuration.CleanUpArraysDemo.main(args);
+                CleanUpArraysDemo.main(args);
                 break;
             case "22":
-                com.syncleus.aparapi.examples.configuration.ConfigurationDemo.main(args);
+                ConfigurationDemo.main(args);
                 break;
             case "23":
-                com.syncleus.aparapi.examples.configuration.CustomConfigurationDemo.main(args);
+                CustomConfigurationDemo.main(args);
                 break;
             case "24":
-                com.syncleus.aparapi.examples.configuration.LegacyConfigurationDemo.main(args);
+                LegacyConfigurationDemo.main(args);
                 break;
             case "25":
-                com.syncleus.aparapi.examples.configuration.ProfilingDemo.main(args);
+                ProfilingDemo.main(args);
                 break;
             case "26":
-                com.syncleus.aparapi.examples.configuration.ProfilingDemoNoBinaryCaching.main(args);
+                ProfilingDemoNoBinaryCaching.main(args);
                 break;
             case "27":
-                com.syncleus.aparapi.examples.effects.Main.main(args);
+                com.aparapi.examples.effects.Main.main(args);
                 break;
             case "28":
-                com.syncleus.aparapi.examples.javaonedemo.Life.main(args);
+                Life.main(args);
                 break;
             case "29":
-                com.syncleus.aparapi.examples.javaonedemo.Mandel.main(args);
+                Mandel.main(args);
                 break;
             case "30":
-                com.syncleus.aparapi.examples.javaonedemo.NBody.main(args);
+                NBody.main(args);
                 break;
             case "31":
-                com.syncleus.aparapi.examples.nbody.Main.main(args);
+                com.aparapi.examples.nbody.Main.main(args);
                 break;
             case "32":
-                com.syncleus.aparapi.examples.nbody.Local.main(args);
+                Local.main(args);
                 break;
             case "33":
-                com.syncleus.aparapi.examples.nbody.Seq.main(args);
+                Seq.main(args);
                 break;
             case "34":
-                com.syncleus.aparapi.examples.oopnbody.Main.main(args);
+                com.aparapi.examples.oopnbody.Main.main(args);
                 break;
             default:
                 System.out.println("Invalid selection.");
diff --git a/src/main/java/com/syncleus/aparapi/examples/add/Main.java b/src/main/java/com/aparapi/examples/add/Main.java
similarity index 95%
rename from src/main/java/com/syncleus/aparapi/examples/add/Main.java
rename to src/main/java/com/aparapi/examples/add/Main.java
index 336f8acb9b91c1b12e8689de351f8dfe253440c8..97a4c7e0d8e4aa459da55382b0c0aa4cc3c50b76 100644
--- a/src/main/java/com/syncleus/aparapi/examples/add/Main.java
+++ b/src/main/java/com/aparapi/examples/add/Main.java
@@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.add;
+package com.aparapi.examples.add;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
 
 public class Main{
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/blackscholes/Main.java b/src/main/java/com/aparapi/examples/blackscholes/Main.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/blackscholes/Main.java
rename to src/main/java/com/aparapi/examples/blackscholes/Main.java
index 16c517220b92889acf84bff1cabd5eb2e3e995de..c462d201d873ab0b027118297b717e421afe0557 100644
--- a/src/main/java/com/syncleus/aparapi/examples/blackscholes/Main.java
+++ b/src/main/java/com/aparapi/examples/blackscholes/Main.java
@@ -45,10 +45,10 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi.examples.blackscholes;
+package com.aparapi.examples.blackscholes;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
 
 public class Main{
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java b/src/main/java/com/aparapi/examples/configuration/AutoCleanUpArraysDemo.java
similarity index 82%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java
rename to src/main/java/com/aparapi/examples/configuration/AutoCleanUpArraysDemo.java
index 00178408262324df8fb4481d19a9c761569fde7f..c00e97af3f23d4ac73a7e7268a6f4e20968ccfdf 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/AutoCleanUpArraysDemo.java
+++ b/src/main/java/com/aparapi/examples/configuration/AutoCleanUpArraysDemo.java
@@ -8,14 +8,14 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.examples.mandel.*;
+import com.aparapi.examples.mandel.Main;
 
 public class AutoCleanUpArraysDemo {
    public static void main(String[] ignored) {
 
-      System.setProperty("com.syncleus.aparapi.dumpProfileOnExecution", "true");
+      System.setProperty("com.aparapi.dumpProfileOnExecution", "true");
 
       int size = 1024;
       int[] rgbs = new int[size * size];
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java b/src/main/java/com/aparapi/examples/configuration/CleanUpArraysDemo.java
similarity index 68%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java
rename to src/main/java/com/aparapi/examples/configuration/CleanUpArraysDemo.java
index 8e39e4dc6dde8fe0fd777356a83bd71c9e2887d3..3891f04b6cfa6420118daeddc6fa8e88ede162e8 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/CleanUpArraysDemo.java
+++ b/src/main/java/com/aparapi/examples/configuration/CleanUpArraysDemo.java
@@ -8,17 +8,17 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.examples.mandel.*;
+import com.aparapi.examples.mandel.Main;
 
 public class CleanUpArraysDemo {
    public static void main(String[] ignored) {
 
-      System.setProperty("com.syncleus.aparapi.enableVerboseJNI", "true");
-      System.setProperty("com.syncleus.aparapi.enableVerboseJNIOpenCLResourceTracking", "true");
-      System.setProperty("com.syncleus.aparapi.enableExecutionModeReporting", "true");
-      System.setProperty("com.syncleus.aparapi.dumpProfileOnExecution", "true");
+      System.setProperty("com.aparapi.enableVerboseJNI", "true");
+      System.setProperty("com.aparapi.enableVerboseJNIOpenCLResourceTracking", "true");
+      System.setProperty("com.aparapi.enableExecutionModeReporting", "true");
+      System.setProperty("com.aparapi.dumpProfileOnExecution", "true");
 
       int size = 1024;
       int[] rgbs = new int[size * size];
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java b/src/main/java/com/aparapi/examples/configuration/ConfigurationDemo.java
similarity index 90%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java
rename to src/main/java/com/aparapi/examples/configuration/ConfigurationDemo.java
index 0aef950c1d338cdd9339c5a44a9dc2d9ea2cde22..6ad8894c34a391005019ea3f673f0b848afb9477 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/ConfigurationDemo.java
+++ b/src/main/java/com/aparapi/examples/configuration/ConfigurationDemo.java
@@ -8,15 +8,15 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.internal.kernel.*;
+import com.aparapi.*;
+import com.aparapi.internal.kernel.*;
 
 import java.util.*;
 
 /**
- * Tests device selection via {@link com.syncleus.aparapi.internal.kernel.KernelManager}.
+ * Tests device selection via {@link com.aparapi.internal.kernel.KernelManager}.
  */
 public class ConfigurationDemo {
    public static void main(String[] ignored) {
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java b/src/main/java/com/aparapi/examples/configuration/CustomConfigurationDemo.java
similarity index 85%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java
rename to src/main/java/com/aparapi/examples/configuration/CustomConfigurationDemo.java
index ad22f1fa0b2adea2db2fcd242e1e5de488eff13a..86f30f715b57ade158ac830700135668bd4e04ec 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/CustomConfigurationDemo.java
+++ b/src/main/java/com/aparapi/examples/configuration/CustomConfigurationDemo.java
@@ -8,10 +8,10 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
 
 import java.util.*;
 
@@ -21,7 +21,7 @@ import java.util.*;
 public class CustomConfigurationDemo {
 
    public static void main(String[] ignored) {
-      System.setProperty("com.syncleus.aparapi.dumpProfilesOnExit", "true");
+      System.setProperty("com.aparapi.dumpProfilesOnExit", "true");
       KernelManager manager = new KernelManager() {
          @Override
          protected List<Device.TYPE> getPreferredDeviceTypes() {
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java b/src/main/java/com/aparapi/examples/configuration/KernelOkayInOpenCL.java
similarity index 81%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java
rename to src/main/java/com/aparapi/examples/configuration/KernelOkayInOpenCL.java
index c4f8b2b2e8780331dfbb32817e7f9cd4f48a806f..1e6dc5f80a30eda5b4cd372002bcc32af5c8fe93 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelOkayInOpenCL.java
+++ b/src/main/java/com/aparapi/examples/configuration/KernelOkayInOpenCL.java
@@ -8,12 +8,12 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
 /**
  * Created by Barney on 24/08/2015.
  */
-public class KernelOkayInOpenCL extends com.syncleus.aparapi.Kernel {
+public class KernelOkayInOpenCL extends com.aparapi.Kernel {
    char[] inChars = "KernelOkayInOpenCL".toCharArray();
    char[] outChars = new char[inChars.length];
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java b/src/main/java/com/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java
similarity index 88%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java
rename to src/main/java/com/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java
index e91947ff8f800bee674b72f7ddf9bd3818885ce6..e7d4cb590df976741748e91ec2f75612617cb0fa 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java
+++ b/src/main/java/com/aparapi/examples/configuration/KernelWithAlternateFallbackAlgorithm.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.*;
+import com.aparapi.*;
 
 /**
  * Kernel which will always fail to run on an OpenCLDevice but has an alternative fallback algorithm.
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java b/src/main/java/com/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java
rename to src/main/java/com/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java
index 13df43d507de3c4eb71cd1222ad0e15d86ef2351..8253af721212e6e72f1274a1a73fcdf4746b61ec 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java
+++ b/src/main/java/com/aparapi/examples/configuration/KernelWithoutAlternateFallbackAlgorithm.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.*;
+import com.aparapi.*;
 
 /**
  * Kernel which will always fail to run on an OpenCLDevice but has an alternative fallback algorithm.
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java b/src/main/java/com/aparapi/examples/configuration/LegacyConfigurationDemo.java
similarity index 65%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java
rename to src/main/java/com/aparapi/examples/configuration/LegacyConfigurationDemo.java
index e68967dd5c3f0eafbdfcc500f11e86c0a8e29749..02f8bfa732d9d07872f2ac39b0732754eb9b8c1e 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/LegacyConfigurationDemo.java
+++ b/src/main/java/com/aparapi/examples/configuration/LegacyConfigurationDemo.java
@@ -8,21 +8,21 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.internal.kernel.*;
+import com.aparapi.*;
+import com.aparapi.internal.kernel.*;
 
 /**
- * Tests device selection when circumventing the {@link com.syncleus.aparapi.internal.kernel.KernelManager} by using the legacy mechanism
+ * Tests device selection when circumventing the {@link com.aparapi.internal.kernel.KernelManager} by using the legacy mechanism
  * (setExecutionMode, etc.).
  */
 public class LegacyConfigurationDemo {
 
    @SuppressWarnings("deprecation")
    public static void main(String[] ignored) {
-      System.setProperty("com.syncleus.aparapi.executionMode", "GPU,CPU,SEQ");
-      System.setProperty("com.syncleus.aparapi.dumpProfilesOnExit", "true");
+      System.setProperty("com.aparapi.executionMode", "GPU,CPU,SEQ");
+      System.setProperty("com.aparapi.dumpProfilesOnExit", "true");
 
       KernelWithAlternateFallbackAlgorithm kernel = new KernelWithAlternateFallbackAlgorithm();
       kernel.setExecutionMode(Kernel.EXECUTION_MODE.GPU);
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java b/src/main/java/com/aparapi/examples/configuration/ProfilingDemo.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java
rename to src/main/java/com/aparapi/examples/configuration/ProfilingDemo.java
index dcec233a65656152c73205ad14de84a83c50b664..5bb76f50f0d44461f37de0fdc869200d0f6b1969 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemo.java
+++ b/src/main/java/com/aparapi/examples/configuration/ProfilingDemo.java
@@ -8,19 +8,18 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.examples.blackscholes.Main.*;
-import com.syncleus.aparapi.examples.mandel.*;
+import com.aparapi.examples.mandel.Main;
+import com.aparapi.*;
+import com.aparapi.internal.kernel.*;
 
 /**
  * Demonstrate new enhanced profiling capability, profiling the kernel from the blackscholes sample.
  */
 public class ProfilingDemo {
 
-   private static BlackScholesKernel kernel;
+   private static com.aparapi.examples.blackscholes.Main.BlackScholesKernel kernel;
 
    public static void main(String[] ignored) {
 
@@ -63,7 +62,7 @@ public class ProfilingDemo {
    }
 
    private static void printLastProfile(String tableHeader) {
-      KernelProfile profile = KernelManager.instance().getProfile(BlackScholesKernel.class);
+      KernelProfile profile = KernelManager.instance().getProfile(com.aparapi.examples.blackscholes.Main.BlackScholesKernel.class);
       KernelDeviceProfile deviceProfile = profile.getLastDeviceProfile();
       String row = deviceProfile.getLastAsTableRow();
       System.out.println(tableHeader);
@@ -88,6 +87,6 @@ public class ProfilingDemo {
          kernel.dispose();
       }
       System.gc();
-      kernel = new BlackScholesKernel(size);
+      kernel = new com.aparapi.examples.blackscholes.Main.BlackScholesKernel(size);
    }
 }
diff --git a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java b/src/main/java/com/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java
similarity index 84%
rename from src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java
rename to src/main/java/com/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java
index 7ff4c23ec736e5e2cc712bd21e30e90434547c3d..ca0c36a8688bf689365b0a65139dd8f049ac8e2d 100644
--- a/src/main/java/com/syncleus/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java
+++ b/src/main/java/com/aparapi/examples/configuration/ProfilingDemoNoBinaryCaching.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.configuration;
+package com.aparapi.examples.configuration;
 
-import com.syncleus.aparapi.internal.kernel.*;
+import com.aparapi.internal.kernel.*;
 
 /**
  * Created by Barney on 13/09/2015.
diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvMatrix3x3Editor.java b/src/main/java/com/aparapi/examples/convolution/ConvMatrix3x3Editor.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/convolution/ConvMatrix3x3Editor.java
rename to src/main/java/com/aparapi/examples/convolution/ConvMatrix3x3Editor.java
index 39a225047fd6748635c3df8ab3dc902711ad494b..9c0abc0c78d47375c4de6aad47932228e865b777 100644
--- a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvMatrix3x3Editor.java
+++ b/src/main/java/com/aparapi/examples/convolution/ConvMatrix3x3Editor.java
@@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.convolution;
+package com.aparapi.examples.convolution;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/Convolution.java b/src/main/java/com/aparapi/examples/convolution/Convolution.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/convolution/Convolution.java
rename to src/main/java/com/aparapi/examples/convolution/Convolution.java
index 4e8a7f5266f7f210d59bc2189e6d818c4d7c6fe7..c7ed5495c9cb103a1acca3a1a3fa3ac80beb5e9c 100644
--- a/src/main/java/com/syncleus/aparapi/examples/convolution/Convolution.java
+++ b/src/main/java/com/aparapi/examples/convolution/Convolution.java
@@ -46,9 +46,9 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
  */
 
-package com.syncleus.aparapi.examples.convolution;
+package com.aparapi.examples.convolution;
 
-import com.syncleus.aparapi.*;
+import com.aparapi.*;
 
 import java.io.*;
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionOpenCL.java b/src/main/java/com/aparapi/examples/convolution/ConvolutionOpenCL.java
similarity index 90%
rename from src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionOpenCL.java
rename to src/main/java/com/aparapi/examples/convolution/ConvolutionOpenCL.java
index e611395dbd979236f43d3552c0d6c889f71f7cfd..588a60e8d0857922b335df74b5634d67c031ab72 100644
--- a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionOpenCL.java
+++ b/src/main/java/com/aparapi/examples/convolution/ConvolutionOpenCL.java
@@ -46,19 +46,19 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.convolution;
+package com.aparapi.examples.convolution;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
-import com.syncleus.aparapi.opencl.OpenCL.*;
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
+import com.aparapi.opencl.OpenCL.*;
 
 import java.io.*;
 
 public class ConvolutionOpenCL{
 
-   @Resource("com/syncleus/aparapi/examples/convolution/convolution.cl") interface Convolution extends OpenCL<Convolution>{
+   @Resource("com/aparapi/examples/convolution/convolution.cl") interface Convolution extends OpenCL<Convolution>{
       Convolution applyConvolution(//
             Range range, //
             @GlobalReadOnly("_convMatrix3x3") float[] _convMatrix3x3,//// only read from kernel 
diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionViewer.java b/src/main/java/com/aparapi/examples/convolution/ConvolutionViewer.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionViewer.java
rename to src/main/java/com/aparapi/examples/convolution/ConvolutionViewer.java
index c5773344fa82f2e8146af1e8fd94f37a6c21e4fe..53cc34c12cce101884260e7284b12c228bf4d560 100644
--- a/src/main/java/com/syncleus/aparapi/examples/convolution/ConvolutionViewer.java
+++ b/src/main/java/com/aparapi/examples/convolution/ConvolutionViewer.java
@@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.convolution;
+package com.aparapi.examples.convolution;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/PureJava.java b/src/main/java/com/aparapi/examples/convolution/PureJava.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/convolution/PureJava.java
rename to src/main/java/com/aparapi/examples/convolution/PureJava.java
index 4ac820fb466899725d7770b263fc416eb50dc274..e76f313f68f28955b48d08f86036a63cbd350ddd 100644
--- a/src/main/java/com/syncleus/aparapi/examples/convolution/PureJava.java
+++ b/src/main/java/com/aparapi/examples/convolution/PureJava.java
@@ -46,11 +46,11 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.convolution;
+package com.aparapi.examples.convolution;
 
 import java.io.File;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class PureJava{
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/convolution/convolution.cl b/src/main/java/com/aparapi/examples/convolution/convolution.cl
similarity index 100%
rename from src/main/java/com/syncleus/aparapi/examples/convolution/convolution.cl
rename to src/main/java/com/aparapi/examples/convolution/convolution.cl
diff --git a/src/main/java/com/syncleus/aparapi/examples/effects/Main.java b/src/main/java/com/aparapi/examples/effects/Main.java
similarity index 98%
rename from src/main/java/com/syncleus/aparapi/examples/effects/Main.java
rename to src/main/java/com/aparapi/examples/effects/Main.java
index 3286f51b4ee544e4a58a6c0ad88e15316ab53b29..b64abba775b003f4712281e5ecf1bdccd62c7f0a 100644
--- a/src/main/java/com/syncleus/aparapi/examples/effects/Main.java
+++ b/src/main/java/com/aparapi/examples/effects/Main.java
@@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.effects;
+package com.aparapi.examples.effects;
 
 import java.awt.Color;
 import java.awt.Dimension;
@@ -62,8 +62,8 @@ import java.awt.image.DataBufferInt;
 import javax.swing.JComponent;
 import javax.swing.JFrame;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
 
 /**
  * An example Aparapi application which tracks the mouse and updates the color pallete of the window based on the distance from the mouse pointer. 
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/FFTExample.java b/src/main/java/com/aparapi/examples/extension/FFTExample.java
similarity index 87%
rename from src/main/java/com/syncleus/aparapi/examples/extension/FFTExample.java
rename to src/main/java/com/aparapi/examples/extension/FFTExample.java
index de3975e4cbaced84fc5da3c93f4734227023e915..2e9fcd3ceef96c5ec8f8579d55d3eefb0f711baf 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/FFTExample.java
+++ b/src/main/java/com/aparapi/examples/extension/FFTExample.java
@@ -8,19 +8,19 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
-import com.syncleus.aparapi.opencl.OpenCL.*;
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
+import com.aparapi.opencl.OpenCL.*;
 
 import java.util.*;
 
 public class FFTExample{
 
-   @Resource("com/syncleus/aparapi/examples/extension/fft.cl") interface FFT extends OpenCL<FFT>{
+   @Resource("com/aparapi/examples/extension/fft.cl") interface FFT extends OpenCL<FFT>{
 
       public FFT forward(//
             Range _range,//
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/Histogram.java b/src/main/java/com/aparapi/examples/extension/Histogram.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/extension/Histogram.java
rename to src/main/java/com/aparapi/examples/extension/Histogram.java
index 3a57f14ee4cae479cb4f558c268979bd4f3752b3..0cdba98facca167390a9bd029e816ee785686758 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/Histogram.java
+++ b/src/main/java/com/aparapi/examples/extension/Histogram.java
@@ -8,18 +8,18 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
-import com.syncleus.aparapi.device.Device;
-import com.syncleus.aparapi.device.OpenCLDevice;
-import com.syncleus.aparapi.opencl.OpenCL;
-import com.syncleus.aparapi.opencl.OpenCL.Resource;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
+import com.aparapi.device.Device;
+import com.aparapi.device.OpenCLDevice;
+import com.aparapi.opencl.OpenCL;
+import com.aparapi.opencl.OpenCL.Resource;
 
 public class Histogram{
 
-   @Resource("com/syncleus/aparapi/examples/extension/HistogramKernel.cl") interface HistogramKernel extends OpenCL<HistogramKernel>{
+   @Resource("com/aparapi/examples/extension/HistogramKernel.cl") interface HistogramKernel extends OpenCL<HistogramKernel>{
 
       public HistogramKernel histogram256(//
             Range _range,//
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/HistogramIdeal.java b/src/main/java/com/aparapi/examples/extension/HistogramIdeal.java
similarity index 90%
rename from src/main/java/com/syncleus/aparapi/examples/extension/HistogramIdeal.java
rename to src/main/java/com/aparapi/examples/extension/HistogramIdeal.java
index 888c78f25dddec7a9a8af3868283da5fe323d902..f72fe809a195f0e1d101a1bfcf5de268fb1d260d 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/HistogramIdeal.java
+++ b/src/main/java/com/aparapi/examples/extension/HistogramIdeal.java
@@ -8,13 +8,13 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.Range;
-import com.syncleus.aparapi.device.Device;
-import com.syncleus.aparapi.device.OpenCLDevice;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.OpenCL;
+import com.aparapi.Range;
+import com.aparapi.device.Device;
+import com.aparapi.device.OpenCLDevice;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.OpenCL;
 
 public class HistogramIdeal{
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/HistogramKernel.cl b/src/main/java/com/aparapi/examples/extension/HistogramKernel.cl
similarity index 100%
rename from src/main/java/com/syncleus/aparapi/examples/extension/HistogramKernel.cl
rename to src/main/java/com/aparapi/examples/extension/HistogramKernel.cl
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrot.java b/src/main/java/com/aparapi/examples/extension/JavaMandelBrot.java
similarity index 93%
rename from src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrot.java
rename to src/main/java/com/aparapi/examples/extension/JavaMandelBrot.java
index e595e2ec570f56d699e7ce13e1195c17f6cf09f1..bb299d174cec1f44b72952d40bd279257ed8f3dc 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrot.java
+++ b/src/main/java/com/aparapi/examples/extension/JavaMandelBrot.java
@@ -8,12 +8,12 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
 
 public class JavaMandelBrot extends OpenCLAdapter<MandelBrot> implements MandelBrot{
    final int MAX_ITERATIONS = 64;
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrotMultiThread.java b/src/main/java/com/aparapi/examples/extension/JavaMandelBrotMultiThread.java
similarity index 94%
rename from src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrotMultiThread.java
rename to src/main/java/com/aparapi/examples/extension/JavaMandelBrotMultiThread.java
index 45a4fbb3993c366fdb51046fc156d073a59ee660..5dab1b4f7cdb22b20a1728e366ba502f522eedf3 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/JavaMandelBrotMultiThread.java
+++ b/src/main/java/com/aparapi/examples/extension/JavaMandelBrotMultiThread.java
@@ -8,15 +8,15 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
-import com.syncleus.aparapi.Range;
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
+import com.aparapi.Range;
 
 public class JavaMandelBrotMultiThread extends OpenCLAdapter<MandelBrot> implements MandelBrot{
    final int MAX_ITERATIONS = 64;
diff --git a/src/main/java/com/aparapi/examples/extension/Mandel.java b/src/main/java/com/aparapi/examples/extension/Mandel.java
new file mode 100644
index 0000000000000000000000000000000000000000..8a4c6c64618989b8df7d977951151fbb1b363e03
--- /dev/null
+++ b/src/main/java/com/aparapi/examples/extension/Mandel.java
@@ -0,0 +1,45 @@
+/**
+ * This product currently only contains code developed by authors
+ * of specific components, as identified by the source code files.
+ *
+ * Since product implements StAX API, it has dependencies to StAX API
+ * classes.
+ *
+ * For additional credits (generally to people who reported problems)
+ * see CREDITS file.
+ */
+package com.aparapi.examples.extension;
+
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
+import com.aparapi.opencl.OpenCL.*;
+
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.*;
+import java.awt.image.*;
+import java.util.concurrent.*;
+import com.aparapi.opencl.OpenCL.Resource;
+
+/**
+ * An example Aparapi application which displays a view of the Mandelbrot set and lets the user zoom in to a particular point.
+ *
+ * When the user clicks on the view, this example application will zoom in to the clicked point and zoom out there after.
+ * On GPU, additional computing units will offer a better viewing experience. On the other hand on CPU, this example
+ * application might suffer with sub-optimal frame refresh rate as compared to GPU.
+ *
+ * @author gfrost
+ *
+ */
+
+@Resource("com/aparapi/examples/extension/mandel2.cl")
+public interface Mandel extends OpenCL<Mandel>{
+   Mandel createMandleBrot(//
+                           Range range,//
+                           @Arg("scale") float scale, //
+                           @Arg("offsetx") float offsetx, //
+                           @Arg("offsety") float offsety, //
+                           @GlobalWriteOnly("rgb") int[] rgb);
+}
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/MandelBrot.java b/src/main/java/com/aparapi/examples/extension/MandelBrot.java
similarity index 79%
rename from src/main/java/com/syncleus/aparapi/examples/extension/MandelBrot.java
rename to src/main/java/com/aparapi/examples/extension/MandelBrot.java
index 691727e51ed18d5e965162f078699756dbeea15f..c24e3dd467074d63d6464ffa03352c29b2056098 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/MandelBrot.java
+++ b/src/main/java/com/aparapi/examples/extension/MandelBrot.java
@@ -8,13 +8,13 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
-import com.syncleus.aparapi.opencl.OpenCL.Resource;
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
+import com.aparapi.opencl.OpenCL.Resource;
 
 /**
  * An example Aparapi application which displays a view of the Mandelbrot set and lets the user zoom in to a particular point.
@@ -27,7 +27,7 @@ import com.syncleus.aparapi.opencl.OpenCL.Resource;
  *
  */
 
-@Resource("com/syncleus/aparapi/examples/extension/mandel2.cl")
+@Resource("com/aparapi/examples/extension/mandel2.cl")
 public interface MandelBrot extends OpenCL<MandelBrot>{
    MandelBrot createMandleBrot(//
                                Range range,//
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/MandelExample.java b/src/main/java/com/aparapi/examples/extension/MandelExample.java
similarity index 95%
rename from src/main/java/com/syncleus/aparapi/examples/extension/MandelExample.java
rename to src/main/java/com/aparapi/examples/extension/MandelExample.java
index 27394d96b684cfda0126513e2492f12b8f84a6ea..bcf244ffb0c136f1d2c5b4800a1e45bcc321ecb0 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/MandelExample.java
+++ b/src/main/java/com/aparapi/examples/extension/MandelExample.java
@@ -46,13 +46,13 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
-import com.syncleus.aparapi.opencl.OpenCL.*;
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
+import com.aparapi.opencl.OpenCL.*;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/MandelSimple.java b/src/main/java/com/aparapi/examples/extension/MandelSimple.java
similarity index 94%
rename from src/main/java/com/syncleus/aparapi/examples/extension/MandelSimple.java
rename to src/main/java/com/aparapi/examples/extension/MandelSimple.java
index b976e2d6c9e2c65ec2b0b0f30ff5873c50916ba4..ec895fa2cc1aabc4049583010db33fdca262748e 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/MandelSimple.java
+++ b/src/main/java/com/aparapi/examples/extension/MandelSimple.java
@@ -46,14 +46,14 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.extension;
-
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.examples.extension.Mandel;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
-import com.syncleus.aparapi.opencl.OpenCL.*;
-import com.syncleus.aparapi.Range;
+package com.aparapi.examples.extension;
+
+import com.aparapi.device.*;
+import com.aparapi.examples.extension.Mandel;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
+import com.aparapi.opencl.OpenCL.*;
+import com.aparapi.Range;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/Pow4Example.java b/src/main/java/com/aparapi/examples/extension/Pow4Example.java
similarity index 76%
rename from src/main/java/com/syncleus/aparapi/examples/extension/Pow4Example.java
rename to src/main/java/com/aparapi/examples/extension/Pow4Example.java
index 67bad08a6defcffae0a32b1b732caeafc0d13831..ff029df5e77df1a5c80b391d6f2e64662329f83b 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/Pow4Example.java
+++ b/src/main/java/com/aparapi/examples/extension/Pow4Example.java
@@ -8,18 +8,18 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.Range;
-import com.syncleus.aparapi.device.Device;
-import com.syncleus.aparapi.device.OpenCLDevice;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.OpenCL;
-import com.syncleus.aparapi.opencl.OpenCL.Resource;
+import com.aparapi.Range;
+import com.aparapi.device.Device;
+import com.aparapi.device.OpenCLDevice;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.OpenCL;
+import com.aparapi.opencl.OpenCL.Resource;
 
 public class Pow4Example{
 
-   @Resource("com/syncleus/aparapi/examples/extension/squarer.cl")
+   @Resource("com/aparapi/examples/extension/squarer.cl")
    interface Squarer extends OpenCL<Squarer>{
 
       public Squarer square(//
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/SquareExample.java b/src/main/java/com/aparapi/examples/extension/SquareExample.java
similarity index 81%
rename from src/main/java/com/syncleus/aparapi/examples/extension/SquareExample.java
rename to src/main/java/com/aparapi/examples/extension/SquareExample.java
index cb9efe4144d1824afa4f91f3101607c604f5dfe2..76df58396a2bc3896b57aa4e96e06a297196bbea 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/SquareExample.java
+++ b/src/main/java/com/aparapi/examples/extension/SquareExample.java
@@ -8,16 +8,16 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.ProfileInfo;
-import com.syncleus.aparapi.Range;
-import com.syncleus.aparapi.device.Device;
-import com.syncleus.aparapi.device.OpenCLDevice;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.OpenCL;
-import com.syncleus.aparapi.opencl.OpenCL.Resource;
-import com.syncleus.aparapi.opencl.OpenCL.Source;
+import com.aparapi.ProfileInfo;
+import com.aparapi.Range;
+import com.aparapi.device.Device;
+import com.aparapi.device.OpenCLDevice;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.OpenCL;
+import com.aparapi.opencl.OpenCL.Resource;
+import com.aparapi.opencl.OpenCL.Source;
 import java.util.List;
 
 public class SquareExample{
@@ -33,7 +33,7 @@ public class SquareExample{
             @GlobalReadWrite("out") float[] out);
    }
 
-   @Resource("com/syncleus/aparapi/examples/extension/squarer.cl") interface SquarerWithResource extends OpenCL<SquarerWithResource>{
+   @Resource("com/aparapi/examples/extension/squarer.cl") interface SquarerWithResource extends OpenCL<SquarerWithResource>{
       public SquarerWithResource square(//
             Range _range,//
             @GlobalReadWrite("in") float[] in,//
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/StopWatch.java b/src/main/java/com/aparapi/examples/extension/StopWatch.java
similarity index 88%
rename from src/main/java/com/syncleus/aparapi/examples/extension/StopWatch.java
rename to src/main/java/com/aparapi/examples/extension/StopWatch.java
index eb32e1e62496e266007b875be0dbc14ea89f9fba..a5ac4b26913f59785258a452a26ab0f5f07ce267 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/StopWatch.java
+++ b/src/main/java/com/aparapi/examples/extension/StopWatch.java
@@ -8,7 +8,7 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
 public class StopWatch{
    long start = 0L;
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/SwapExample.java b/src/main/java/com/aparapi/examples/extension/SwapExample.java
similarity index 84%
rename from src/main/java/com/syncleus/aparapi/examples/extension/SwapExample.java
rename to src/main/java/com/aparapi/examples/extension/SwapExample.java
index dbb87fa0e6a27d679aa28d37e4a765beabd66aac..beafe59ad180bfafb16f8a8dd3f34e325cf92c69 100644
--- a/src/main/java/com/syncleus/aparapi/examples/extension/SwapExample.java
+++ b/src/main/java/com/aparapi/examples/extension/SwapExample.java
@@ -8,13 +8,13 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.extension;
+package com.aparapi.examples.extension;
 
-import com.syncleus.aparapi.Range;
-import com.syncleus.aparapi.device.Device;
-import com.syncleus.aparapi.device.OpenCLDevice;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.OpenCL;
+import com.aparapi.Range;
+import com.aparapi.device.Device;
+import com.aparapi.device.OpenCLDevice;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.OpenCL;
 
 public class SwapExample{
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/fft.cl b/src/main/java/com/aparapi/examples/extension/fft.cl
similarity index 100%
rename from src/main/java/com/syncleus/aparapi/examples/extension/fft.cl
rename to src/main/java/com/aparapi/examples/extension/fft.cl
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/mandel.cl b/src/main/java/com/aparapi/examples/extension/mandel.cl
similarity index 100%
rename from src/main/java/com/syncleus/aparapi/examples/extension/mandel.cl
rename to src/main/java/com/aparapi/examples/extension/mandel.cl
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/mandel2.cl b/src/main/java/com/aparapi/examples/extension/mandel2.cl
similarity index 100%
rename from src/main/java/com/syncleus/aparapi/examples/extension/mandel2.cl
rename to src/main/java/com/aparapi/examples/extension/mandel2.cl
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/squarer.cl b/src/main/java/com/aparapi/examples/extension/squarer.cl
similarity index 100%
rename from src/main/java/com/syncleus/aparapi/examples/extension/squarer.cl
rename to src/main/java/com/aparapi/examples/extension/squarer.cl
diff --git a/src/main/java/com/syncleus/aparapi/examples/info/Main.java b/src/main/java/com/aparapi/examples/info/Main.java
similarity index 93%
rename from src/main/java/com/syncleus/aparapi/examples/info/Main.java
rename to src/main/java/com/aparapi/examples/info/Main.java
index 9d560b34926fa1561c8fb1e1896417b3909ce99f..0b83513365e380c17fe3ef469a33707dd8d96446 100644
--- a/src/main/java/com/syncleus/aparapi/examples/info/Main.java
+++ b/src/main/java/com/aparapi/examples/info/Main.java
@@ -46,17 +46,17 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.info;
+package com.aparapi.examples.info;
 
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.internal.opencl.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.internal.opencl.*;
 
 import java.util.*;
 
 public class Main{
    public static void main(String[] _args) {
-      System.out.println("com.syncleus.aparapi.examples.info.Main");
+      System.out.println("com.aparapi.examples.info.Main");
       List<OpenCLPlatform> platforms = (new OpenCLPlatform()).getOpenCLPlatforms();
       System.out.println("Machine contains " + platforms.size() + " OpenCL platforms");
       int platformc = 0;
diff --git a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java b/src/main/java/com/aparapi/examples/javaonedemo/Life.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java
rename to src/main/java/com/aparapi/examples/javaonedemo/Life.java
index d7f471b10c3ae02f400b852b1f00b599b0c73396..c05592592812eda3b66fd8da0e29b2412d977364 100644
--- a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Life.java
+++ b/src/main/java/com/aparapi/examples/javaonedemo/Life.java
@@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.javaonedemo;
+package com.aparapi.examples.javaonedemo;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -70,9 +70,9 @@ import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.ProfileInfo;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.ProfileInfo;
+import com.aparapi.Range;
 
 /**
  * An example Aparapi application which demonstrates Conways 'Game Of Life'.
diff --git a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java b/src/main/java/com/aparapi/examples/javaonedemo/Mandel.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java
rename to src/main/java/com/aparapi/examples/javaonedemo/Mandel.java
index 84ad938470213a6d23f994ab4fdba67172f28aca..fe73d36054ba368edfe861f7f4cc4cba5b06b5f6 100644
--- a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/Mandel.java
+++ b/src/main/java/com/aparapi/examples/javaonedemo/Mandel.java
@@ -46,7 +46,7 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.javaonedemo;
+package com.aparapi.examples.javaonedemo;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -70,10 +70,10 @@ import javax.swing.JComponent;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-import com.syncleus.aparapi.annotation.*;
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.ProfileInfo;
-import com.syncleus.aparapi.Range;
+import com.aparapi.annotation.*;
+import com.aparapi.Kernel;
+import com.aparapi.ProfileInfo;
+import com.aparapi.Range;
 
 /**
  * An example Aparapi application which displays a view of the Mandelbrot set and lets the user zoom in to a particular point. 
diff --git a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java b/src/main/java/com/aparapi/examples/javaonedemo/NBody.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java
rename to src/main/java/com/aparapi/examples/javaonedemo/NBody.java
index a06d8e0d525da9887efcfe86bfc18d960953ded4..0bdc8d2d438831077ac69377f52a5b398f773fad 100644
--- a/src/main/java/com/syncleus/aparapi/examples/javaonedemo/NBody.java
+++ b/src/main/java/com/aparapi/examples/javaonedemo/NBody.java
@@ -45,7 +45,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi.examples.javaonedemo;
+package com.aparapi.examples.javaonedemo;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -75,9 +75,9 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.ProfileInfo;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.ProfileInfo;
+import com.aparapi.Range;
 import com.jogamp.opengl.util.FPSAnimator;
 import com.jogamp.opengl.util.gl2.GLUT;
 import com.jogamp.opengl.util.texture.Texture;
diff --git a/src/main/java/com/syncleus/aparapi/examples/life/Main.java b/src/main/java/com/aparapi/examples/life/Main.java
similarity index 95%
rename from src/main/java/com/syncleus/aparapi/examples/life/Main.java
rename to src/main/java/com/aparapi/examples/life/Main.java
index 09f05c4c621d93bfcfc9431b5e071d4e6abcf8c1..263b906148c9741a2a6750a6c0c01ac8bde1c4ce 100644
--- a/src/main/java/com/syncleus/aparapi/examples/life/Main.java
+++ b/src/main/java/com/aparapi/examples/life/Main.java
@@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.life;
+package com.aparapi.examples.life;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.*;
+import com.aparapi.Kernel;
+import com.aparapi.*;
 
 import javax.swing.*;
 import java.awt.*;
@@ -113,7 +113,7 @@ public class Main{
          width = _width;
          height = _height;
 
-         final String executionMode = System.getProperty("com.syncleus.aparapi.executionMode");
+         final String executionMode = System.getProperty("com.aparapi.executionMode");
          if ((executionMode != null) && executionMode.equals("JTP")) {
             range = Range.create(width * height, 4);
          } else {
diff --git a/src/main/java/com/syncleus/aparapi/examples/mandel/Main.java b/src/main/java/com/aparapi/examples/mandel/Main.java
similarity index 95%
rename from src/main/java/com/syncleus/aparapi/examples/mandel/Main.java
rename to src/main/java/com/aparapi/examples/mandel/Main.java
index c70ca65dfa97e34a4495577d67a1ea4cfeac7238..a9bd900d14927b9fd83485d7479e0064df1230cf 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mandel/Main.java
+++ b/src/main/java/com/aparapi/examples/mandel/Main.java
@@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.mandel;
+package com.aparapi.examples.mandel;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.*;
+import com.aparapi.Kernel;
+import com.aparapi.*;
 
 import javax.swing.*;
 import java.awt.*;
@@ -71,7 +71,7 @@ import java.util.List;
 public class Main{
 
    static {
-      System.setProperty("com.syncleus.aparapi.dumpProfilesOnExit", "true");
+      System.setProperty("com.aparapi.dumpProfilesOnExit", "true");
 //      KernelManager.setKernelManager(new KernelManager() {
 //         @Override
 //         protected List<Device.TYPE> getPreferredDeviceTypes() {
diff --git a/src/main/java/com/syncleus/aparapi/examples/mandel/Main2D.java b/src/main/java/com/aparapi/examples/mandel/Main2D.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/mandel/Main2D.java
rename to src/main/java/com/aparapi/examples/mandel/Main2D.java
index 46114eb40b587b965f4d88cdb2c3d2d582601dc1..782f27be6c67aa74dca679d5343a922cb42c03fe 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mandel/Main2D.java
+++ b/src/main/java/com/aparapi/examples/mandel/Main2D.java
@@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.mandel;
+package com.aparapi.examples.mandel;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.*;
+import com.aparapi.Kernel;
+import com.aparapi.*;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java b/src/main/java/com/aparapi/examples/mdarray/BMatMul1D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java
rename to src/main/java/com/aparapi/examples/mdarray/BMatMul1D.java
index 30515e70961fd6f684a6d8c583a49f7b0107dcd9..82e5180b471687dcd70747df98aaa5918c57f477 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul1D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/BMatMul1D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class BMatMul1D extends Kernel{
    byte[] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java b/src/main/java/com/aparapi/examples/mdarray/BMatMul2D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java
rename to src/main/java/com/aparapi/examples/mdarray/BMatMul2D.java
index d03e80c91b3b398eb4d25f40819eba6c105f5850..be315fbe8efefc92324e43b235945ac9f2b173ae 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul2D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/BMatMul2D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class BMatMul2D extends Kernel{
    byte[][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java b/src/main/java/com/aparapi/examples/mdarray/BMatMul3D.java
similarity index 87%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java
rename to src/main/java/com/aparapi/examples/mdarray/BMatMul3D.java
index 244a8a904a87a789939d1b74cdb5bcb48f09a70e..7f7cf58b221496e0d9146a9008f3ecd7d8e5dd1e 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/BMatMul3D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/BMatMul3D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class BMatMul3D extends Kernel{
    byte[][][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java b/src/main/java/com/aparapi/examples/mdarray/DMatMul1D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java
rename to src/main/java/com/aparapi/examples/mdarray/DMatMul1D.java
index 0752d2992905729481cf38cc1da9daf088b44aef..8a463d77173692ddf863ad506e55ba2cf6e3ff62 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul1D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/DMatMul1D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class DMatMul1D extends Kernel{
    double[] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java b/src/main/java/com/aparapi/examples/mdarray/DMatMul2D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java
rename to src/main/java/com/aparapi/examples/mdarray/DMatMul2D.java
index de6c240f111eff89c8b5ce5c7da5e844ddc14802..a30c901e8144ad545ba082ce3156fb9e361b771d 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul2D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/DMatMul2D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class DMatMul2D extends Kernel{
    double[][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java b/src/main/java/com/aparapi/examples/mdarray/DMatMul3D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java
rename to src/main/java/com/aparapi/examples/mdarray/DMatMul3D.java
index f4b97f887a3df9af5a2b55dd820d2721dc499c4a..6c745a5a37ba0bebb78cb4b8be6270e63b3c1621 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/DMatMul3D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/DMatMul3D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class DMatMul3D extends Kernel{
    double[][][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java b/src/main/java/com/aparapi/examples/mdarray/FMatMul1D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java
rename to src/main/java/com/aparapi/examples/mdarray/FMatMul1D.java
index 4596efb0d1bffb90ed5c039f9367b8f04336eba9..49562376e94149e4014ddb2adb091d756c6db695 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul1D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/FMatMul1D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class FMatMul1D extends Kernel{
    float[] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java b/src/main/java/com/aparapi/examples/mdarray/FMatMul2D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java
rename to src/main/java/com/aparapi/examples/mdarray/FMatMul2D.java
index 1d4daf28893971265cb850751b8a4b98a1137034..eba56715c11ef7da2f60076e42b8f8bd37b13ba4 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul2D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/FMatMul2D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class FMatMul2D extends Kernel{
    float[][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java b/src/main/java/com/aparapi/examples/mdarray/FMatMul3D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java
rename to src/main/java/com/aparapi/examples/mdarray/FMatMul3D.java
index c1360b5347a4891b20b83471ac2e37e88c67b586..a4fd8a096b4c732b29a99bd41f7c58b0c4539367 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/FMatMul3D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/FMatMul3D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class FMatMul3D extends Kernel{
    float[][][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java b/src/main/java/com/aparapi/examples/mdarray/IMatMul1D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java
rename to src/main/java/com/aparapi/examples/mdarray/IMatMul1D.java
index 0d7a57944f12c795144be3eda3afd9e90165d3c5..dbd7fe42493cdddd0283b0538fb333a5d4c01698 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul1D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/IMatMul1D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class IMatMul1D extends Kernel{
    int[] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java b/src/main/java/com/aparapi/examples/mdarray/IMatMul2D.java
similarity index 85%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java
rename to src/main/java/com/aparapi/examples/mdarray/IMatMul2D.java
index 0f23dc8c5d0f0b4861dfc9a5ca2fca966e675ea4..69cf36faad09c060ec2284a795b5f1e4f08513fd 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul2D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/IMatMul2D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class IMatMul2D extends Kernel{
    int[][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java b/src/main/java/com/aparapi/examples/mdarray/IMatMul3D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java
rename to src/main/java/com/aparapi/examples/mdarray/IMatMul3D.java
index 71f83ef8a09293fad8a628b31d6a05d7233b9860..44017bcb3238eb52f310393593d6e2a6dd2af1b1 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/IMatMul3D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/IMatMul3D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class IMatMul3D extends Kernel{
    int[][][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java b/src/main/java/com/aparapi/examples/mdarray/LMatMul1D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java
rename to src/main/java/com/aparapi/examples/mdarray/LMatMul1D.java
index b1e08cb959cc4e4a2cf2a5eb497a4146bbc95fce..7b013f93a001f313aec1eb60710cac8418c1f46e 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul1D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/LMatMul1D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class LMatMul1D extends Kernel{
    long[] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java b/src/main/java/com/aparapi/examples/mdarray/LMatMul2D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java
rename to src/main/java/com/aparapi/examples/mdarray/LMatMul2D.java
index 65d16c4939c4ac5e9e552b076387b23220564513..c541c8e54ccbed0759d09d80ceb0edd98ae4fe39 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul2D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/LMatMul2D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class LMatMul2D extends Kernel{
    long[][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java b/src/main/java/com/aparapi/examples/mdarray/LMatMul3D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java
rename to src/main/java/com/aparapi/examples/mdarray/LMatMul3D.java
index 98c08419c3e426ce2448896626291db3a5cbd30f..b5460e8fc69f9f878d9f1f6f1573f4a8951283f8 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/LMatMul3D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/LMatMul3D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class LMatMul3D extends Kernel{
    long[][][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java b/src/main/java/com/aparapi/examples/mdarray/MDArray.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java
rename to src/main/java/com/aparapi/examples/mdarray/MDArray.java
index 38819b1643d1a1bb569a3814a3af0028e415f08a..ff08012e71e9cc64f8c91fcd2640937f7cd7464f 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/MDArray.java
+++ b/src/main/java/com/aparapi/examples/mdarray/MDArray.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class MDArray {
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java b/src/main/java/com/aparapi/examples/mdarray/SMatMul1D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java
rename to src/main/java/com/aparapi/examples/mdarray/SMatMul1D.java
index 71e4ab4ba7863e4412964a68154e2c86929b91cb..9dfbf46733109b690df20b25a6b6d0de4d98d994 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul1D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/SMatMul1D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class SMatMul1D extends Kernel{
    short[] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java b/src/main/java/com/aparapi/examples/mdarray/SMatMul2D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java
rename to src/main/java/com/aparapi/examples/mdarray/SMatMul2D.java
index 2d46af4f122134da9adcdcbc5a367cb482380f0e..c5e829c85c6a61166eb87ec0329fab97c9ca6726 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul2D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/SMatMul2D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class SMatMul2D extends Kernel{
    short[][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java b/src/main/java/com/aparapi/examples/mdarray/SMatMul3D.java
similarity index 87%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java
rename to src/main/java/com/aparapi/examples/mdarray/SMatMul3D.java
index 8558a669ffda715efd778f3965819e02e231dc7b..8828e5577f5dc016a8ffe4ca9a1ba91c0b2aac92 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/SMatMul3D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/SMatMul3D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class SMatMul3D extends Kernel{
    short[][][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java b/src/main/java/com/aparapi/examples/mdarray/ZMatMul1D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java
rename to src/main/java/com/aparapi/examples/mdarray/ZMatMul1D.java
index f94092547b44b14084494710bed1f20ba0f02434..3f0dd51102086d48381c28462dce7afdf711f060 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul1D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/ZMatMul1D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class ZMatMul1D extends Kernel{
    boolean[] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java b/src/main/java/com/aparapi/examples/mdarray/ZMatMul2D.java
similarity index 86%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java
rename to src/main/java/com/aparapi/examples/mdarray/ZMatMul2D.java
index 0ddd5913abd735f2b698f5ebe81df4c916abc62d..b60a4fc92ba105bef9e10884071302ac9fabbb89 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul2D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/ZMatMul2D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class ZMatMul2D extends Kernel{
    boolean[][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java b/src/main/java/com/aparapi/examples/mdarray/ZMatMul3D.java
similarity index 87%
rename from src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java
rename to src/main/java/com/aparapi/examples/mdarray/ZMatMul3D.java
index d0a0940f2aa104f5b3fe0638230cc5654ccd5b05..5d3f27f15cb41f4f39b21f63bd6fff86faf714ae 100644
--- a/src/main/java/com/syncleus/aparapi/examples/mdarray/ZMatMul3D.java
+++ b/src/main/java/com/aparapi/examples/mdarray/ZMatMul3D.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.mdarray;
+package com.aparapi.examples.mdarray;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class ZMatMul3D extends Kernel{
    boolean[][][] A;
diff --git a/src/main/java/com/syncleus/aparapi/examples/median/MedianDemo.java b/src/main/java/com/aparapi/examples/median/MedianDemo.java
similarity index 83%
rename from src/main/java/com/syncleus/aparapi/examples/median/MedianDemo.java
rename to src/main/java/com/aparapi/examples/median/MedianDemo.java
index bbff9bbdfbc1007d0c67aa191481238db01de945..230815ac84bf8151e2829a4220ef0b62007884ad 100644
--- a/src/main/java/com/syncleus/aparapi/examples/median/MedianDemo.java
+++ b/src/main/java/com/aparapi/examples/median/MedianDemo.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.median;
+package com.aparapi.examples.median;
 
-import com.syncleus.aparapi.internal.kernel.*;
+import com.aparapi.internal.kernel.*;
 
 import javax.imageio.*;
 import javax.swing.*;
@@ -37,15 +37,15 @@ public class MedianDemo {
 
    public static void main(String[] ignored) {
       final int size = 5;
-      System.setProperty("com.syncleus.aparapi.dumpProfilesOnExit", "true");
+      System.setProperty("com.aparapi.dumpProfilesOnExit", "true");
       boolean verbose = false;
       if (verbose)
       {
-          System.setProperty("com.syncleus.aparapi.enableVerboseJNI", "true");
-          System.setProperty("com.syncleus.aparapi.dumpFlags", "true");
-          System.setProperty("com.syncleus.aparapi.enableShowGeneratedOpenCL", "true");
-          System.setProperty("com.syncleus.aparapi.enableVerboseJNIOpenCLResourceTracking", "true");
-          System.setProperty("com.syncleus.aparapi.enableExecutionModeReporting", "true");
+          System.setProperty("com.aparapi.enableVerboseJNI", "true");
+          System.setProperty("com.aparapi.dumpFlags", "true");
+          System.setProperty("com.aparapi.enableShowGeneratedOpenCL", "true");
+          System.setProperty("com.aparapi.enableVerboseJNIOpenCLResourceTracking", "true");
+          System.setProperty("com.aparapi.enableExecutionModeReporting", "true");
       }
 
 //      KernelManager.setKernelManager(new KernelManager(){
diff --git a/src/main/java/com/syncleus/aparapi/examples/median/MedianKernel7x7.java b/src/main/java/com/aparapi/examples/median/MedianKernel7x7.java
similarity index 95%
rename from src/main/java/com/syncleus/aparapi/examples/median/MedianKernel7x7.java
rename to src/main/java/com/aparapi/examples/median/MedianKernel7x7.java
index 349c2eecda207b2160d704c7b454dbf8af0ae24c..48903ca61cbb031841d8312723782d67e283a2f1 100644
--- a/src/main/java/com/syncleus/aparapi/examples/median/MedianKernel7x7.java
+++ b/src/main/java/com/aparapi/examples/median/MedianKernel7x7.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.median;
+package com.aparapi.examples.median;
 
-import com.syncleus.aparapi.*;
+import com.aparapi.*;
 
 /**
  * Provides support for pixel windows of size no greater than 49 (e.g. 7x7).
diff --git a/src/main/java/com/syncleus/aparapi/examples/median/MedianSettings.java b/src/main/java/com/aparapi/examples/median/MedianSettings.java
similarity index 90%
rename from src/main/java/com/syncleus/aparapi/examples/median/MedianSettings.java
rename to src/main/java/com/aparapi/examples/median/MedianSettings.java
index 76068c4a40e716aa0c017a9ae3b4be7a67f9ff3f..948042de672b30228c4a24790b380d3fe1ee46aa 100644
--- a/src/main/java/com/syncleus/aparapi/examples/median/MedianSettings.java
+++ b/src/main/java/com/aparapi/examples/median/MedianSettings.java
@@ -8,7 +8,7 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.median;
+package com.aparapi.examples.median;
 
 public class MedianSettings {
    public final int windowWidth;
diff --git a/src/main/java/com/syncleus/aparapi/examples/nbody/Local.java b/src/main/java/com/aparapi/examples/nbody/Local.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/nbody/Local.java
rename to src/main/java/com/aparapi/examples/nbody/Local.java
index 9c76bd7def81463b27132947457db240281cc6d9..1b8fccd598d4ab1fc999bb600f8e9c7115955501 100644
--- a/src/main/java/com/syncleus/aparapi/examples/nbody/Local.java
+++ b/src/main/java/com/aparapi/examples/nbody/Local.java
@@ -45,7 +45,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi.examples.nbody;
+package com.aparapi.examples.nbody;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -72,9 +72,9 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.WindowConstants;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.ProfileInfo;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.ProfileInfo;
+import com.aparapi.Range;
 import com.jogamp.opengl.util.FPSAnimator;
 import com.jogamp.opengl.util.texture.Texture;
 import com.jogamp.opengl.util.texture.TextureIO;
@@ -84,7 +84,7 @@ import com.jogamp.opengl.util.texture.TextureIO;
  * 
  * http://www.browndeertechnology.com/docs/BDT_OpenCL_Tutorial_NBody-rev3.html
  * 
- * @see com.syncleus.aparapi.examples.nbody.Main
+ * @see Main
  * 
  * @author gfrost
  *
diff --git a/src/main/java/com/syncleus/aparapi/examples/nbody/Main.java b/src/main/java/com/aparapi/examples/nbody/Main.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/nbody/Main.java
rename to src/main/java/com/aparapi/examples/nbody/Main.java
index 5ca45361460f58a432c70183c03139ea4bdc3147..85e3f8f394894cd5d79d5e49d97d640b2d425b20 100644
--- a/src/main/java/com/syncleus/aparapi/examples/nbody/Main.java
+++ b/src/main/java/com/aparapi/examples/nbody/Main.java
@@ -45,7 +45,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
  */
-package com.syncleus.aparapi.examples.nbody;
+package com.aparapi.examples.nbody;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -73,9 +73,9 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.WindowConstants;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.ProfileInfo;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.ProfileInfo;
+import com.aparapi.Range;
 import com.jogamp.opengl.util.FPSAnimator;
 import com.jogamp.opengl.util.texture.Texture;
 import com.jogamp.opengl.util.texture.TextureData;
diff --git a/src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java b/src/main/java/com/aparapi/examples/nbody/Seq.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java
rename to src/main/java/com/aparapi/examples/nbody/Seq.java
index b2cb25290e0fd00c579d78efe24a6c7e5b0410a6..b5e269e36c23f1427f01cef812849d89ad7f7e6b 100644
--- a/src/main/java/com/syncleus/aparapi/examples/nbody/Seq.java
+++ b/src/main/java/com/aparapi/examples/nbody/Seq.java
@@ -45,7 +45,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
  */
-package com.syncleus.aparapi.examples.nbody;
+package com.aparapi.examples.nbody;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -73,9 +73,9 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.WindowConstants;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.ProfileInfo;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.ProfileInfo;
+import com.aparapi.Range;
 import com.jogamp.opengl.util.FPSAnimator;
 import com.jogamp.opengl.util.texture.Texture;
 import com.jogamp.opengl.util.texture.TextureData;
diff --git a/src/main/java/com/syncleus/aparapi/examples/oopnbody/Body.java b/src/main/java/com/aparapi/examples/oopnbody/Body.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/oopnbody/Body.java
rename to src/main/java/com/aparapi/examples/oopnbody/Body.java
index 36bf2e3108d890f594b8a0343d8223c2e896e5d0..2f2fb9a4c60b646ed68d1f43ce6f87450b808e91 100644
--- a/src/main/java/com/syncleus/aparapi/examples/oopnbody/Body.java
+++ b/src/main/java/com/aparapi/examples/oopnbody/Body.java
@@ -8,7 +8,7 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.oopnbody;
+package com.aparapi.examples.oopnbody;
 
 import java.util.List;
 
diff --git a/src/main/java/com/syncleus/aparapi/examples/oopnbody/Main.java b/src/main/java/com/aparapi/examples/oopnbody/Main.java
similarity index 96%
rename from src/main/java/com/syncleus/aparapi/examples/oopnbody/Main.java
rename to src/main/java/com/aparapi/examples/oopnbody/Main.java
index 7c6b8d486194b04f3b0d089cf6617475aecdf920..2b6d40469123e3c4bb024f965ec08505970a1c14 100644
--- a/src/main/java/com/syncleus/aparapi/examples/oopnbody/Main.java
+++ b/src/main/java/com/aparapi/examples/oopnbody/Main.java
@@ -45,7 +45,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
  */
-package com.syncleus.aparapi.examples.oopnbody;
+package com.aparapi.examples.oopnbody;
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
@@ -75,9 +75,9 @@ import javax.swing.JPanel;
 import javax.swing.JTextField;
 import javax.swing.WindowConstants;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.ProfileInfo;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.ProfileInfo;
+import com.aparapi.Range;
 
 import com.jogamp.opengl.util.FPSAnimator;
 import com.jogamp.opengl.util.texture.Texture;
diff --git a/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java b/src/main/java/com/aparapi/examples/progress/LongRunningKernel.java
similarity index 89%
rename from src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java
rename to src/main/java/com/aparapi/examples/progress/LongRunningKernel.java
index e3799f01c17c6c2309fc74b754d2186a93ff97aa..a510b643378ae3d9f2a81d5c959e39b8b4dd03e7 100644
--- a/src/main/java/com/syncleus/aparapi/examples/progress/LongRunningKernel.java
+++ b/src/main/java/com/aparapi/examples/progress/LongRunningKernel.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.progress;
+package com.aparapi.examples.progress;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 /**
  * Kernel which performs very many meaningless calculations, used to demonstrate progress tracking and cancellation of multi-pass Kernels.
diff --git a/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java b/src/main/java/com/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
similarity index 92%
rename from src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
rename to src/main/java/com/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
index 0cf5ef16fca25074801b8edfc507ef7ee626ca26..87bac2183acf84b578ae2580e39e6cecd67ab916 100644
--- a/src/main/java/com/syncleus/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
+++ b/src/main/java/com/aparapi/examples/progress/MultiPassKernelSwingWorkerDemo.java
@@ -8,11 +8,11 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.progress;
+package com.aparapi.examples.progress;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.util.swing.MultiPassKernelSwingWorker;
+import com.aparapi.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.util.swing.MultiPassKernelSwingWorker;
 
 import javax.swing.*;
 import javax.swing.plaf.nimbus.NimbusLookAndFeel;
diff --git a/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java b/src/main/java/com/aparapi/examples/progress/ProgressAndCancelDemo.java
similarity index 88%
rename from src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java
rename to src/main/java/com/aparapi/examples/progress/ProgressAndCancelDemo.java
index c09c510e146cb6a2df975e3aa8d3547eed16edaf..6dcd759ac5fd245d547ff2452362b517c780f929 100644
--- a/src/main/java/com/syncleus/aparapi/examples/progress/ProgressAndCancelDemo.java
+++ b/src/main/java/com/aparapi/examples/progress/ProgressAndCancelDemo.java
@@ -8,9 +8,9 @@
  * For additional credits (generally to people who reported problems)
  * see CREDITS file.
  */
-package com.syncleus.aparapi.examples.progress;
+package com.aparapi.examples.progress;
 
-import com.syncleus.aparapi.internal.kernel.*;
+import com.aparapi.internal.kernel.*;
 
 import javax.swing.*;
 import javax.swing.plaf.nimbus.*;
@@ -36,11 +36,11 @@ public class ProgressAndCancelDemo {
 
    public static void main(String[] ignored) throws Exception {
 
-      System.setProperty("com.syncleus.aparapi.enableShowGeneratedOpenCL", "true");
-      System.setProperty("com.syncleus.aparapi.enableVerboseJNI", "true");
-      System.setProperty("com.syncleus.aparapi.dumpFlags", "true");
-      System.setProperty("com.syncleus.aparapi.enableVerboseJNIOpenCLResourceTracking", "true");
-      System.setProperty("com.syncleus.aparapi.enableExecutionModeReporting", "true");
+      System.setProperty("com.aparapi.enableShowGeneratedOpenCL", "true");
+      System.setProperty("com.aparapi.enableVerboseJNI", "true");
+      System.setProperty("com.aparapi.dumpFlags", "true");
+      System.setProperty("com.aparapi.enableVerboseJNIOpenCLResourceTracking", "true");
+      System.setProperty("com.aparapi.enableExecutionModeReporting", "true");
 
       kernel = new LongRunningKernel();
       if (TEST_JTP) {
diff --git a/src/main/java/com/syncleus/aparapi/examples/squares/Main.java b/src/main/java/com/aparapi/examples/squares/Main.java
similarity index 95%
rename from src/main/java/com/syncleus/aparapi/examples/squares/Main.java
rename to src/main/java/com/aparapi/examples/squares/Main.java
index 7b8bc2380418004d71ef0ad4b15ba7499ac7e34d..e7f3bf8e78381a0b828e24ad9431a2fa4d7de570 100644
--- a/src/main/java/com/syncleus/aparapi/examples/squares/Main.java
+++ b/src/main/java/com/aparapi/examples/squares/Main.java
@@ -46,10 +46,10 @@ under those regulations, please refer to the U.S. Bureau of Industry and Securit
 
 */
 
-package com.syncleus.aparapi.examples.squares;
+package com.aparapi.examples.squares;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
 
 /**
  * An example Aparapi application which computes and displays squares of a set of 512 input values.
diff --git a/src/main/java/com/syncleus/aparapi/examples/extension/Mandel.java b/src/main/java/com/syncleus/aparapi/examples/extension/Mandel.java
deleted file mode 100644
index 59c29dab6d74967b32a40861ebe1dcc6ce75431a..0000000000000000000000000000000000000000
--- a/src/main/java/com/syncleus/aparapi/examples/extension/Mandel.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * This product currently only contains code developed by authors
- * of specific components, as identified by the source code files.
- *
- * Since product implements StAX API, it has dependencies to StAX API
- * classes.
- *
- * For additional credits (generally to people who reported problems)
- * see CREDITS file.
- */
-package com.syncleus.aparapi.examples.extension;
-
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
-import com.syncleus.aparapi.opencl.OpenCL.*;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.*;
-import java.awt.image.*;
-import java.util.concurrent.*;
-import com.syncleus.aparapi.opencl.OpenCL.Resource;
-
-/**
- * An example Aparapi application which displays a view of the Mandelbrot set and lets the user zoom in to a particular point.
- *
- * When the user clicks on the view, this example application will zoom in to the clicked point and zoom out there after.
- * On GPU, additional computing units will offer a better viewing experience. On the other hand on CPU, this example
- * application might suffer with sub-optimal frame refresh rate as compared to GPU.
- *
- * @author gfrost
- *
- */
-
-@Resource("com/syncleus/aparapi/examples/extension/mandel2.cl")
-public interface Mandel extends OpenCL<com.syncleus.aparapi.examples.extension.Mandel>{
-   com.syncleus.aparapi.examples.extension.Mandel createMandleBrot(//
-                                                                 Range range,//
-                                                                 @Arg("scale") float scale, //
-                                                                 @Arg("offsetx") float offsetx, //
-                                                                 @Arg("offsety") float offsety, //
-                                                                 @GlobalWriteOnly("rgb") int[] rgb);
-}
diff --git a/test/codegen/build.xml b/test/codegen/build.xml
index 88d41a881f64df30d1756b828df81230c0e42a42..350f54b04f3e57190b64ff3458d4fccd15629745 100644
--- a/test/codegen/build.xml
+++ b/test/codegen/build.xml
@@ -44,7 +44,7 @@
 	</target>
 
 	<path id="classpath">
-		<pathelement path="${basedir}/../../com.syncleus.aparapi/dist/aparapi.jar" />
+		<pathelement path="${basedir}/../../com.aparapi/dist/aparapi.jar" />
 		<pathelement path="${junit.home}/${junit.jar.name}" />
 		<pathelement path="classes" />
 	</path>
@@ -56,7 +56,7 @@
 			<compilerarg value="-Xlint:-path" />
 		</javac>
 
-		<java classname="com.syncleus.aparapi.CreateJUnitTests" classpathref="classpath">
+		<java classname="com.aparapi.CreateJUnitTests" classpathref="classpath">
 			<sysproperty key="root" value="${basedir}" />
 		</java>
 
diff --git a/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java b/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java
index 6e02f730aff85def091b55ec9a8ee4556ad711e5..746b6da74b495c2c8b8360114845726709d12c21 100644
--- a/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java
+++ b/test/codegen/src/java/com/amd/aparapi/CodeGenJUnitBase.java
@@ -35,17 +35,17 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi;
+package com.aparapi;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 import java.util.Arrays;
 
-import com.syncleus.aparapi.internal.exception.AparapiException;
-import com.syncleus.aparapi.internal.model.ClassModel;
-import com.syncleus.aparapi.internal.model.Entrypoint;
-import com.syncleus.aparapi.internal.writer.KernelWriter;
+import com.aparapi.internal.exception.AparapiException;
+import com.aparapi.internal.model.ClassModel;
+import com.aparapi.internal.model.Entrypoint;
+import com.aparapi.internal.writer.KernelWriter;
 
 public class CodeGenJUnitBase {
 
diff --git a/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java b/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java
index 874b0cf87ac2781d98c52f4eed2155d21c8433d9..e75c22c9e3427fa5a2244a697c416b2329ba610c 100644
--- a/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java
+++ b/test/codegen/src/java/com/amd/aparapi/CreateJUnitTests.java
@@ -35,7 +35,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi;
+package com.aparapi;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -78,7 +78,7 @@ public class CreateJUnitTests {
          Source source = new Source(Class.forName(testPackageName + "." + className), sourceDir);
 
          StringBuilder sb = new StringBuilder();
-         sb.append("package com.syncleus.aparapi.test.junit.codegen;\n");
+         sb.append("package com.aparapi.test.junit.codegen;\n");
          sb.append("import org.junit.Test;\n");
          String doc = source.getDocString();
          if (doc.length() > 0) {
@@ -86,7 +86,7 @@ public class CreateJUnitTests {
             sb.append(doc);
             sb.append("\n */\n");
          }
-         sb.append("public class " + className + " extends com.syncleus.aparapi.CodeGenJUnitBase{\n");
+         sb.append("public class " + className + " extends com.aparapi.CodeGenJUnitBase{\n");
          appendExpectedOpenCL(source, sb);
          appendExpectedExceptions(source, sb);
          appendTest(testPackageName, className, "", sb);
@@ -112,12 +112,12 @@ public class CreateJUnitTests {
    private static void appendExpectedExceptions(Source source, StringBuilder sb) {
       String exceptions = source.getExceptionsString();
       if (exceptions.length() > 0) {
-         sb.append("   private static final Class<? extends com.syncleus.aparapi.internal.exception.AparapiException> expectedException = ");
+         sb.append("   private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = ");
 
-         sb.append("com.syncleus.aparapi.internal.exception." + exceptions + ".class");
+         sb.append("com.aparapi.internal.exception." + exceptions + ".class");
          sb.append(";\n");
       } else {
-         sb.append("   private static final Class<? extends com.syncleus.aparapi.internal.exception.AparapiException> expectedException = null;\n");
+         sb.append("   private static final Class<? extends com.aparapi.internal.exception.AparapiException> expectedException = null;\n");
       }
    }
 
diff --git a/test/codegen/src/java/com/amd/aparapi/Diff.java b/test/codegen/src/java/com/amd/aparapi/Diff.java
index 60b1624668cdd365eb5097401323561807c7d3c1..97d80166140c52ca7c4107f270ae22305b4c7d93 100644
--- a/test/codegen/src/java/com/amd/aparapi/Diff.java
+++ b/test/codegen/src/java/com/amd/aparapi/Diff.java
@@ -35,7 +35,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi;
+package com.aparapi;
 
 import java.awt.Point;
 import java.util.ArrayList;
diff --git a/test/codegen/src/java/com/amd/aparapi/KernelHelper.java b/test/codegen/src/java/com/amd/aparapi/KernelHelper.java
index 8ee40096ac82b2512c3813a809471ff744f766c6..e12b78e7cad6081aaec17ef6713552e0da65816b 100644
--- a/test/codegen/src/java/com/amd/aparapi/KernelHelper.java
+++ b/test/codegen/src/java/com/amd/aparapi/KernelHelper.java
@@ -35,10 +35,10 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi;
+package com.aparapi;
 
 // contains some things that only tests would use
-// but in the com.syncleus.aparapi package for convenience
+// but in the com.aparapi package for convenience
 
 public class KernelHelper{
    //   public KernelHelper(Kernel kernel) {
diff --git a/test/codegen/src/java/com/amd/aparapi/Source.java b/test/codegen/src/java/com/amd/aparapi/Source.java
index 379c5eab81799d070ba78db8fbddd3734c140589..0c8a74a532af090862230b66f83e627a723d18d3 100644
--- a/test/codegen/src/java/com/amd/aparapi/Source.java
+++ b/test/codegen/src/java/com/amd/aparapi/Source.java
@@ -35,7 +35,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi;
+package com.aparapi;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/test/codegen/src/java/com/amd/aparapi/SwingDiff.java b/test/codegen/src/java/com/amd/aparapi/SwingDiff.java
index dbc16ad05a562af0ef17d0d76a12a7abc6a3168f..25f069b95bae0951b241897792c25f582a84f9e5 100644
--- a/test/codegen/src/java/com/amd/aparapi/SwingDiff.java
+++ b/test/codegen/src/java/com/amd/aparapi/SwingDiff.java
@@ -35,7 +35,7 @@ of EAR).  For the most current Country Group listings, or for additional informa
 under those regulations, please refer to the U.S. Bureau of Industry and Security's website at http://www.bis.doc.gov/. 
 
 */
-package com.syncleus.aparapi;
+package com.aparapi;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -61,7 +61,7 @@ import javax.swing.text.Style;
 import javax.swing.text.StyleConstants;
 import javax.swing.text.StyleContext;
 
-import com.syncleus.aparapi.Diff.DiffResult;
+import com.aparapi.Diff.DiffResult;
 
 public class SwingDiff{
    JFrame frame;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java
index 4b7e219934a61be78f2281e492a73c596c2c14bd..1620ae4580bf5bddcacfbb4e0c807ca9194bc514 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Access2DIntArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Access2DIntArray{
    int[][] ints = new int[1024][];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java
index 1032e15d24bf775d44f96c05396551f6d0e0025a..64092be0d2ef401480491336b0e17ecfad59635d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AccessBooleanArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AccessBooleanArray{
    boolean[] ba = new boolean[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java
index f29fa8e2b1f8ec3792d39cb2563dab9228d3081d..8f843e169a518f962c8cfc350374907ddb07d7a7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AccessByteArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 /**
  * 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java
index 2298fb216dd71372509ecc144fae97227a504d8e..609ac21358661358dfcebade6be70d371436579e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AccessDoubleArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AccessDoubleArray{
    double[] doubles = new double[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java
index 5b7eb1736e7b952f75574300b4c39778f541a57c..95242fcd25fc22eb639d2242a5ee70be6d1e1d48 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AccessFloatArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AccessFloatArray{
    float[] floats = new float[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java
index 699854101a83caa6aaeee38e490428ddde23dbc6..27d2e66434d5e8056b8b49cb38f5ac71fa10d0fb 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AccessIntArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AccessIntArray{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java
index 1adbcb2ad3a86db13a04f5340c202abf05cd9328..3c4941e423ef32127ba2bc6e470776d3552b82c7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AccessLongArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AccessLongArray{
    long[] longs = new long[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java
index 39a985af6896d24b88e1d66a9ff8be4a4b1d5ac3..79b70e18a9c195bd8826b859e5fde43157458eb5 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AccessNested2DIntArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AccessNested2DIntArray{
    int[] indices = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java b/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java
index 407cfa08a8100428ca2a13bb302bd10cd3b9764d..5c11192ad59ef3002a1c983b967aa738295c2b86 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AccessShortArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AccessShortArray{
    short[] shorts = new short[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java
index d6cfe000d530e617e46df8cd48efddcc722177b2..237dff87a2b7a4b51ee34632d8b0cdda12b6e82f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AndOrAndPrecedence.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AndOrAndPrecedence{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java
index b82ff1e1d45d6279a36a1f55fbaa4e953084ceef..037b5c418269cc091010ac153df56ef32fde964d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AndOrPrecedence{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java
index 4a0236120c66c668f58ea9d6ff308e1ae8885484..4818974fae0b9663ca5c4b2852222c31eb243ebb 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AndOrPrecedence2.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AndOrPrecedence2{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java
index 99b800c8255679bee54d65b30263ab7be0b47791..ab0e684c6f53bc6a7c250f92df4b232d6dcea4a4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ArbitraryScope{
    int width = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java
index 458f7f2300426941c24a8a6202c1509c605a49a8..78d9fa409eed3eb3b2bcc6fc4d28f199daf7092c 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScope2.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ArbitraryScope2{
    int width = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java
index 33d93d491561b2620359990f30a3a42d41e93ef9..9a411251cfdf2f632789a4d407dd913e5dbd7c4a 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ArbitraryScopeSimple.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ArbitraryScopeSimple{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java b/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java
index efa395c24a94bf0d492322e719237dd5cfd75328..3eadf9dfdb11b38cd03ef54764570b68e91f5596 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ArrayTortureIssue35.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ArrayTortureIssue35{
    int[] a = new int[1];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java b/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java
index 2d181751f8c1d2d511443e9aa459025c61714c4a..e284483f66439e9675bdcede43d2294a089d4513 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Assign2DIntArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Assign2DIntArray{
    int[][] ints = new int[1024][];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java
index 94aa6e1e22c36af86a9bc37178442328337a1b88..7ba26604880b7196be3a8480870320da6bf273a7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameter.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AssignAndPassAsParameter{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java
index 9c661c1bf07e00a12786808485d139f9285dde9c..c7cfc093d18781b462c05195b164799f35a1ba7d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AssignAndPassAsParameterSimple.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AssignAndPassAsParameterSimple{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/AssignField.java b/test/codegen/src/java/com/amd/aparapi/test/AssignField.java
index 445b174e547efc844453def1850b254d4e813ed6..015bb21e6ff4a4b3d516edcb6cae06a5356b4e7c 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/AssignField.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/AssignField.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class AssignField{
    int field = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java b/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java
index c46ad1b96a6b16b9e9a21ea78ce08cc13a31dd4b..e8961c33ce1ca9918bbd8176925fc2ec0b4d62e9 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Atomic32Pragma.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class Atomic32Pragma extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java b/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java
index 586b39310bbafa46320bd54e5f1dfa33ca2aebf5..433bc7366bb6d6cbc90c57d69f11564947158b70 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/BooleanToggle.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class BooleanToggle{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Break.java b/test/codegen/src/java/com/amd/aparapi/test/Break.java
index 0e247b49a5a5ecd76f230faeadd290e57f3db43b..9f1d89211abda32e4c0c18b4d86070d42b2d6ea8 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Break.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Break.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Break{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java b/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java
index dd9eb4d97306046510463ea5a7e6ca7deb76b48c..d74806660f9ada2898de6570ababd18b37f6023b 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ByteParams.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ByteParams{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java
index c840e320c063f4a0882af1e1920da72cf24438a9..ecff6f21e550c4763cd7715338efe77a1b936eda 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ByteParamsSimple.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ByteParamsSimple{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java b/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java
index 78a26bc682695832e426156ca79595f5d92d7ed6..d78406bc98d6a37761e5a6d697dbc10f5167b833 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallGetPassId.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class CallGetPassId extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallObject.java b/test/codegen/src/java/com/amd/aparapi/test/CallObject.java
index 4108e2699f70afc268e2dd0a4f2b19ab6b90124b..563ab66c05d66b33bbc76b173d486b5dde2e0ab9 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CallObject.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallObject.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class CallObject extends Kernel{
    static class Dummy{
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java b/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
index 6074f7ea2a829a8ba2c359695e5f5dbc33d4ef51..44dbac58419bb337eb59858157b669b78d0b69f4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallObjectStatic.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class CallObjectStatic extends Kernel{
    static class Dummy{
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java b/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java
index 5ca25a03bccd0d8236ec10c94571d42f2dffb4c9..5e1da01d78964651378ca7a0823f8f1f77fae8eb 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallRunSuper.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class CallRunSuperBase extends Kernel{
    @Override public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java b/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java
index 038dbe8c2e5305df41627398e2b807bbf374cfcd..d4763de9345cf92223faae817b48bb59ffc97be6 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallStaticInAnotherClass.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class AnotherClass{
    static public int foo() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java b/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java
index ee2fd2ada256ff7f3c0e939c45f12439535513ba..f744311c74057e32e3779e2342156fb6702914b7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallSuper.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 abstract class CallSuperBase extends Kernel{
    int foo(int n) {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java b/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java
index f08cc733f3c434ba7062fc9e093e4ac732cb5b3a..5f1f759bd842389a1e1e2bc50f07806b70af8c53 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CallTwice.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class CallTwice extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java b/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java
index 971cd0fa2861ce6570b53d417a15c2e82b473501..2accdc8062892cefeee2a691a95f8abadf4db2e3 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CharArrayField.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class CharArrayField{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java
index a16c905c450db175e7d60873ec0875aeeaaf7e3f..1f9941331fe6885f91a27422630f5820b57143d6 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CharAsParameter.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class CharAsParameter{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CharType.java b/test/codegen/src/java/com/amd/aparapi/test/CharType.java
index fbe9eed6af33d0d7f70db478bbe7c93ae68ae7d1..c4b6004e12b6c53fc2ccc3c33805c6e0362ecb74 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CharType.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CharType.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class CharType extends Kernel{
    @Override public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java
index 715cc0c25db85b2eaec553cbbf5a9a44474ac8fb..1b2d2034e07583aae496cf2b54d56cf93509f307 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticFieldAccess.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ClassHasStaticFieldAccess{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java
index 9c86797c7e7f974f98854b76719e958648863748..eac1c18fc7868e35bbe3a24306137b48f203517f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethod.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ClassHasStaticMethod{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java
index 27393870db83b08c103772980d9538c5dd5ea9be..f66fec5aa6af162f1fac793e667c2b0407b77a95 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ClassHasStaticMethodSimple.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ClassHasStaticMethodSimple{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java b/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java
index 3047f29458174c53b413865f93d02656ce3d8f2d..fa09371a13eb8b1d1b104c64d29e7873063867a7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/CompositeArbitraryScope.java
@@ -1,9 +1,9 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 // this example gave the following error:
-/// com.syncleus.aparapi.classtools.writer.CodeGenException: composite COMPOSITE_ARBITRARY_SCOPE
+/// com.aparapi.classtools.writer.CodeGenException: composite COMPOSITE_ARBITRARY_SCOPE
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class CompositeArbitraryScope extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java b/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java
index b155a01f39a77f5a902ec10adf7cfe9399bbe5ec..51fcfe8ff1a873394f40a296cab0bb4a5589a452 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ConstantAssignInExpression.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ConstantAssignInExpression{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Continue.java b/test/codegen/src/java/com/amd/aparapi/test/Continue.java
index e997360a5cebc2fb3785a58f80e91b2815b014c3..81412370bc821fe1e2e3579fbaea607da45691e9 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Continue.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Continue.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Continue{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java b/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java
index adbe38e4a2efb7c796a661b17e4e23a2df10624d..d562bce62fa5fce2bb067669ddf4cf70d2bf8162 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ContinueTorture.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ContinueTorture{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java
index a0014dd1cb8c6e87b228d352c9e7ba0a21d5bc3c..c89589aa0f228fa51807270eb062de821ce2f958 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/DirectRecursion.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class DirectRecursion extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java b/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java
index 8c54fb1d42e6cf88888cbe0d1ca0dc51c94277b6..b4421b9171ef5880100f9e43f81ae3f0b608758c 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/DoWhile.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class DoWhile{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Drem.java b/test/codegen/src/java/com/amd/aparapi/test/Drem.java
index 21318280a268038d556bdd172f80107ee83ea298..dc71c046374702328cb5d4d04a419f462cdef5d4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Drem.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Drem.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Drem{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java b/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java
index aeb37123d3a439ee580f0811101ddcc6117ca372..ba4e1dc01639205d93c6a1271cd3f31bbbdaecc7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/EarlyReturn.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class EarlyReturn{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java b/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java
index 458f8a6f3eac73f6cff1f817432b6abdd16babe0..22e6819f4e039fbaf0ac3e198abe0b6cbecb6352 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/EmptyWhileWithInc.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class EmptyWhileWithInc{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java
index dee44b579d40ad582daa0ddbe39e69b181a6ee63..e506463ca7415b3d7fa9cd7a58986dc31b9e5016 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/EntrypointRecursion.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class EntrypointRecursion extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Ex.java b/test/codegen/src/java/com/amd/aparapi/test/Ex.java
index 0da21bc5d3d895538ff4b31c9a82640ce1a0adc3..f40dad41a3e6d0339bf809f1f2b421a26a3f5812 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Ex.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Ex.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Ex{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java
index 78a26726362a9da890a6747d80b080b400c8ef0c..1f40cb4c3f2f2be467bbf8d07cd4748cea5ffc3d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class FirstAssignInExpression{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java
index 0c03c848a59c97b26999da8192440dd7473024e6..ce3ed6cc56cd629af905f6bf291071064503cd74 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/FirstAssignInExpression2.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class FirstAssignInExpression2{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java b/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java
index 2f02a3344595f469db0135c047470b0150f20aea..308ea0501637c761ae97d6fd86b38657c0b6b117 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/FloatParams.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class FloatParams{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java
index 561272f40c138569dab1ec10d7bb1b33cae0f3a2..c032eae029d42b906738e882e010713ae6457f40 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/FloatParamsSimple.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class FloatParamsSimple{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/For.java b/test/codegen/src/java/com/amd/aparapi/test/For.java
index cfb31e332bc2e306c5bed6d8726cc39136e60f39..5a5d0002b11257de24d51aced1bfec85afb299db 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/For.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/For.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class For{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java b/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java
index 44278b1a60474f2cb0b4e1efc8ca7b90c802a6dc..dc1d306769be29bbbfb900a2bb39b494642245aa 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java
index 3f7c3254d7b2d4bc8b718ba01ec8d13d7e20d8d9..c845107259649c1d680443a4a6367d3ee801c90d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandel.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForAndMandel{
    int width = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java
index d4b63f9e946139275540019b57c81cae31216be1..179bf51d3f035407361e40291d1a6195deedf6d6 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForAndMandelNoInitialize.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForAndMandelNoInitialize{
    int width = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java b/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java
index ec13ed5e0c9795c3847f172ba51c318d8f35c26e..1e0dd6e4d0b06854183bf9a887eec4981e44a22f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForAsFirst.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForAsFirst{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java b/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java
index 18620ad9a76e92f60548ba035f5ff00e6da599de..14be5b3ad69de71ad5c0b861d9f583cd99eb518d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForBooleanToggle.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForBooleanToggle{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java b/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java
index 0f729f238e1001af68abf8f9d5cc7ab4fb0e7854..d89d71a214fdcc358bee191ef91dfa3f4f605775 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForBreak.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForBreak{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForEach.java b/test/codegen/src/java/com/amd/aparapi/test/ForEach.java
index aac4887e3de39ff6009c17066b903d0ef747794f..a84a78bca4e69820f077ded30666a9a972dfa80b 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForEach.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForEach.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForEach{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForIf.java b/test/codegen/src/java/com/amd/aparapi/test/ForIf.java
index 41d417112550dd828ec2466d674e64f779cb32b4..75f41172a5506a5b3d5bd19e21616621a6434adb 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForIf.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForIf.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForIf{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java b/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java
index f31e132b60d3b667654f8094105176af64172139..894bca83856df398f5da9ae0bd420530ca06af62 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ForIfMandel.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ForIfMandel{
    int width = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Frem.java b/test/codegen/src/java/com/amd/aparapi/test/Frem.java
index d2a7c0de5e2677169d942de1a44a99734e4421c3..c7a03284895e31d18ca53c276d54033980a73e9b 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Frem.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Frem.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Frem{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java
index e5fd68aa0e362484d1e1a2d634c753113984fd07..e410f0d2379ef830b8c34f375b4c33d70a07d1b8 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderDouble.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class IEEERemainderDouble extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java
index 0cbe702afca637c0aa73b2d721ee841ab82d6de7..4f77849beb196cffbe421b9f09c59eddf7d70b3d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IEEERemainderFloat.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class IEEERemainderFloat extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If.java b/test/codegen/src/java/com/amd/aparapi/test/If.java
index e40d516822583434e8cd2e7e3ca8ec2cfb25b934..752e3b8e847183764d6b8c71bd1b53496b0b08b7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java
index 9bb079721c8fbde5d2a6da5bfbb083545b159de5..0348095e6ad8898bf22ec5a2e8b336d4c5bf2d8b 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java
index 9001ef9bf0a4565c8fc00f24000fcd8ac5bc9ae6..093b91f96f2b2edc9077a4b57526e309333a421f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfAndAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfAndAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java
index 8d806d64c9bf639585f6866c4582a151277ec27b..a517357deb7bb0a7f843e4c19426a9942d671542 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfAndAndAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfAndAndAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java
index 5ab566cfe2482130a0ca3bddd66e9ca033801ce3..e9935cb125d2893f4d0d847c5e76ee545c10b14e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfAndOrAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfAndOrAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java
index 27d5b2ca12005dfd094217edd3a2a7bfbefd7583..8c47ed3259c3400a7593128409621ca3ef2b6dd8 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfBooleanAndAndAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java
index 6e5b45ede651762d686253962866f52d6af4f9ab..d599f136157b28bf48909b99cfa9465063a4e98b 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndAndOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfBooleanAndAndOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java
index 9bcf2b478ae33af5de84ced78bae933e0c387399..bf23115a47834c234aca842c8d632510a25323f0 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfBooleanAndOrAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java
index e7d4a907bc64b4d01569039623ed432ec9e38fff..c50999650a24ede5cfa2b33faf1f7530ab3c73e5 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanAndOrOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfBooleanAndOrOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java
index 57d8caf38ae83498480a36a3b1823c3cd3d462eb..379d978b74423e4166e7fa54f1f429246ce29a2e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfBooleanOrAndAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java
index 20f21de6cf3153fe1eb9cdd0fdbfb8219e968861..fcfa06fbc34ab48d803a8a6ca03e3e94efef5869 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrAndOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfBooleanOrAndOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java
index fecb00b41ce86f69cf91c3e8c179f93fd3850a54..f08acea6a44c302665f844c037fc1ad0e25bfe84 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfBooleanOrOrAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java
index 280cac6d564040a9e4aeaeebc679bcc707d1a9bc..08d39929d02d328fbf54d86b537d35d99488bdf1 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfBooleanOrOrOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfBooleanOrOrOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse.java
index 3d10170cf3d40929a9475b3206faaf578052e65e..8b32a20fbf97c6ec59df3ee91efe79096af6a981 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElse.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElse.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElse{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java
index 3cfdc736fc7a9e73f09f9b2aa0ac2d68957fd816..9a4da81754fa101d7e4d0045c81302df38167116 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElseAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java
index c9fda1a9f41b216066014c9f0ee1793ffd0f1a49..d72e5f03ccd43e8e00a836f3aeb90de754c7ba63 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseAndAndAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElseAndAndAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java
index b86ccb470ea70466963de5d0c5cc705333d5a959..354706d663abd695f7c26248feb6b9008ee4cc1d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseIfElseIfElse.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElseIfElseIfElse{
    /*
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java
index eb3ca863b210196bab775f9b89b2321d19f78510..14b58b6e0ad3de31f2fcdcbea29e5ed41739a0a6 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseNot__OrOr_And_.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElseNot__OrOr_And_{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java
index 69f3b55822183e8c267c6e14384bbe22a4cb8973..ceccfbfa793e83404b93d8363402c70434fab2da 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElseOrOrAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java
index ee108e25b61a7c9cd2a455511cf9576532819e02..51d46360edb855ef6ba2c4ecdcadd8b6d7bd9d5f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElseOrOrOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElseOrOrOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java
index c76aa16057273bfda104d5cff9c049eda5ce49ee..6ea9e269d2f85967b5c11989ea5814830b34a36d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElse_And_Or_And.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElse_And_Or_And{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java
index df3426415e9dc7b2737a189242c2c87d36249308..2f63e57f6f4d51b4b8a965cf9826d3242dcabb3e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElse_OrOr_And.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElse_OrOr_And{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java b/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java
index 3a151cdf45ba7dd8fde64b70dad7f41980519d2e..0f8b1dd87f820b1ecb10fe06a8695dfb5866b248 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfElse_Or_And_Or.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfElse_Or_And_Or{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOr.java
index 510552736a13b4baea1c762d234a3b4e87e576fb..13f97d7e4ad76fc3a77c016a4ddd364e500d7d07 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java
index 550e1f95af31e30ff611d08a72641771fdb7879b..52f59e946b05639a8f9bad7c0057f6275220e62c 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfOrAndOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfOrAndOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java
index d7e73fa75164cda25125a0b9f2c5e14ee0430300..203a328eb91692fe0cea5ad89293eaf9a735b750 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfOrOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfOrOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java
index 54e5cc605fe9dbaa0b694d150ce1fdc5f2370534..cef7db132c2aecec5c1662899de229aabd66718a 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfOrOrAnd{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java
index 194defeb3ab4a93e4dfad934d404e36491f62934..e288b4cae4756922141c17cf2cfcee1ea3fa4bdf 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IfOrOrOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IfOrOrOr{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java
index b558f4ea36027e2c37fc2220a79e8e2cd28b82ec..ec7a9fa4122dc8b40eefa063351fc221df2f09f4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_IfElseIfElseElse_Else.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_IfElseIfElseElse_Else{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java
index 0a9cb86bac440f6d5a8bb2976ee2fc28cd0e2504..4f9fa38d4acd9f5bf7b73a2d53e59a0892a2c53b 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_IfElse_Else{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java
index 6ec9dd1f637a1fdb07392d63defcc8faffa62d68..90cb6461d4dd98055dc9f22a54f7832db7753afe 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_IfElse_Else_IfElse_.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_IfElse_Else_IfElse_{
    /*
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java
index 0770db0a0a8f61ca1eaee0858ab12dcaa2a326b7..2c692f9bce553995a33f4dfddfd8c8a9b797c132 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_If_Else{
    /*
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java
index 49f8bf45c1ae938bde1140e6dd9f4011d2a25a73..b107d347bd3111a365e155642fb655d1e9b70a27 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else2.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_If_Else2{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java
index 3ea6b21a0ddb334e39f16e45facffe332f4a1c4f..447b9a73b0ad60b9040d20b0e91949c4018199f3 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_If_Else_If_.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_If_Else_If_{
    /*
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java b/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java
index ce9210bdb92f68f2c8b88dc721b75103ddbdfea2..26bc03af389ceae1b584dfd066517dd9a5b703df 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_OrOr_And.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_OrOr_And{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java
index a766c76dd2456c74b866fa28ac5dc5f96217398e..c5ae2488ce77b5af1eace0e4e8e478056ed1881f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_While_Else{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java
index 6bb02914497407f2a0e54a0f6b7d59203388783c..d3422e03fea64f7322a471bd1eaa1dba33403ce4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/If_While_Else_While.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class If_While_Else_While{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java b/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java
index b6efc40eec3cebe2ca92eacfcaf3f3eb5452ddc1..f9c709d8b2f4cb1fde583ab190c94cd2e7184a2a 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ImplementsInterface.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 interface IFoo{
    public int bar(int n);
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java b/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java
index 41ff198a7affd66946aad14d80db619775578d41..5edca7d5f0648100cdb3ead0f011404ceab17a13 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IncArrayArgContent.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IncArrayArgContent{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IncField.java b/test/codegen/src/java/com/amd/aparapi/test/IncField.java
index 31655b597d22544c19e356ce555f2d0aca2042f6..989116116aa11317826f3390c54c4d56cdee7c08 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IncField.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IncField.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class IncField{
    int field = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java b/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java
index 3d09d5686d10391da7fd359609fe295c3538d301..237490a8dadc0715fd84bc84cdec8b0e30358df9 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/IndirectRecursion.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class IndirectRecursion extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Interface.java b/test/codegen/src/java/com/amd/aparapi/test/Interface.java
index e94857c89599937d4af23b678918bdd77e671678..5b2df20f68eb574d609d112a3615e267503be6b5 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Interface.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Interface.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Interface{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java b/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java
index e4f75bb890e0b1c0fc66f5b1d678003c9fa098e2..4e44cd5a832e9b2fe52ef4e76e51c930061cc177 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/LongCompare.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class LongCompare extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java b/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java
index 676c284f294e4259c22c54658dad83fea1a2a2e9..dd588f556eca361e253e0ab4f9aed1fd78b14518 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/LongCompares.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class LongCompares{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Loops.java b/test/codegen/src/java/com/amd/aparapi/test/Loops.java
index ea65c717d74125871a882b481a34b6f5055275e2..ab2675dbf94ece4b0634e66b7223a84120dee8f9 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Loops.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Loops.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Loops{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java b/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java
index 5c2c66685ca126a4594ece6ee5d5ee92c3a0b132..3e2d4b305d25afd9734c1b97ff0b1a0137280f0e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MathAbs.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class MathAbs extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java b/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java
index e9ccce4712253450450a0a367a2b872e75c13a84..fcaf819f1d8f34339e6d499bc658c4f869c96a99 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MathDegRad.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class MathDegRad extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java b/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java
index d6834fcfdbc8414dd1871c55fb17c94bee4aba89..0fa5ddd7ab294f5a78189d250552979270f820f4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MathFallThru.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class MathFallThru extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathMax.java b/test/codegen/src/java/com/amd/aparapi/test/MathMax.java
index f80f227142204b65cba8509deff8ec224fc62997..46f5f10d4048b332fb4bc9cab9fddfb6dd2cc8d4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MathMax.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MathMax.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class MathMax extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathMin.java b/test/codegen/src/java/com/amd/aparapi/test/MathMin.java
index 675daf88c3a9d9778baf7baeb251722081b573c1..1ea619c014578015d4dd0b7a1f4a0f793496e7bd 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MathMin.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MathMin.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class MathMin extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java b/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java
index cd28d818835dc5c21155f25b0e75d76163c9bb71..5dd8651225e895a9100e5fd0959e9012720a014a 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MathRemainder.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class MathRemainder extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java b/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java
index ba0a6a3fd32cdcc0a94e7b20c1a482d911e8c04b..2985221f64948ef44798eabe91226331bbaea193 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MultiContinue.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class MultiContinue{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java
index effa7c149323c5e72cdfb1657f32352740f0a27d..e1c42284d573a47d9657b4837a588abac9acf398 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssign.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class MultipleAssign{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java
index 08534fd5849c6806e1e1dbde6e19644e7328284b..205d5a74043882e94a3833c2041e706d05069a36 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/MultipleAssignExpr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class MultipleAssignExpr{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/NaN.java b/test/codegen/src/java/com/amd/aparapi/test/NaN.java
index cc7c2eb2ce73c74ab071b6da13e88ece29290809..628d5689bd3210adf7eb9e062e19110926077056 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/NaN.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/NaN.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class NaN extends Kernel{
    @Override public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java b/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java
index c61b426720e55ebf94e7bd926470fab127245b5f..f7b30a5268019c00ebb25a70893879b9eb04d525 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/NewLocalArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class NewLocalArray{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java b/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java
index e8296d73aaf7dd13f54c7b4616fed2d9fc68e4e6..939788b5d19567c2aa4db58bfa7ae546e60e5e82 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/NonNullCheck.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class NonNullCheck{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java b/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java
index 8a6970a10f993b47eacfa00ab140cc3419494f48..6fdf348328d1538f5c21469a32f3dbea941c34d7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/NullCheck.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class NullCheck{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java
index 4e14321f42f29748d00dc437cf0b43b3ae441c08..d1a7146173b05433b1b1bf8cf39b5adea7fd5b4d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCallHierarchy.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectArrayCallHierarchy extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java
index 8ff25588175ee5f8e317f95e2838347d865c8da6..5adf7e6719b22d4f1ed14e300b0a77bdbd4c501c 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayCommonSuper.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectArrayCommonSuper extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java
index b09a9a47bee4adfbbb69ec1b393e1ec3b22559a1..968ab6a21f65f0887f6e354fd7a267e451d9f022 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberAccess.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectArrayMemberAccess extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java
index c7824a3e3e56b5dd273d91fed0656974a23c6d18..5e5959618cdb029a7938dd7984bda00c3ae73f60 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadGetter.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectArrayMemberBadGetter extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java
index dc2aab960d0f1c0d33abf3660a33beaad1b7ee16..ddccc4c1f97c7ef1e76fe7f5b016f426f78be796 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberBadSetter.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectArrayMemberBadSetter extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java
index f705de5c3c60cae55055b781f3e10f8b055b3923..65ccd3dccedaa0460562ee6b0c226a1e082f4d32 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberCall.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectArrayMemberCall extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java
index 9a0f99d64bf97fe5d20ad51912476516aafac0c1..6e6593ddcf60ee31813523de16f5e88577b2cc82 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberGetterSetter.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 final class DummyOOA{
    int mem;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java
index 1e55d305caa364629f7a88aebe01c882f4c27e5c..d4538a545ea05ffaa82b1b82a3c4ff31631e2886 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberHierarchy.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectArrayMemberHierarchy extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java
index 51ee65cc8e6e0a035cce993346081fbe77a3ed6f..ea79772ec06d5fcfded0145cec1bab90ae84d3ea 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectArrayMemberNotFinal.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class DummyOOANF{
    int mem;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java
index 8a79f1fd32940478021475457d4b70226a8dbe7b..68fe61ce8148c6e7c14a4c9d491c85300814a196 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectRefCopy.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectRefCopy extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java b/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java
index 906adf62915339b9594f4813e2ce82626ab24f95..049b7fe35d83dd69f1b96d77447c9ffaf4871b83 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ObjectWithinObject.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class ObjectWithinObject extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java b/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java
index 72b3b5c992367e00344b98578dfbab1ef6205591..bbe9ef9666d5ca1950bc2b9389f83dd65993e61b 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/OrAndOrPrecedence.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class OrAndOrPrecedence{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java b/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java
index 94b925ea416c594a069511e3b189e6d08a4a163a..962f5c6fcb952dc0944c6d2ba8ca85039f4ffe48 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/OverloadMethod.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class OverloadMethod extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java b/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java
index 1c6ee6c9709881a6c6644eda6ec60424fdf2ddac..7668e8a410bc85827a001b5a79b93d252f87c470 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/OverriddenKernelField.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 class OverriddenKernelFieldParent extends Kernel{
    int out[] = new int[1];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java b/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java
index 06d06b06bf9fd66419a605298e4757deffa30fe7..e55b1099e96d59460db3a6d7be3a8153f6a0d6e9 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PlayPen.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PlayPen{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java
index 100d0170186baf56fae3ccf0654d52ee2cfa169d..a06ee3306a55cfcdc5520fb464350437eb9d18cb 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostDecArrayItem.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostDecArrayItem{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java
index ecd90c10d9c245b7e117a4516deadd7b9bffa996..58476eba707088ef8f7d5b22bbcc87611a4e61c1 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostDecByte.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostDecByte{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java
index 995d271577d3291222a4294a29e087d56e305557..e2104cc045fa8163150533801a9defa7266a25a7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostDecLocal.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostDecLocal{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java b/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java
index b14c5afb876db1a611f193e17bdf3a95740e0a14..8153d2b2314237e2a6f4cf620a1925c2b400c75c 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostDecPostInc.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostDecPostInc{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java
index b9dc78ab880416d02a21d5c134fdfaabd90180d0..03f0122ea2861d59e53e56b479c2c1ca5d1ca4b0 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayIndexAndElement.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncArrayIndexAndElement{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java
index 6e4ba68b5dbff7a1355de33c3c16f34653709428..742039c0a26a78264509e5814709677d8ac2d7e1 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItem.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncArrayItem{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java
index 8004570a4bc42980351d02a00b072c33edbc8935..0a54d9d1fe0e14fe14c10bda13d50810c1251d19 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemAsParameter.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncArrayItemAsParameter{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java
index e3615055be00c28b4a09b163d98c51b09f63a261..8748df3b602c8263e1fb35018090a012a42e41dd 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncArrayItemFieldIndex.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncArrayItemFieldIndex{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java
index d232dea0e1cde9b17cac5abf5997dbaeddf16dc1..ad84ceb0170db28b0915a4d2f6ab6089d660471f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncByte.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncByte{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java
index ddb1ace2a347eee4e4d7cc2b4ea9b62a1532c440..f5810a20e07cc2c54a5288c201ad78276050d34f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncByteField.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncByteField{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java
index dfce4e6d556aa801df136e63847e4af7970f3a1d..0b567d860c6a76a92ee1f54c9741dd2c0cb1272f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncInt.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncInt{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java
index fa9f7651f7b545d5e27e5bd9899b479c1ad608d7..ef28c2c7b0e77103bddb5d3fac5387ec7569461f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncIntField.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncIntField{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java
index 1521303b4ee80b2c40140b317263c9ee93fb2fd6..0c115da9a32111276525d80ad403e4c327348ec7 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocal.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncLocal{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java
index 72f5e30ea3775e6afe23d235a5c771a955c42330..bf94c2e33877762bb92d9fde342947a6c158e9eb 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalStandalone.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncLocalStandalone{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java
index 95e9b88e4aab3619b176173143f384535bfc8ff1..9059c2320f49e3a4d3353ef7d747327131428bcd 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PostIncLocalTwice.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PostIncLocalTwice{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java
index b3fbe59980f16af80a6d1180540d56f30503a69a..895be94740a94545f40b5d9e39f629deda3fae81 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayIndexAndElement.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreDecArrayIndexAndElement{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java
index 69aeee0ac707725bf66f0f00b764acb1db585128..fcc93d1b4494e7ae249b37ddb3bfbca99cc33741 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreDecArrayItem.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreDecArrayItem{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java b/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java
index 5ea331e9131b9ca94b2e9dd768d689178046ec2c..f31f98fb34ce6e2ec17faf0d074b904f243298aa 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreDecPostInc.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreDecPostInc{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java
index ac4957a8a67e9c9c764fb8d6e612e94d194de8de..341583c481cba81a171dd35af2ff29ea7ba15af6 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayIndexAndElement.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncArrayIndexAndElement{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java
index 499f9fba044f67f62e7bd9fdf62bcdd1929f5c55..2295a2fe50e72b304da433a8bc29044d6952f8db 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncArrayItem.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncArrayItem{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java
index 37042f6baab563dfee1e7d4835c424befc38166b..b9c47aecb69910254b1681f405c6a3f0288f5e79 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncByte.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncByte{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java
index 00e63591d87594716d6d3f81af732894d6944f2f..9d27660b4eb4366c7d9b068fcc42913c2745bce1 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncByteField.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncByteField{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java
index 989fe61aa203383f59ad220bf038aee0368dec3b..7fd25bedcd99b747cff18c51cf233a8808d8137c 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncInt.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncInt{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java
index dd2c516f33272146603f72455830b9c1a0e6d868..0cecd153a57abe9c36e396f44b682efa23534a13 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncIntField.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncIntField{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java
index 042ef524f08e54d57a286dd722e0c5e21ce2324b..bde0e40a3a0d5181cba2216aa1919e7ed2170db2 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocal.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncLocal{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java
index 1a5bea8d2f5d6c3d8edfc427bc07a93d08659e8d..4ddf45bdde06d2114312b08000c4f8fa81aa6c72 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalStandalone.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncLocalStandalone{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java
index 4ad64a4905478a1bfd4ec1abdd572b5e0cc74743..3ef704a2f3b8020895bf6a85d4a8851ddfd7ed33 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/PreIncLocalTwice.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class PreIncLocalTwice{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java
index b4ab0e3fe812698432ea4c57a2beb3bdf6a37185..2cc544669e42bc97dba292fe04b1af87099e3e1e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanNewArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnBooleanNewArray{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java
index 488ef38c786b961e46ff7ef36df191ec5a85f2a2..d5f467574a987c155085a6b9632a02bb27f303d4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnBooleanVarArray.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnBooleanVarArray{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java
index 7514bdb1476d5f70647d0d639ec90aac648d9fe9..5301223bc850a00bb1cdb68cf75f16410d57a849 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayNew.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnByteArrayNew{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java
index 699d002b95a4d554c347fbe59587c9a76fd293e1..7511b0d2d62ca9ff5993a6ec2daf9d7d3f51c81a 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnByteArrayVar.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnByteArrayVar{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java
index efa5afaa8710a659b6a0b233e0fa612e59b56505..937673b33a939567d18a144f0b10b561112c7f47 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayNew.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnDoubleArrayNew{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java
index df561d96a528fa1f6e1e9f5d3a677db1c08716dd..9b76970fbf3f04ef918fc22c4a9ff551cad759a5 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnDoubleArrayVar.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnDoubleArrayVar{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java
index 575a016d122b738929f08e4262688a5a2d3ba3eb..92d6251b1c627877625617b0b524fb18efe634dc 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayNew.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnFloatArrayNew{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java
index e937115fd933b32cd217851f20e73d00bc463c7c..f5a539cb36f1fa217b340b9acd85efae3a06c2dd 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnFloatArrayVar.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnFloatArrayVar{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java
index 864d7ebbf4406dd5e5cdbeb133abff7cd27b2d88..4d6662fa89259429e34a16317b144d26ff9f6323 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayNew.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnIntArrayNew{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java
index 5a4acff979eb1aa0f9b72079a4cf16a51582ede5..5995ae6f92470dd72f0c4d457314dd6416ea98ec 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnIntArrayVar.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnIntArrayVar{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java
index 4b4ec765d20cd6c5ec032ade1027660eed172f25..e742b8ce1ff960aff7cc42dbb54fc3d9b0823689 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayNew.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnLongArrayNew{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java
index 2ba7c98874a3f473954d6cfe43b76fa35e403375..39abb6a83029aea51cc7a256619096e02819f846 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnLongArrayVar.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnLongArrayVar{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java
index fd28a765e42a39f406fbd8f23b3146da50d8e46a..042691e8c8daa807f1217506d931a05f054bfaa8 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnPostIncInt.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnPostIncInt{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java
index 106749f81f516607e5da9c4323f617ab98c7008d..5fdf913134c00185783cbeff3b9406b59c02cc81 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnPreIncInt.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnPreIncInt{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java
index 60bf91b8e196243b851d8e541e8de575db4c3370..187039c95dd39cef57209a53d1e2225fc666b151 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayNew.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnShortArrayNew{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java
index 62cf2b9274e3336d01937d6be2192c83f4ff7990..f1239796d26105cc9e34e98fc9a07a02d0791d0c 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/ReturnShortArrayVar.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class ReturnShortArrayVar{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java b/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java
index 00968ea95c188419ab9331a65e96d10ebead491f..7220c7eed9b8feec099add4f1f7f0394d106484b 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/RightShifts.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class RightShifts extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Sequence.java b/test/codegen/src/java/com/amd/aparapi/test/Sequence.java
index 87d48633a37aabff5529005878ae2cc6685e6e3c..998c80b845cf07fabb3fee1c40abffe5ecd79f90 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Sequence.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Sequence.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Sequence{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java b/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java
index c0751a468742d084036101d273d6538aed5e550d..e8505208569aff43fcb3e7b323fa01147ada427d 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/StaticFieldStore.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class StaticFieldStore{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java b/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java
index 61229a5795ce95a7fc5bc5d7c41f50f3af7afa9e..4e01aa4be9970a33e8ed596eb745d7834636a18f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/StaticMethodCall.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class StaticMethodCall extends Kernel{
    public static int add(int i, int j) {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java b/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java
index bfca5a9a6507d4174efb19ad37927d91b4b2df07..6a88612034a64c0275f6bc34bfa1854f78dafd01 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/SynchronizedMethods.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class SynchronizedMethods{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/Ternary.java b/test/codegen/src/java/com/amd/aparapi/test/Ternary.java
index 5c7363a3ffac486afad803b92fa9a175e4fe6052..6b805ecafa7901480790257c26ccbe028689c37f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/Ternary.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/Ternary.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class Ternary{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java
index 25c758121e5fe7203b698980e523505e4b7dea98..292d761118b4ca681cbffc8e28d1bb3d65b78853 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/TernaryAnd.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class TernaryAnd{
    float random() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java
index 1bc2e728985e82ea6ca2ab36de32ce3ae04ff5cc..5d3dc55f9af4d6c461dfcc486c35d2984985de6e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/TernaryAndOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class TernaryAndOr{
    float random() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java
index c46c925bcd8004acce307837863df5e958111def..b4e85978de31f0c55a0bd425e260722b37222c62 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/TernaryNested.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class TernaryNested{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java b/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java
index ab517f067ae3aa220c03852ce21cc50ed51b9508..63adad556f26553e7030d4f7d60e24e95804604f 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/TernaryOr.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class TernaryOr{
    float random() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java b/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java
index 6e60e8166063c3bdf80e13bc5db1cf541a6a7784..5e09ff5d30f1f60e9c66b51e2a3e1123b1689cf8 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/TwoForLoops.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class TwoForLoops extends Kernel{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java
index 5e54e7726f39bc1f6b53660c969b1c36d664922b..fc7175d73cd0f814fe3814a3143b24fb8d0e3161 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfElsesWithCommonEndByte.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class UnrelatedIfElsesWithCommonEndByte{
    /*
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java
index 353d4a6faa7d7975dd0c5d5b6b0e907153b37ee8..75658f1c94a0ee4484715c5a83ecbdf3fd3859ab 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedIfsWithCommonEndByte.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class UnrelatedIfsWithCommonEndByte{
    int width = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java
index 7b264fe3ec96136e30d25403e4d4dacda6865468..193b029b82d18463179ab8528ac2b77cc3713f2e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/UnrelatedNestedIfElses.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class UnrelatedNestedIfElses{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UseObject.java b/test/codegen/src/java/com/amd/aparapi/test/UseObject.java
index 8571fe72156964e1b0fe57ab7971fd848b9c6af5..47a77872ce6724f126e17d09f5053448b8bacf3e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/UseObject.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/UseObject.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class UseObject extends Kernel{
    class Dummy{
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java b/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java
index da7989b8c3892eb8f72b13335257bb1c1f31fdc2..46fedec025b30773ae391490c11cbc42d82033cf 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/UseObjectArrayLength.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class UseObjectArrayLength extends Kernel{
    final class Dummy{
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java b/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java
index b73b50cc19e66002bfe2d0ccfae098f512024c53..ce2737828b8b091d35b9885126a6521c14e471cd 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/UsesArrayLength.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 public class UsesArrayLength extends Kernel{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java b/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java
index 19a96caab92ca3680e0e54233bdefebf75a66997..361f8506ee8adb94685c1f42bded9ec1a7136ad4 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/UsesNew.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class UsesNew{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java b/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java
index ef1bcdc4523f96f50ff4a4b9953bd6a1208f1cb5..244e9515d06e5991717a7c59d76b00e39f147f35 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/UsesThrow.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class UsesThrow{
    int[] ints = new int[1024];
diff --git a/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java b/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java
index 8c58a536f68497672168e9f9c9a573e19cf0ac47..bc67d8731fa627df3c762e1fecda7a434e53e38e 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/VarargsForEach.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class VarargsForEach{
    public static int max(int... values) {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java b/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java
index d6f0f89c40d8a7991b855834bcbec64c4492d67c..d7910f7b0302523b246e1f2125667943f66f4f30 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/VarargsSimple.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class VarargsSimple{
    public static int max(int... values) {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/While.java b/test/codegen/src/java/com/amd/aparapi/test/While.java
index 0e83ddce5e973d5171fe1a61792e9701dadc43e2..e9a0d63d7dc254c3281c1e0977e9f1a85bcd1767 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/While.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/While.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class While{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java b/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java
index 6a0abcaf597ca7275fa40844c4a0b86239b15470..05dc8b4d091ab087ec64b339860b600b682801ce 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/WhileAndMandel.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class WhileAndMandel{
    int width = 1024;
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java b/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java
index f2543e8050dfbe31426b3879137f21467b5851d2..078e5f5f515588b36e5dd75e501c10aec9c9a86a 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/WhileEmptyLoop.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class WhileEmptyLoop{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java b/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java
index 14725223ac8253d6c43d5f3fcd2d0288cff08f01..15a0a970ab93415a5686912edd22d834ed74a863 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/WhileFloatCompound.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class WhileFloatCompound{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java b/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java
index 4b61ca31901e7986f7c33c374855f617401200c8..1c33d480ab0d2bce1ebbb27f04f78fa5d5884d55 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/WhileIf.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class WhileIf{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java b/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java
index 46cb1d71af1febab09d42ef59efe7b95a1cef3e7..360ab86a5a26c406361e891229d3ecea78d69cbe 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/WhileIfElse.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class WhileIfElse{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java b/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java
index 48c4ace0caed4c597c8b5870282a4d4c8531ef73..4e42c22ee3e5107a49a640b36e07c8af2fbe2bdf 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/WhileWithoutMutator.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class WhileWithoutMutator{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java b/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java
index a3435a2a02d2a6de71ab6710d5f5d2a5247e19ee..886638bc9e16d262fd60ac034d4562603cc5a1b5 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/While_If_IfElseElse.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class While_If_IfElseElse{
    public void run() {
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WideInc.java b/test/codegen/src/java/com/amd/aparapi/test/WideInc.java
index aa7bfa727849d989908fb41c20639aa3be58026c..cd576af638086f91edad64385d160752fc8bb734 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/WideInc.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/WideInc.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class WideInc{
 
diff --git a/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java b/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java
index 30ce67fe9d6eb6ac0cd024b795ccd9256fde9420..53addecc30b8d67d0866932e26a0c07294d8d658 100644
--- a/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java
+++ b/test/codegen/src/java/com/amd/aparapi/test/WideLoad.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test;
+package com.aparapi.test;
 
 public class WideLoad{
 
diff --git a/test/runtime/build.xml b/test/runtime/build.xml
index 922e2b99ea7e509962b45a6f95febbda8d78f232..7ec849786b9321c7620e793a9a571086347ee2b9 100644
--- a/test/runtime/build.xml
+++ b/test/runtime/build.xml
@@ -43,7 +43,7 @@
 	</target>
 
 	<path id="classpath">
-		<pathelement path="${basedir}/../../com.syncleus.aparapi/dist/aparapi.jar" />
+		<pathelement path="${basedir}/../../com.aparapi/dist/aparapi.jar" />
 		<pathelement path="${junit.home}/${junit.jar.name}" />
 		<pathelement path="classes" />
 	</path>
@@ -63,7 +63,7 @@
 		<!-- even though fork is slower we need to set the library path and this requires fork -->
 
 		<junit printsummary="false" fork="true" haltonfailure="false" failureproperty="tests.failed" showoutput="false">
-			<sysproperty key="java.library.path" value="${basedir}/../../com.syncleus.aparapi.jni/dist" />
+			<sysproperty key="java.library.path" value="${basedir}/../../com.aparapi.jni/dist" />
 			<formatter type="xml" />
 			<classpath refid="classpath" />
 			<batchtest todir="junit/data">
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java
index 5858491577ea099739814c70803f6694e023b070..906b5e1e86c99ec6a6301ab3c94c7946e660e770 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/BufferTransfer.java
@@ -1,8 +1,8 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
 import org.junit.*;
 
 import java.util.*;
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java
index 53f8c442de9a5f9417191859e9b09aad4a413e3c..37cdb04270eeabf061df687177d239b88d3f08fe 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/CallStaticFromAnonymousKernel.java
@@ -1,7 +1,7 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
+import com.aparapi.*;
+import com.aparapi.device.*;
 import org.junit.*;
 
 import static org.junit.Assert.*;
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java
index 5a82daf2f977a6b9231c7261cd0d3689aa3162a1..efcf5d1df4817a9780345ac629f7b204972df7b7 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/ExplicitBoolean.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.*;
+import com.aparapi.*;
 import org.junit.*;
 
 import static org.junit.Assert.*;
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java
index 315be790855908a249e4b0010cbd9adf79330b5f..e71b3f2bb208c20b20fee28ba37bf79c53cbb6ce 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue102.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.*;
+import com.aparapi.*;
 import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java
index c112ba9ad78d32c56c60b76c6bb141e79bc2c0ea..646137b3bb07b801c9264505c56679b781d9f061 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue103.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.*;
+import com.aparapi.*;
 import static org.junit.Assert.*;
 import org.junit.Test;
 
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java
index c4b20570b26252778bc0a580e1deaefa843721de..d10a89bac24fcf1080f64ab76426465b2542e013 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue68.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.Kernel;
+import com.aparapi.Kernel;
 
 abstract class ArrayAccess{
    protected ArrayAccess(int offset, int length) {
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java
index 8c71650b61df09b6954a28b6f11e9379c29be2b3..fe508fd6ad6341befd12b1fc62cc5ce71a036771 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Issue69.java
@@ -1,7 +1,7 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
 
 public class Issue69{
 
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java
index 637c88492bc7ba5e0c1ec94e12f4d119ac3edfad..3c4201b0e7519193c64945e0541ce057893e1771 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/LoadCL.java
@@ -1,10 +1,10 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
-import com.syncleus.aparapi.internal.kernel.*;
-import com.syncleus.aparapi.opencl.*;
-import com.syncleus.aparapi.opencl.OpenCL.*;
+import com.aparapi.*;
+import com.aparapi.device.*;
+import com.aparapi.internal.kernel.*;
+import com.aparapi.opencl.*;
+import com.aparapi.opencl.OpenCL.*;
 import org.junit.*;
 
 import static org.junit.Assert.*;
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java
index 6e536e27c4d1a0385ca6343eadf31b865646c1dc..e3c4eeb4c896a3a64ac16f2f7b2d9dc950d4b8cb 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/RangeSize.java
@@ -1,6 +1,6 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.Range;
+import com.aparapi.Range;
 
 import static org.junit.Assert.*;
 
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
index 3f9e24dd7ffff39bb2777cb6ea70303fe46ad53e..0cb0b0ae4451410d93b75a56c818827120beb445 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Test12x4_4x2.java
@@ -1,10 +1,10 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.device.*;
+import com.aparapi.device.*;
 import org.junit.Test;
 
-import com.syncleus.aparapi.Kernel;
-import com.syncleus.aparapi.Range;
+import com.aparapi.Kernel;
+import com.aparapi.Range;
 
 public class Test12x4_4x2{
       @SuppressWarnings("deprecation")
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java
index 06436a9e391eafccbad3f1279fe8688e02e5d3c4..ce3df09b41f8284aaa7cf18556101724580b2331 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/UseStaticArray.java
@@ -1,7 +1,7 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
-import com.syncleus.aparapi.*;
-import com.syncleus.aparapi.device.*;
+import com.aparapi.*;
+import com.aparapi.device.*;
 import org.junit.*;
 
 import static org.junit.Assert.*;
diff --git a/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java b/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java
index da0d2d6de1b8915e041bfbfb5443aba98b4731df..479df2a6ee73a9011531da4505efb4e4bdb766f8 100644
--- a/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java
+++ b/test/runtime/src/java/com/amd/aparapi/test/runtime/Util.java
@@ -1,4 +1,4 @@
-package com.syncleus.aparapi.test.runtime;
+package com.aparapi.test.runtime;
 
 import java.util.Arrays;