52 files changed, 208 insertions, 208 deletions
diff --git a/build.xml b/build.xml
index 06bad05..22bc3ff 100644
--- a/build.xml
+++ b/build.xml
@@ -73,8 +73,8 @@
             <src path="${basedir}/etc/src"/>
         </javac>
 
-        <taskdef name="update-headers"            classname="com.mbien.ant.HeaderFileDownloader"     classpath="${etc.build.dir}"/>
-        <taskdef name="uncomment-function-params" classname="com.mbien.ant.FunctionParamUncommenter" classpath="${etc.build.dir}"/>
+        <taskdef name="update-headers"            classname="com.jogamp.ant.HeaderFileDownloader"     classpath="${etc.build.dir}"/>
+        <taskdef name="uncomment-function-params" classname="com.jogamp.ant.FunctionParamUncommenter" classpath="${etc.build.dir}"/>
 
     </target>
 
@@ -243,7 +243,7 @@
             windowtitle="${javadoc.windowtitle}">
 
             <arg line="${javadoc.additionalparam} -J-Dnativetaglet.mapping=${basedir}/resources/native-taglet.properties"/>
-            <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.root}/build/gluegen.jar:/home/mbien/NetBeansProjects/JOGL/jocl/"/>
+            <taglet name="net.highteq.nativetaglet.NativeTaglet" path="${gluegen.root}/build/gluegen.jar:/home/jogamp/NetBeansProjects/JOGL/jocl/"/>
 
             <classpath>
                 <pathelement path="${javac.classpath}"/>
@@ -259,7 +259,7 @@
                 <include name="**/*.java"/>
             </fileset>
 
-            <excludepackage name="com.mbien.opencl.impl"/>
+            <excludepackage name="com.jogamp.opencl.impl"/>
         </javadoc>
     </target>
 
diff --git a/etc/src/com/mbien/ant/FunctionParamUncommenter.java b/etc/src/com/mbien/ant/FunctionParamUncommenter.java
index df69471..5106be4 100644
--- a/etc/src/com/mbien/ant/FunctionParamUncommenter.java
+++ b/etc/src/com/mbien/ant/FunctionParamUncommenter.java
@@ -1,4 +1,4 @@
-package com.mbien.ant;
+package com.jogamp.ant;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/etc/src/com/mbien/ant/HeaderFileDownloader.java b/etc/src/com/mbien/ant/HeaderFileDownloader.java
index 5177b90..64e193d 100644
--- a/etc/src/com/mbien/ant/HeaderFileDownloader.java
+++ b/etc/src/com/mbien/ant/HeaderFileDownloader.java
@@ -1,4 +1,4 @@
-package com.mbien.ant;
+package com.jogamp.ant;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 41e04c4..d85b979 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -1,3 +1,8 @@
+annotation.processing.enabled=true
+annotation.processing.enabled.in.editor=false
+annotation.processing.run.all.processors=true
+javac.processorpath=\
+    ${javac.classpath}
 application.title=JOCL
 application.vendor=Michael Bien
 build.classes.dir=${build.dir}/classes
@@ -84,7 +89,10 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
-source.reference.gluegen.jar=${gluegen.root}/src/java;${gluegen.root}/build/gensrc/java
+source.reference.gluegen-rt.jar=${gluegen.root}/src/java:${gluegen.root}/build/gensrc/java
+source.reference.jogl.all.jar=${jogl.root}/build/jogl/classes
+source.reference.nativewindow.all.jar=${jogl.root}/build/nativewindow/gensrc/classes/
+source.reference.newt.all.jar=${jogl.root}/build/newt/classes
 src.dir=src
 src.java.dir=gensrc/java
 src.native.dir=gensrc/native
diff --git a/resources/cl-common.cfg b/resources/cl-common.cfg
index c6b7b07..cea3c5b 100644
--- a/resources/cl-common.cfg
+++ b/resources/cl-common.cfg
@@ -1,7 +1,7 @@
 JavaOutputDir   gensrc/java
 NativeOutputDir gensrc/native
 
-Package com.mbien.opencl
+Package com.jogamp.opencl
 
 #map pointers to long as internal representation
 Opaque long cl_context
@@ -87,7 +87,7 @@ NioDirectOnly clGetGLContextInfoKHR
 #common rename emitted struct accessors
 #struct cl_image_format
 RenameJavaType cl_image_format CLImageFormatImpl
-StructPackage cl_image_format com.mbien.opencl.impl
+StructPackage cl_image_format com.jogamp.opencl.impl
 
 #struct fields ([set|get]+FieldName())
 RenameJavaMethod image_channel_order imageChannelOrder
diff --git a/resources/cl-if.cfg b/resources/cl-if.cfg
index 48a87a5..7ba340f 100644
--- a/resources/cl-if.cfg
+++ b/resources/cl-if.cfg
@@ -5,7 +5,7 @@ Style InterfaceOnly
 #imports for all generated java files
 Import java.nio.IntBuffer
 Import java.nio.LongBuffer
-Import com.mbien.opencl.impl.CLImageFormatImpl
+Import com.jogamp.opencl.impl.CLImageFormatImpl
 
 ClassJavadoc CL /**
 ClassJavadoc CL  * Java bindings to OpenCL, the Open Computing Language.
diff --git a/resources/cl-impl.cfg b/resources/cl-impl.cfg
index f1e9715..93dab2b 100644
--- a/resources/cl-impl.cfg
+++ b/resources/cl-impl.cfg
@@ -3,8 +3,8 @@ Include cl-common.cfg
 Style ImplOnly
 
 #imports for all generated java files
-Import com.mbien.opencl.*
-Import com.mbien.opencl.gl.CLGLI
+Import com.jogamp.opencl.*
+Import com.jogamp.opencl.gl.CLGLI
 
 ClassJavadoc CLImpl /**
 ClassJavadoc CLImpl  * Java bindings to OpenCL, the Open Computing Language.
diff --git a/resources/clImplCustomCode.c b/resources/clImplCustomCode.c
index 747e2c8..ec4735b 100644
--- a/resources/clImplCustomCode.c
+++ b/resources/clImplCustomCode.c
@@ -15,7 +15,7 @@ void createContextCallback(const char * c, const void * v, size_t s, void * o) {
 */
 
 /*   Java->C glue code:
- *   Java package: com.mbien.opencl.impl.CLImpl
+ *   Java package: com.jogamp.opencl.impl.CLImpl
  *    Java method: long clCreateContextFromType(java.nio.IntBuffer props, long device_type, CreateContextCallback pfn_notify, Object userData, IntBuffer errcode_ret)
  *     C function: cl_context clCreateContextFromType(  cl_context_properties *  properties ,
  *                                                      cl_uint                  num_devices ,
@@ -25,7 +25,7 @@ void createContextCallback(const char * c, const void * v, size_t s, void * o) {
  *                                                      cl_int *                 errcode_ret );
  */
 JNIEXPORT jlong JNICALL
-Java_com_mbien_opencl_impl_CLImpl_clCreateContextFromType0(JNIEnv *env, jobject _unused,
+Java_com_jogamp_opencl_impl_CLImpl_clCreateContextFromType0(JNIEnv *env, jobject _unused,
         jobject props, jint props_byte_offset, jobject device_type, jobject cb, jobject data, jobject errcode, jint errcode_byte_offset) {
 
     cl_context_properties* _props_ptr  = NULL;
@@ -57,7 +57,7 @@ Java_com_mbien_opencl_impl_CLImpl_clCreateContextFromType0(JNIEnv *env, jobject
  *                cl_int *                   errcode_ret   ) CL_API_SUFFIX__VERSION_1_0;
  */
 JNIEXPORT jlong JNICALL
-Java_com_mbien_opencl_impl_CLImpl_clCreateContext0(JNIEnv *env, jobject _unused,
+Java_com_jogamp_opencl_impl_CLImpl_clCreateContext0(JNIEnv *env, jobject _unused,
         jobject props, jint props_byte_offset, jint numDevices, jobject deviceList, jint device_type_offset, jobject cb, jobject data, jobject errcode, jint errcode_byte_offset) {
 
     cl_context_properties* _props_ptr  = NULL;
@@ -93,7 +93,7 @@ Java_com_mbien_opencl_impl_CLImpl_clCreateContext0(JNIEnv *env, jobject _unused,
  *               void *                  user_data   ) CL_API_SUFFIX__VERSION_1_0;
  */
 JNIEXPORT jint JNICALL
-Java_com_mbien_opencl_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unused,
+Java_com_jogamp_opencl_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unused,
         jlong program, jint deviceCount, jobject deviceList, jint device_type_offset, jstring options, jobject cb, jobject data) {
 
     const char* _strchars_options = NULL;
@@ -124,12 +124,12 @@ Java_com_mbien_opencl_impl_CLImpl_clBuildProgram0(JNIEnv *env, jobject _unused,
 }
 
 /*   Java->C glue code:
- *   Java package: com.mbien.opencl.impl.CLImpl
+ *   Java package: com.jogamp.opencl.impl.CLImpl
  *    Java method: java.nio.ByteBuffer clEnqueueMapImage(long command_queue, long image, int blocking_map, long map_flags, com.jogamp.gluegen.runtime.PointerBuffer origin, com.jogamp.gluegen.runtime.PointerBuffer range, com.jogamp.gluegen.runtime.PointerBuffer image_row_pitch, com.jogamp.gluegen.runtime.PointerBuffer image_slice_pitch, int num_events_in_wait_list, com.jogamp.gluegen.runtime.PointerBuffer event_wait_list, com.jogamp.gluegen.runtime.PointerBuffer event, java.nio.IntBuffer errcode_ret)
  *     C function: void *  clEnqueueMapImage(cl_command_queue command_queue, cl_mem image, uint32_t blocking_map, uint64_t map_flags, const size_t * , const size_t * , size_t *  image_row_pitch, size_t *  image_slice_pitch, uint32_t num_events_in_wait_list, cl_event *  event_wait_list, cl_event *  event, int32_t *  errcode_ret);
  */
 JNIEXPORT jobject JNICALL
-Java_com_mbien_opencl_impl_CLImpl_clEnqueueMapImage0__JJIJLjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2IILjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jobject _unused, jlong command_queue, jlong image, jint blocking_map, jlong map_flags, jobject origin, jint origin_byte_offset, jobject range, jint range_byte_offset, jobject image_row_pitch, jint image_row_pitch_byte_offset, jobject image_slice_pitch, jint image_slice_pitch_byte_offset, jint num_events_in_wait_list, jobject event_wait_list, jint event_wait_list_byte_offset, jobject event, jint event_byte_offset, jobject errcode_ret, jint errcode_ret_byte_offset) {
+Java_com_jogamp_opencl_impl_CLImpl_clEnqueueMapImage0__JJIJLjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2IILjava_lang_Object_2ILjava_lang_Object_2ILjava_lang_Object_2I(JNIEnv *env, jobject _unused, jlong command_queue, jlong image, jint blocking_map, jlong map_flags, jobject origin, jint origin_byte_offset, jobject range, jint range_byte_offset, jobject image_row_pitch, jint image_row_pitch_byte_offset, jobject image_slice_pitch, jint image_slice_pitch_byte_offset, jint num_events_in_wait_list, jobject event_wait_list, jint event_wait_list_byte_offset, jobject event, jint event_byte_offset, jobject errcode_ret, jint errcode_ret_byte_offset) {
 
   size_t * _origin_ptr = NULL;
   size_t * _range_ptr = NULL;
diff --git a/resources/clgl-if.cfg b/resources/clgl-if.cfg
index 58e6175..8e3e529 100644
--- a/resources/clgl-if.cfg
+++ b/resources/clgl-if.cfg
@@ -1,9 +1,9 @@
 Include cl-common.cfg
 
 #overwrite package
-Package com.mbien.opencl.gl
+Package com.jogamp.opencl.gl
 
-import com.mbien.opencl.CL
+import com.jogamp.opencl.CL
 
 Style InterfaceOnly
 
diff --git a/src/com/mbien/opencl/BuildProgramCallback.java b/src/com/jogamp/opencl/BuildProgramCallback.java
index 0b2b1b0..fe2b29b 100644
--- a/src/com/mbien/opencl/BuildProgramCallback.java
+++ b/src/com/jogamp/opencl/BuildProgramCallback.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 /**
  * @author Michael Bien
diff --git a/src/com/mbien/opencl/CLBuffer.java b/src/com/jogamp/opencl/CLBuffer.java
index 2137fb9..5a2a37e 100644
--- a/src/com/mbien/opencl/CLBuffer.java
+++ b/src/com/jogamp/opencl/CLBuffer.java
@@ -1,8 +1,8 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import java.nio.Buffer;
 
-import static com.mbien.opencl.CLException.*;
+import static com.jogamp.opencl.CLException.*;
 
 /**
  *
diff --git a/src/com/mbien/opencl/CLCommandQueue.java b/src/com/jogamp/opencl/CLCommandQueue.java
index ebb37dc..1781a8a 100644
--- a/src/com/mbien/opencl/CLCommandQueue.java
+++ b/src/com/jogamp/opencl/CLCommandQueue.java
@@ -1,7 +1,7 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.Int64Buffer;
-import com.mbien.opencl.gl.CLGLI;
+import com.jogamp.opencl.gl.CLGLI;
 import com.jogamp.common.nio.PointerBuffer;
 import java.nio.ByteBuffer;
 import java.nio.IntBuffer;
@@ -10,9 +10,9 @@ import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.List;
 
-import static com.mbien.opencl.CLException.*;
-import static com.mbien.opencl.CL.*;
-import static com.mbien.opencl.util.CLUtil.*;
+import static com.jogamp.opencl.CLException.*;
+import static com.jogamp.opencl.CL.*;
+import static com.jogamp.opencl.util.CLUtil.*;
 
 /**
  * The command queue is used to queue a set of operations for a specific {@link CLDevice}.
@@ -21,7 +21,7 @@ import static com.mbien.opencl.util.CLUtil.*;
  * not being shared.<br/>
  * Sharing of objects across multiple queues or using a CLCommandQueue
  * form multiple Threads will require the application to perform appropriate synchronization.
- * @see CLDevice#createCommandQueue(com.mbien.opencl.CLCommandQueue.Mode...)
+ * @see CLDevice#createCommandQueue(com.jogamp.opencl.CLCommandQueue.Mode...)
  * @author Michael Bien
  */
 public class CLCommandQueue extends CLObject implements CLResource {
@@ -1121,7 +1121,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
 
     /**
      * <p>Calls {@native clEnqueueTask}.</p>
-     * @see #putTask(com.mbien.opencl.CLKernel)
+     * @see #putTask(com.jogamp.opencl.CLKernel)
      */
     public CLCommandQueue putTask(CLKernel kernel, CLEventList events) {
         putTask(kernel, null, events);
@@ -1130,7 +1130,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
 
     /**
      * Calls {@native clEnqueueTask}.
-     * @see #putTask(com.mbien.opencl.CLKernel)
+     * @see #putTask(com.jogamp.opencl.CLKernel)
      */
     public CLCommandQueue putTask(CLKernel kernel, CLEventList condition, CLEventList events) {
 
@@ -1545,7 +1545,7 @@ public class CLCommandQueue extends CLObject implements CLResource {
         /**
          * Enables profiling of commands in the command-queue.
          * If set, the profiling of commands is enabled. Otherwise profiling of
-         * commands is disabled. See {@link com.mbien.opencl.CLEvent} for more information.
+         * commands is disabled. See {@link com.jogamp.opencl.CLEvent} for more information.
          */
         PROFILING_MODE(CL_QUEUE_PROFILING_ENABLE);
 
diff --git a/src/com/mbien/opencl/CLContext.java b/src/com/jogamp/opencl/CLContext.java
index 3e6a72e..a315777 100644
--- a/src/com/mbien/opencl/CLContext.java
+++ b/src/com/jogamp/opencl/CLContext.java
@@ -1,9 +1,9 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.CLDevice.Type;
-import com.mbien.opencl.CLMemory.Mem;
-import com.mbien.opencl.CLSampler.AddressingMode;
-import com.mbien.opencl.CLSampler.FilteringMode;
+import com.jogamp.opencl.CLDevice.Type;
+import com.jogamp.opencl.CLMemory.Mem;
+import com.jogamp.opencl.CLSampler.AddressingMode;
+import com.jogamp.opencl.CLSampler.FilteringMode;
 import com.jogamp.common.nio.Int64Buffer;
 import com.jogamp.common.nio.PointerBuffer;
 import java.io.BufferedReader;
@@ -24,7 +24,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import static com.mbien.opencl.CLException.*;
+import static com.jogamp.opencl.CLException.*;
 import static com.jogamp.common.nio.Buffers.*;
 import static com.jogamp.common.os.Platform.*;
 
@@ -423,7 +423,7 @@ public class CLContext extends CLObject implements CLResource {
      * Returns the device with maximal FLOPS from this context.
      * The device speed is estimated by calculating the product of
      * MAX_COMPUTE_UNITS and MAX_CLOCK_FREQUENCY.
-     * @see #getMaxFlopsDevice(com.mbien.opencl.CLDevice.Type)
+     * @see #getMaxFlopsDevice(com.jogamp.opencl.CLDevice.Type)
      */
     public CLDevice getMaxFlopsDevice() {
         return CLPlatform.findMaxFlopsDevice(getDevices());
diff --git a/src/com/mbien/opencl/CLDevice.java b/src/com/jogamp/opencl/CLDevice.java
index a85b2eb..3b26e50 100644
--- a/src/com/mbien/opencl/CLDevice.java
+++ b/src/com/jogamp/opencl/CLDevice.java
@@ -1,6 +1,6 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.util.CLUtil;
+import com.jogamp.opencl.util.CLUtil;
 import com.jogamp.common.nio.Int64Buffer;
 import com.jogamp.common.os.Platform;
 import java.nio.Buffer;
@@ -14,14 +14,14 @@ import java.util.Map;
 import java.util.Scanner;
 import java.util.Set;
 
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  * This object represents an OpenCL device.
- * @see CLPlatform#listCLDevices(com.mbien.opencl.CLDevice.Type...)
- * @see CLPlatform#getMaxFlopsDevice(com.mbien.opencl.CLDevice.Type...)
+ * @see CLPlatform#listCLDevices(com.jogamp.opencl.CLDevice.Type...)
+ * @see CLPlatform#getMaxFlopsDevice(com.jogamp.opencl.CLDevice.Type...)
  * @see CLContext#getDevices()
- * @see CLContext#getMaxFlopsDevice(com.mbien.opencl.CLDevice.Type)
+ * @see CLContext#getMaxFlopsDevice(com.jogamp.opencl.CLDevice.Type)
  * @author Michael Bien
  */
 public final class CLDevice extends CLObject {
@@ -507,7 +507,7 @@ public final class CLDevice extends CLObject {
 
     /**
      * Returns a Map of device properties with the enum names as keys.
-     * @see CLUtil#obtainDeviceProperties(com.mbien.opencl.CLDevice)
+     * @see CLUtil#obtainDeviceProperties(com.jogamp.opencl.CLDevice)
      */
     public Map<String, String> getProperties() {
         return CLUtil.obtainDeviceProperties(this);
diff --git a/src/com/mbien/opencl/CLEvent.java b/src/com/jogamp/opencl/CLEvent.java
index bbcf74c..46b92a6 100644
--- a/src/com/mbien/opencl/CLEvent.java
+++ b/src/com/jogamp/opencl/CLEvent.java
@@ -1,17 +1,17 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.Int64Buffer;
 import java.nio.Buffer;
 
-import static com.mbien.opencl.CL.*;
-import static com.mbien.opencl.CLException.*;
+import static com.jogamp.opencl.CL.*;
+import static com.jogamp.opencl.CLException.*;
 
 /**
  * Event objects can be used for synchronizing command queues, e.g you can wait until a
  * event occurs or they can also be used to capture profiling information that
  * measure execution time of a command.
- * Profiling of OpenCL commands can be enabled by using a {@link com.mbien.opencl.CLCommandQueue} created with
- * {@link com.mbien.opencl.CLCommandQueue.Mode#PROFILING_MODE}.
+ * Profiling of OpenCL commands can be enabled by using a {@link com.jogamp.opencl.CLCommandQueue} created with
+ * {@link com.jogamp.opencl.CLCommandQueue.Mode#PROFILING_MODE}.
  * @author Michael Bien
  */
 public class CLEvent extends CLObject implements CLResource {
diff --git a/src/com/mbien/opencl/CLEventList.java b/src/com/jogamp/opencl/CLEventList.java
index 928ce9b..b9b4cd4 100644
--- a/src/com/mbien/opencl/CLEventList.java
+++ b/src/com/jogamp/opencl/CLEventList.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.PointerBuffer;
 import java.util.Iterator;
diff --git a/src/com/mbien/opencl/CLException.java b/src/com/jogamp/opencl/CLException.java
index 63696a8..29491bc 100644
--- a/src/com/mbien/opencl/CLException.java
+++ b/src/com/jogamp/opencl/CLException.java
@@ -1,6 +1,6 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  * Main Exception type for runtime OpenCL errors and failed function calls (e.g. returning not CL_SUCCESS).
diff --git a/src/com/mbien/opencl/CLImage.java b/src/com/jogamp/opencl/CLImage.java
index 2e201b4..f8916fd 100644
--- a/src/com/mbien/opencl/CLImage.java
+++ b/src/com/jogamp/opencl/CLImage.java
@@ -1,9 +1,9 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.Int64Buffer;
 import java.nio.Buffer;
 
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  *
diff --git a/src/com/mbien/opencl/CLImage2d.java b/src/com/jogamp/opencl/CLImage2d.java
index c0d18dd..7cf04cf 100644
--- a/src/com/mbien/opencl/CLImage2d.java
+++ b/src/com/jogamp/opencl/CLImage2d.java
@@ -1,10 +1,10 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.Buffers;
 import java.nio.Buffer;
 import java.nio.IntBuffer;
 
-import static com.mbien.opencl.CLException.*;
+import static com.jogamp.opencl.CLException.*;
 
 /**
  *
diff --git a/src/com/mbien/opencl/CLImage3d.java b/src/com/jogamp/opencl/CLImage3d.java
index 6a01ffc..fd12786 100644
--- a/src/com/mbien/opencl/CLImage3d.java
+++ b/src/com/jogamp/opencl/CLImage3d.java
@@ -1,11 +1,11 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.Buffers;
 import java.nio.Buffer;
 import java.nio.IntBuffer;
 
-import static com.mbien.opencl.CL.*;
-import static com.mbien.opencl.CLException.*;
+import static com.jogamp.opencl.CL.*;
+import static com.jogamp.opencl.CLException.*;
 
 /**
  *
diff --git a/src/com/mbien/opencl/CLImageFormat.java b/src/com/jogamp/opencl/CLImageFormat.java
index d2e452b..20f2c4b 100644
--- a/src/com/mbien/opencl/CLImageFormat.java
+++ b/src/com/jogamp/opencl/CLImageFormat.java
@@ -1,8 +1,8 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.impl.CLImageFormatImpl;
+import com.jogamp.opencl.impl.CLImageFormatImpl;
 
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  *
diff --git a/src/com/mbien/opencl/CLInfoAccessor.java b/src/com/jogamp/opencl/CLInfoAccessor.java
index 9f2ae1a..56f2318 100644
--- a/src/com/mbien/opencl/CLInfoAccessor.java
+++ b/src/com/jogamp/opencl/CLInfoAccessor.java
@@ -1,12 +1,12 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.common.nio.Int64Buffer;
-import com.mbien.opencl.util.CLUtil;
+import com.jogamp.opencl.util.CLUtil;
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
 
-import static com.mbien.opencl.CLException.*;
+import static com.jogamp.opencl.CLException.*;
 
 /**
  * Internal utility for common OpenCL clGetFooInfo calls.
diff --git a/src/com/mbien/opencl/CLKernel.java b/src/com/jogamp/opencl/CLKernel.java
index a66e082..ca7f678 100644
--- a/src/com/mbien/opencl/CLKernel.java
+++ b/src/com/jogamp/opencl/CLKernel.java
@@ -1,6 +1,6 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.util.CLUtil;
+import com.jogamp.opencl.util.CLUtil;
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.common.os.Platform;
 import com.jogamp.common.nio.Int64Buffer;
@@ -8,8 +8,8 @@ import java.nio.Buffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 
-import static com.mbien.opencl.CLException.*;
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CLException.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  * High level abstraction for an OpenCL Kernel.
diff --git a/src/com/mbien/opencl/CLMemory.java b/src/com/jogamp/opencl/CLMemory.java
index 3c3b153..55a04af 100644
--- a/src/com/mbien/opencl/CLMemory.java
+++ b/src/com/jogamp/opencl/CLMemory.java
@@ -1,6 +1,6 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.gl.CLGLI;
+import com.jogamp.opencl.gl.CLGLI;
 import com.jogamp.common.nio.Buffers;
 import com.jogamp.common.nio.PointerBuffer;
 import java.nio.Buffer;
@@ -13,8 +13,8 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
-import static com.mbien.opencl.CLException.*;
-import static com.mbien.opencl.gl.CLGLI.*;
+import static com.jogamp.opencl.CLException.*;
+import static com.jogamp.opencl.gl.CLGLI.*;
 
 /**
  * Common superclass for all OpenCL memory types.
@@ -318,9 +318,9 @@ public abstract class CLMemory <B extends Buffer> extends CLObject implements CL
 
     /**
      * Configures the mapping process.
-     * @see com.mbien.opencl.CLCommandQueue#putMapBuffer(CLBuffer, com.mbien.opencl.CLMemory.Map, boolean).
-     * @see com.mbien.opencl.CLCommandQueue#putMapImage(CLImage2d, com.mbien.opencl.CLMemory.Map, boolean)
-     * @see com.mbien.opencl.CLCommandQueue#putMapImage(CLImage3d, com.mbien.opencl.CLMemory.Map, boolean)
+     * @see com.jogamp.opencl.CLCommandQueue#putMapBuffer(CLBuffer, com.jogamp.opencl.CLMemory.Map, boolean).
+     * @see com.jogamp.opencl.CLCommandQueue#putMapImage(CLImage2d, com.jogamp.opencl.CLMemory.Map, boolean)
+     * @see com.jogamp.opencl.CLCommandQueue#putMapImage(CLImage3d, com.jogamp.opencl.CLMemory.Map, boolean)
      */
     public enum Map {
 
diff --git a/src/com/mbien/opencl/CLObject.java b/src/com/jogamp/opencl/CLObject.java
index ff5f7d1..58c8485 100644
--- a/src/com/mbien/opencl/CLObject.java
+++ b/src/com/jogamp/opencl/CLObject.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 /**
  * Common superclass for all OpenCL objects.
diff --git a/src/com/mbien/opencl/CLPlatform.java b/src/com/jogamp/opencl/CLPlatform.java
index 545ca9f..f3c0092 100644
--- a/src/com/mbien/opencl/CLPlatform.java
+++ b/src/com/jogamp/opencl/CLPlatform.java
@@ -1,8 +1,8 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.Int64Buffer;
-import com.mbien.opencl.util.CLUtil;
-import com.mbien.opencl.impl.CLImpl;
+import com.jogamp.opencl.util.CLUtil;
+import com.jogamp.opencl.impl.CLImpl;
 import com.jogamp.common.nio.PointerBuffer;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -15,8 +15,8 @@ import java.util.Map;
 import java.util.Scanner;
 import java.util.Set;
 
-import static com.mbien.opencl.CLException.*;
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CLException.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  *
@@ -96,7 +96,7 @@ public final class CLPlatform {
 
     /**
      * Lists all physical devices available on this platform.
-     * @see #listCLDevices(com.mbien.opencl.CLDevice.Type...)
+     * @see #listCLDevices(com.jogamp.opencl.CLDevice.Type...)
      */
     public CLDevice[] listCLDevices() {
         return this.listCLDevices(CLDevice.Type.ALL);
@@ -177,7 +177,7 @@ public final class CLPlatform {
      * Returns the device with maximal FLOPS from this platform.
      * The device speed is estimated by calculating the product of
      * MAX_COMPUTE_UNITS and MAX_CLOCK_FREQUENCY.
-     * @see #getMaxFlopsDevice(com.mbien.opencl.CLDevice.Type...)
+     * @see #getMaxFlopsDevice(com.jogamp.opencl.CLDevice.Type...)
      */
     public CLDevice getMaxFlopsDevice() {
         return findMaxFlopsDevice(listCLDevices());
@@ -248,7 +248,7 @@ public final class CLPlatform {
 
     /**
      * Returns a Map of platform properties with the enum names as keys.
-     * @see CLUtil#obtainPlatformProperties(com.mbien.opencl.CLPlatform)
+     * @see CLUtil#obtainPlatformProperties(com.jogamp.opencl.CLPlatform)
      */
     public Map<String, String> getProperties() {
         return CLUtil.obtainPlatformProperties(this);
diff --git a/src/com/mbien/opencl/CLProgram.java b/src/com/jogamp/opencl/CLProgram.java
index db0b730..bb5abcc 100644
--- a/src/com/mbien/opencl/CLProgram.java
+++ b/src/com/jogamp/opencl/CLProgram.java
@@ -1,7 +1,7 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.util.CLProgramConfiguration;
-import com.mbien.opencl.util.CLUtil;
+import com.jogamp.opencl.util.CLProgramConfiguration;
+import com.jogamp.opencl.util.CLUtil;
 import com.jogamp.common.nio.Int64Buffer;
 import com.jogamp.common.os.Platform;
 import com.jogamp.common.nio.PointerBuffer;
@@ -14,8 +14,8 @@ import java.util.LinkedHashMap;
 import java.util.Set;
 import java.util.Map;
 
-import static com.mbien.opencl.CLException.*;
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CLException.*;
+import static com.jogamp.opencl.CL.*;
 import static com.jogamp.common.nio.Buffers.*;
 
 /**
diff --git a/src/com/mbien/opencl/CLProgramBuilder.java b/src/com/jogamp/opencl/CLProgramBuilder.java
index 7071d14..855d983 100644
--- a/src/com/mbien/opencl/CLProgramBuilder.java
+++ b/src/com/jogamp/opencl/CLProgramBuilder.java
@@ -1,7 +1,7 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.util.CLBuildConfiguration;
-import com.mbien.opencl.util.CLProgramConfiguration;
+import com.jogamp.opencl.util.CLBuildConfiguration;
+import com.jogamp.opencl.util.CLProgramConfiguration;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
@@ -21,9 +21,9 @@ import java.util.Set;
  * building multiple programs with similar configurations.
  * @see CLProgram#prepare()
  * @see #createConfiguration()
- * @see #createConfiguration(com.mbien.opencl.CLProgram)
+ * @see #createConfiguration(com.jogamp.opencl.CLProgram)
  * @see #loadConfiguration(java.io.ObjectInputStream)
- * @see #loadConfiguration(java.io.ObjectInputStream, com.mbien.opencl.CLContext)
+ * @see #loadConfiguration(java.io.ObjectInputStream, com.jogamp.opencl.CLContext)
  * @author Michael Bien
  */
 public final class CLProgramBuilder implements CLProgramConfiguration, Serializable {
diff --git a/src/com/mbien/opencl/CLResource.java b/src/com/jogamp/opencl/CLResource.java
index 8996b40..63b4749 100644
--- a/src/com/mbien/opencl/CLResource.java
+++ b/src/com/jogamp/opencl/CLResource.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 /**
  * Releasable OpenCL resource.
diff --git a/src/com/mbien/opencl/CLSampler.java b/src/com/jogamp/opencl/CLSampler.java
index 397639c..79ef606 100644
--- a/src/com/mbien/opencl/CLSampler.java
+++ b/src/com/jogamp/opencl/CLSampler.java
@@ -1,16 +1,16 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import com.jogamp.common.nio.Int64Buffer;
-import com.jogamp.common.nio.PointerBuffer;
+
 import java.nio.Buffer;
 
-import static com.mbien.opencl.CLException.*;
-import static com.mbien.opencl.CL.*;
-import static com.mbien.opencl.util.CLUtil.*;
+import static com.jogamp.opencl.CLException.*;
+import static com.jogamp.opencl.CL.*;
+import static com.jogamp.opencl.util.CLUtil.*;
 
 /**
  * Object representing an OpenCL sampler.
- * @see CLContext#createSampler(com.mbien.opencl.CLSampler.AddressingMode, com.mbien.opencl.CLSampler.FilteringMode, boolean) 
+ * @see CLContext#createSampler(com.jogamp.opencl.CLSampler.AddressingMode, com.jogamp.opencl.CLSampler.FilteringMode, boolean)
  * @author Michael Bien
  */
 public class CLSampler extends CLObject implements CLResource {
diff --git a/src/com/mbien/opencl/CreateContextCallback.java b/src/com/jogamp/opencl/CreateContextCallback.java
index e965370..dc25860 100644
--- a/src/com/mbien/opencl/CreateContextCallback.java
+++ b/src/com/jogamp/opencl/CreateContextCallback.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import java.nio.ByteBuffer;
 
diff --git a/src/com/mbien/opencl/Disposable.java b/src/com/jogamp/opencl/Disposable.java
index f85f99b..2cd1784 100644
--- a/src/com/mbien/opencl/Disposable.java
+++ b/src/com/jogamp/opencl/Disposable.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 /*
  * JDK7 ARM proposal, cypied to be forward compatible with java 7 automatic resource managment blocks.
diff --git a/src/com/mbien/opencl/InternalBufferUtil.java b/src/com/jogamp/opencl/InternalBufferUtil.java
index a257378..9cd1fac 100644
--- a/src/com/mbien/opencl/InternalBufferUtil.java
+++ b/src/com/jogamp/opencl/InternalBufferUtil.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import java.lang.reflect.Field;
 import java.nio.Buffer;
diff --git a/src/com/mbien/opencl/NativeLibLoader.java b/src/com/jogamp/opencl/NativeLibLoader.java
index c0f0fe8..67824b9 100644
--- a/src/com/mbien/opencl/NativeLibLoader.java
+++ b/src/com/jogamp/opencl/NativeLibLoader.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import java.security.AccessController;
 import java.security.PrivilegedAction;
diff --git a/src/com/mbien/opencl/gl/CLGLBuffer.java b/src/com/jogamp/opencl/gl/CLGLBuffer.java
index 97a2562..c7f14c4 100644
--- a/src/com/mbien/opencl/gl/CLGLBuffer.java
+++ b/src/com/jogamp/opencl/gl/CLGLBuffer.java
@@ -1,9 +1,9 @@
-package com.mbien.opencl.gl;
+package com.jogamp.opencl.gl;
+
+import com.jogamp.opencl.CL;
+import com.jogamp.opencl.CLBuffer;
+import com.jogamp.opencl.CLContext;
 
-import com.mbien.opencl.CL;
-import com.mbien.opencl.CLBuffer;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLMemory.GLObjectType;
 import java.nio.Buffer;
 import javax.media.opengl.GLContext;
 
diff --git a/src/com/mbien/opencl/gl/CLGLContext.java b/src/com/jogamp/opencl/gl/CLGLContext.java
index db9d615..9261872 100644
--- a/src/com/mbien/opencl/gl/CLGLContext.java
+++ b/src/com/jogamp/opencl/gl/CLGLContext.java
@@ -1,10 +1,10 @@
-package com.mbien.opencl.gl;
+package com.jogamp.opencl.gl;
 
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLDevice;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLDevice;
 import java.nio.Buffer;
-import com.mbien.opencl.CLMemory.Mem;
-import com.mbien.opencl.CLPlatform;
+import com.jogamp.opencl.CLMemory.Mem;
+import com.jogamp.opencl.CLPlatform;
 import com.jogamp.common.nio.PointerBuffer;
 import com.jogamp.opengl.impl.GLContextImpl;
 import com.jogamp.opengl.impl.macosx.cgl.MacOSXCGLContext;
@@ -13,7 +13,7 @@ import com.jogamp.opengl.impl.x11.glx.X11GLXContext;
 import javax.media.nativewindow.DefaultGraphicsConfiguration;
 import javax.media.opengl.GLContext;
 
-import static com.mbien.opencl.gl.CLGLI.*;
+import static com.jogamp.opencl.gl.CLGLI.*;
 
 /**
  * OpenCL Context supporting JOGL-JOCL interoperablity.
diff --git a/src/com/mbien/opencl/gl/CLGLImage2d.java b/src/com/jogamp/opencl/gl/CLGLImage2d.java
index 853c057..8202181 100644
--- a/src/com/mbien/opencl/gl/CLGLImage2d.java
+++ b/src/com/jogamp/opencl/gl/CLGLImage2d.java
@@ -1,15 +1,14 @@
-package com.mbien.opencl.gl;
-
-import com.mbien.opencl.CL;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLImage2d;
-import com.mbien.opencl.CLImageFormat;
-import com.mbien.opencl.CLMemory.GLObjectType;
-import com.mbien.opencl.impl.CLImageFormatImpl;
+package com.jogamp.opencl.gl;
+
+import com.jogamp.opencl.CL;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLImage2d;
+import com.jogamp.opencl.CLImageFormat;
+import com.jogamp.opencl.impl.CLImageFormatImpl;
 import java.nio.Buffer;
 import javax.media.opengl.GLContext;
 
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  * 2D OpenCL image representing an OpenGL renderbuffer.
diff --git a/src/com/mbien/opencl/gl/CLGLObject.java b/src/com/jogamp/opencl/gl/CLGLObject.java
index 84c3ece..6e2aa9d 100644
--- a/src/com/mbien/opencl/gl/CLGLObject.java
+++ b/src/com/jogamp/opencl/gl/CLGLObject.java
@@ -1,9 +1,9 @@
 /*
  * Created on Friday, February 26 2010
  */
-package com.mbien.opencl.gl;
+package com.jogamp.opencl.gl;
 
-import com.mbien.opencl.CLMemory.GLObjectType;
+import com.jogamp.opencl.CLMemory.GLObjectType;
 import javax.media.opengl.GLContext;
 
 /**
diff --git a/src/com/mbien/opencl/gl/CLGLTexture.java b/src/com/jogamp/opencl/gl/CLGLTexture.java
index 246f7d0..312df80 100644
--- a/src/com/mbien/opencl/gl/CLGLTexture.java
+++ b/src/com/jogamp/opencl/gl/CLGLTexture.java
@@ -2,7 +2,7 @@
  * Created on Friday, February 26 2010
  */
 
-package com.mbien.opencl.gl;
+package com.jogamp.opencl.gl;
 
 /**
  *
diff --git a/src/com/mbien/opencl/gl/CLGLTexture2d.java b/src/com/jogamp/opencl/gl/CLGLTexture2d.java
index 37c9a28..88b3228 100644
--- a/src/com/mbien/opencl/gl/CLGLTexture2d.java
+++ b/src/com/jogamp/opencl/gl/CLGLTexture2d.java
@@ -1,14 +1,12 @@
-package com.mbien.opencl.gl;
+package com.jogamp.opencl.gl;
 
-import com.mbien.opencl.CL;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLImageFormat;
-import com.mbien.opencl.CLMemory.GLObjectType;
-import com.mbien.opencl.impl.CLImageFormatImpl;
+import com.jogamp.opencl.CL;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLImageFormat;
+import com.jogamp.opencl.impl.CLImageFormatImpl;
 import java.nio.Buffer;
-import javax.media.opengl.GLContext;
 
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  * 2D OpenCL image representing an 2D OpenGL texture.
diff --git a/src/com/mbien/opencl/gl/CLGLTexture3d.java b/src/com/jogamp/opencl/gl/CLGLTexture3d.java
index 0a25c89..8731b5e 100644
--- a/src/com/mbien/opencl/gl/CLGLTexture3d.java
+++ b/src/com/jogamp/opencl/gl/CLGLTexture3d.java
@@ -1,15 +1,14 @@
-package com.mbien.opencl.gl;
-
-import com.mbien.opencl.CL;
-import com.mbien.opencl.CLContext;
-import com.mbien.opencl.CLImage3d;
-import com.mbien.opencl.CLImageFormat;
-import com.mbien.opencl.CLMemory.GLObjectType;
-import com.mbien.opencl.impl.CLImageFormatImpl;
+package com.jogamp.opencl.gl;
+
+import com.jogamp.opencl.CL;
+import com.jogamp.opencl.CLContext;
+import com.jogamp.opencl.CLImage3d;
+import com.jogamp.opencl.CLImageFormat;
+import com.jogamp.opencl.impl.CLImageFormatImpl;
 import java.nio.Buffer;
 import javax.media.opengl.GLContext;
 
-import static com.mbien.opencl.CL.*;
+import static com.jogamp.opencl.CL.*;
 
 /**
  * 3D OpenCL image representing an 3D OpenGL texture.
diff --git a/src/com/mbien/opencl/util/CLBuildConfiguration.java b/src/com/jogamp/opencl/util/CLBuildConfiguration.java
index a4d85b6..1de6263 100644
--- a/src/com/mbien/opencl/util/CLBuildConfiguration.java
+++ b/src/com/jogamp/opencl/util/CLBuildConfiguration.java
@@ -1,7 +1,7 @@
-package com.mbien.opencl.util;
+package com.jogamp.opencl.util;
 
-import com.mbien.opencl.CLDevice;
-import com.mbien.opencl.CLProgram;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.CLProgram;
 import java.io.IOException;
 import java.io.ObjectOutputStream;
 import java.util.Map;
@@ -9,8 +9,8 @@ import java.util.Map;
 /**
  * Configuration representing everything needed to build an OpenCL program.
  * @author Michael Bien
- * @see com.mbien.opencl.CLProgramBuilder#createConfiguration()
- * @see com.mbien.opencl.CLProgramBuilder#loadConfiguration(java.io.ObjectInputStream)
+ * @see com.jogamp.opencl.CLProgramBuilder#createConfiguration()
+ * @see com.jogamp.opencl.CLProgramBuilder#loadConfiguration(java.io.ObjectInputStream)
  */
 public interface CLBuildConfiguration extends Cloneable {
 
@@ -69,25 +69,25 @@ public interface CLBuildConfiguration extends Cloneable {
 
     /**
      * Adds the definitions to the build configuration.
-     * @see com.mbien.opencl.CLProgram#define(java.lang.String)
+     * @see com.jogamp.opencl.CLProgram#define(java.lang.String)
      */
     public CLBuildConfiguration withDefines(String... names);
 
     /**
      * Adds the definitions to the build configuration.
-     * @see com.mbien.opencl.CLProgram#define(java.lang.String, java.lang.Object)
+     * @see com.jogamp.opencl.CLProgram#define(java.lang.String, java.lang.Object)
      */
     public CLBuildConfiguration withDefines(Map<String, ? extends Object> defines);
 
     /**
      * Adds the compiler option to the build configuration.
-     * @see com.mbien.opencl.CLProgram.CompilerOptions
+     * @see com.jogamp.opencl.CLProgram.CompilerOptions
      */
     public CLBuildConfiguration withOption(String option);
 
     /**
      * Adds the compiler options to the build configuration.
-     * @see com.mbien.opencl.CLProgram.CompilerOptions
+     * @see com.jogamp.opencl.CLProgram.CompilerOptions
      */
     public CLBuildConfiguration withOptions(String... options);
 
diff --git a/src/com/mbien/opencl/util/CLProgramConfiguration.java b/src/com/jogamp/opencl/util/CLProgramConfiguration.java
index 105a4b7..901e28c 100644
--- a/src/com/mbien/opencl/util/CLProgramConfiguration.java
+++ b/src/com/jogamp/opencl/util/CLProgramConfiguration.java
@@ -1,7 +1,7 @@
-package com.mbien.opencl.util;
+package com.jogamp.opencl.util;
 
-import com.mbien.opencl.CLDevice;
-import com.mbien.opencl.CLProgram;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.CLProgram;
 import java.util.Map;
 
 /**
@@ -9,8 +9,8 @@ import java.util.Map;
  * CLProgramConfiguration is a helper for building programs with more complex configurations or
  * building multiple programs with the similar configuration.
  * @see CLProgram#prepare()
- * @see com.mbien.opencl.CLProgramBuilder#createConfiguration(com.mbien.opencl.CLProgram)
- * @see com.mbien.opencl.CLProgramBuilder#loadConfiguration(java.io.ObjectInputStream, com.mbien.opencl.CLContext)
+ * @see com.jogamp.opencl.CLProgramBuilder#createConfiguration(com.jogamp.opencl.CLProgram)
+ * @see com.jogamp.opencl.CLProgramBuilder#loadConfiguration(java.io.ObjectInputStream, com.jogamp.opencl.CLContext)
  * @author Michael Bien
  */
 public interface CLProgramConfiguration extends CLBuildConfiguration {
diff --git a/src/com/mbien/opencl/util/CLUtil.java b/src/com/jogamp/opencl/util/CLUtil.java
index 2b47ac8..6649698 100644
--- a/src/com/mbien/opencl/util/CLUtil.java
+++ b/src/com/jogamp/opencl/util/CLUtil.java
@@ -1,8 +1,8 @@
-package com.mbien.opencl.util;
+package com.jogamp.opencl.util;
 
-import com.mbien.opencl.CL;
-import com.mbien.opencl.CLDevice;
-import com.mbien.opencl.CLPlatform;
+import com.jogamp.opencl.CL;
+import com.jogamp.opencl.CLDevice;
+import com.jogamp.opencl.CLPlatform;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 import java.util.LinkedHashMap;
diff --git a/src/com/mbien/opencl/util/MultiQueueBarrier.java b/src/com/jogamp/opencl/util/MultiQueueBarrier.java
index 7ac45f6..59398b5 100644
--- a/src/com/mbien/opencl/util/MultiQueueBarrier.java
+++ b/src/com/jogamp/opencl/util/MultiQueueBarrier.java
@@ -1,7 +1,7 @@
-package com.mbien.opencl.util;
+package com.jogamp.opencl.util;
 
-import com.mbien.opencl.CLCommandQueue;
-import com.mbien.opencl.CLEventList;
+import com.jogamp.opencl.CLCommandQueue;
+import com.jogamp.opencl.CLEventList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
diff --git a/test/com/mbien/opencl/CLBufferTest.java b/test/com/jogamp/opencl/CLBufferTest.java
index a99db23..d0c8c2f 100644
--- a/test/com/mbien/opencl/CLBufferTest.java
+++ b/test/com/jogamp/opencl/CLBufferTest.java
@@ -1,14 +1,14 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.CLMemory.Mem;
-import com.mbien.opencl.CLMemory.Map;
+import com.jogamp.opencl.CLMemory.Mem;
+import com.jogamp.opencl.CLMemory.Map;
 import com.jogamp.common.nio.Buffers;
 import java.nio.ByteBuffer;
 import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static java.lang.System.*;
-import static com.mbien.opencl.TestUtils.*;
+import static com.jogamp.opencl.TestUtils.*;
 import static com.jogamp.common.nio.Buffers.*;
 
 /**
diff --git a/test/com/mbien/opencl/CLCommandQueueTest.java b/test/com/jogamp/opencl/CLCommandQueueTest.java
index cbfc2f3..a5d7afb 100644
--- a/test/com/mbien/opencl/CLCommandQueueTest.java
+++ b/test/com/jogamp/opencl/CLCommandQueueTest.java
@@ -1,8 +1,8 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.util.MultiQueueBarrier;
-import com.mbien.opencl.CLCommandQueue.Mode;
-import com.mbien.opencl.CLMemory.Mem;
+import com.jogamp.opencl.util.MultiQueueBarrier;
+import com.jogamp.opencl.CLCommandQueue.Mode;
+import com.jogamp.opencl.CLMemory.Mem;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.EnumSet;
@@ -10,8 +10,8 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static java.lang.System.*;
-import static com.mbien.opencl.TestUtils.*;
-import static com.mbien.opencl.CLEvent.*;
+import static com.jogamp.opencl.TestUtils.*;
+import static com.jogamp.opencl.CLEvent.*;
 import static com.jogamp.common.nio.Buffers.*;
 
 /**
diff --git a/test/com/mbien/opencl/CLProgramTest.java b/test/com/jogamp/opencl/CLProgramTest.java
index f46933c..8b5d436 100644
--- a/test/com/mbien/opencl/CLProgramTest.java
+++ b/test/com/jogamp/opencl/CLProgramTest.java
@@ -1,8 +1,8 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
-import com.mbien.opencl.util.CLBuildConfiguration;
-import com.mbien.opencl.util.CLProgramConfiguration;
-import com.mbien.opencl.CLProgram.Status;
+import com.jogamp.opencl.util.CLBuildConfiguration;
+import com.jogamp.opencl.util.CLProgramConfiguration;
+import com.jogamp.opencl.CLProgram.Status;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -16,7 +16,7 @@ import org.junit.rules.TemporaryFolder;
 
 import static org.junit.Assert.*;
 import static java.lang.System.*;
-import static com.mbien.opencl.CLProgram.CompilerOptions.*;
+import static com.jogamp.opencl.CLProgram.CompilerOptions.*;
 
 /**
  *
diff --git a/test/com/mbien/opencl/HighLevelBindingTest.java b/test/com/jogamp/opencl/HighLevelBindingTest.java
index 07788f6..33cce0b 100644
--- a/test/com/mbien/opencl/HighLevelBindingTest.java
+++ b/test/com/jogamp/opencl/HighLevelBindingTest.java
@@ -1,16 +1,16 @@
-package com.mbien.opencl;
-
-import com.mbien.opencl.CLMemory.Mem;
-import com.mbien.opencl.CLMemory.GLObjectType;
-import com.mbien.opencl.CLSampler.AddressingMode;
-import com.mbien.opencl.CLSampler.FilteringMode;
-import com.mbien.opencl.CLImageFormat.ChannelOrder;
-import com.mbien.opencl.CLImageFormat.ChannelType;
-import com.mbien.opencl.CLDevice.FPConfig;
-import com.mbien.opencl.CLDevice.GlobalMemCacheType;
-import com.mbien.opencl.CLDevice.LocalMemType;
-import com.mbien.opencl.CLDevice.Type;
-import com.mbien.opencl.CLDevice.Capabilities;
+package com.jogamp.opencl;
+
+import com.jogamp.opencl.CLMemory.Mem;
+import com.jogamp.opencl.CLMemory.GLObjectType;
+import com.jogamp.opencl.CLSampler.AddressingMode;
+import com.jogamp.opencl.CLSampler.FilteringMode;
+import com.jogamp.opencl.CLImageFormat.ChannelOrder;
+import com.jogamp.opencl.CLImageFormat.ChannelType;
+import com.jogamp.opencl.CLDevice.FPConfig;
+import com.jogamp.opencl.CLDevice.GlobalMemCacheType;
+import com.jogamp.opencl.CLDevice.LocalMemType;
+import com.jogamp.opencl.CLDevice.Type;
+import com.jogamp.opencl.CLDevice.Capabilities;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -21,7 +21,7 @@ import org.junit.Test;
 
 import static org.junit.Assert.*;
 import static java.lang.System.*;
-import static com.mbien.opencl.TestUtils.*;
+import static com.jogamp.opencl.TestUtils.*;
 import static com.jogamp.common.nio.Buffers.*;
 
 /**
diff --git a/test/com/mbien/opencl/LowLevelBindingTest.java b/test/com/jogamp/opencl/LowLevelBindingTest.java
index 1a57bec..2162bca 100644
--- a/test/com/mbien/opencl/LowLevelBindingTest.java
+++ b/test/com/jogamp/opencl/LowLevelBindingTest.java
@@ -1,17 +1,13 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
+
+import com.jogamp.opencl.impl.CLImpl;
 
-import com.mbien.opencl.impl.CLImpl;
-import com.jogamp.common.nio.PointerBuffer;
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-import java.nio.IntBuffer;
-import java.util.Arrays;
+
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
+
 import static java.lang.System.*;
-import static com.mbien.opencl.TestUtils.*;
-import static com.mbien.opencl.util.CLUtil.*;
 import static com.jogamp.common.nio.Buffers.*;
 
 /**
diff --git a/test/com/mbien/opencl/TestUtils.java b/test/com/jogamp/opencl/TestUtils.java
index 803474e..e2ef16f 100644
--- a/test/com/mbien/opencl/TestUtils.java
+++ b/test/com/jogamp/opencl/TestUtils.java
@@ -1,4 +1,4 @@
-package com.mbien.opencl;
+package com.jogamp.opencl;
 
 import java.nio.ByteBuffer;
 import java.util.Random;
diff --git a/test/com/mbien/opencl/testkernels.cl b/test/com/jogamp/opencl/testkernels.cl
index ec7e8bf..ec7e8bf 100644
--- a/test/com/mbien/opencl/testkernels.cl
+++ b/test/com/jogamp/opencl/testkernels.cl