diff --git a/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterTest.java b/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterTest.java
index 1196ac67492789974571b775b9bc8c130f103ac5..2a18a958fced53a6a82b7dd261440177ec5597bc 100644
--- a/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterTest.java
+++ b/src/test/java/com/aparapi/codegen/test/AssignAndPassAsParameterTest.java
@@ -29,7 +29,7 @@ public class AssignAndPassAsParameterTest extends com.aparapi.codegen.CodeGenJUn
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " int com_amd_aparapi_test_AssignAndPassAsParameter__actuallyDoIt(This *this, int a){\n"
+        + " int com_aparapi_codegen_test_AssignAndPassAsParameter__actuallyDoIt(This *this, int a){\n"
         + " return(1);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -43,7 +43,7 @@ public class AssignAndPassAsParameterTest extends com.aparapi.codegen.CodeGenJUn
         + " this->y = y;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " com_amd_aparapi_test_AssignAndPassAsParameter__actuallyDoIt(this, this->results[this->y]  = com_amd_aparapi_test_AssignAndPassAsParameter__actuallyDoIt(this, this->y));\n"
+        + " com_aparapi_codegen_test_AssignAndPassAsParameter__actuallyDoIt(this, this->results[this->y]  = com_aparapi_codegen_test_AssignAndPassAsParameter__actuallyDoIt(this, this->y));\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/ByteParamsSimpleTest.java b/src/test/java/com/aparapi/codegen/test/ByteParamsSimpleTest.java
index f6deaf9739174ac7e42cb78cbd5ede71e2dd3525..b6d6a93fbc27c7874a1978479cd4d8d2e9c96695 100644
--- a/src/test/java/com/aparapi/codegen/test/ByteParamsSimpleTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ByteParamsSimpleTest.java
@@ -25,7 +25,7 @@ public class ByteParamsSimpleTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" void com_amd_aparapi_test_ByteParamsSimple__addEmUp2(This *this, char x, char y){\n" +
+" void com_aparapi_codegen_test_ByteParamsSimple__addEmUp2(This *this, char x, char y){\n" +
 " return;\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -37,7 +37,7 @@ public class ByteParamsSimpleTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " {\n" +
 " char bb = 0;\n" +
 " char cc = 7;\n" +
-" com_amd_aparapi_test_ByteParamsSimple__addEmUp2(this, bb, cc);\n" +
+" com_aparapi_codegen_test_ByteParamsSimple__addEmUp2(this, bb, cc);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ByteParamsTest.java b/src/test/java/com/aparapi/codegen/test/ByteParamsTest.java
index 670ef08e7cee0727c5a4913195659d7387e3e334..33e04fa6747def0bd77a815d431af850dc6d833c 100644
--- a/src/test/java/com/aparapi/codegen/test/ByteParamsTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ByteParamsTest.java
@@ -28,7 +28,7 @@ public class ByteParamsTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " char com_amd_aparapi_test_ByteParams__addEmUp2(This *this, char x, char y){\n"
+        + " char com_aparapi_codegen_test_ByteParams__addEmUp2(This *this, char x, char y){\n"
         + " return((char )(x + y));\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -40,7 +40,7 @@ public class ByteParamsTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " {\n"
         + " char bb = 0;\n"
         + " char cc = 7;\n"
-        + " com_amd_aparapi_test_ByteParams__addEmUp2(this, bb = cc, cc);\n"
+        + " com_aparapi_codegen_test_ByteParams__addEmUp2(this, bb = cc, cc);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/CallObjectStaticTest.java b/src/test/java/com/aparapi/codegen/test/CallObjectStaticTest.java
index d97ee88a885f4c7ce6f511ce9c37c5f5722e0fea..7f964d4047e0cf68b564722bda7287c766e94462 100644
--- a/src/test/java/com/aparapi/codegen/test/CallObjectStaticTest.java
+++ b/src/test/java/com/aparapi/codegen/test/CallObjectStaticTest.java
@@ -25,7 +25,7 @@ public class CallObjectStaticTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" int com_amd_aparapi_test_CallObjectStatic$Dummy__foo(){\n" +
+" int com_aparapi_codegen_test_CallObjectStatic$Dummy__foo(){\n" +
 " return(42);\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -37,7 +37,7 @@ public class CallObjectStaticTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " this->out = out;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" this->out[0]  = com_amd_aparapi_test_CallObjectStatic$Dummy__foo();\n" +
+" this->out[0]  = com_aparapi_codegen_test_CallObjectStatic$Dummy__foo();\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/CallRunSuperTest.java b/src/test/java/com/aparapi/codegen/test/CallRunSuperTest.java
index b81c8881f961c91ca2c60033bde4cb7fe05b5d88..9b7f87f32b6239750b79b0d0bad97ada0eefa68f 100644
--- a/src/test/java/com/aparapi/codegen/test/CallRunSuperTest.java
+++ b/src/test/java/com/aparapi/codegen/test/CallRunSuperTest.java
@@ -26,7 +26,7 @@ public class CallRunSuperTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" void com_amd_aparapi_test_CallRunSuperBase__run(This *this){\n" +
+" void com_aparapi_codegen_test_CallRunSuperBase__run(This *this){\n" +
 " this->out[0]  = 2;\n" +
 " return;\n" +
 " }\n" +
@@ -39,7 +39,7 @@ public class CallRunSuperTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " this->out = out;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" com_amd_aparapi_test_CallRunSuperBase__run(this);\n" +
+" com_aparapi_codegen_test_CallRunSuperBase__run(this);\n" +
 " this->out[1]  = 3;\n" +
 " return;\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/CallStaticInAnotherClassTest.java b/src/test/java/com/aparapi/codegen/test/CallStaticInAnotherClassTest.java
index 10ad4e1e2e2c797acfed7ac877da76831d0bed94..e691363932346274495889a36bdbfa9ee517d64e 100644
--- a/src/test/java/com/aparapi/codegen/test/CallStaticInAnotherClassTest.java
+++ b/src/test/java/com/aparapi/codegen/test/CallStaticInAnotherClassTest.java
@@ -26,11 +26,11 @@ public class CallStaticInAnotherClassTest extends com.aparapi.codegen.CodeGenJUn
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" int com_amd_aparapi_test_AnotherClass__foo(){\n" +
+" int com_aparapi_codegen_test_AnotherClass__foo(){\n" +
 " return(42);\n" +
 " }\n" +
-" int com_amd_aparapi_test_CallStaticInAnotherClass__doodoo(This *this){\n" +
-" return(com_amd_aparapi_test_AnotherClass__foo());\n" +
+" int com_aparapi_codegen_test_CallStaticInAnotherClass__doodoo(This *this){\n" +
+" return(com_aparapi_codegen_test_AnotherClass__foo());\n" +
 " }\n" +
 " __kernel void run(\n" +
 " __global int *out,\n" +
@@ -41,7 +41,7 @@ public class CallStaticInAnotherClassTest extends com.aparapi.codegen.CodeGenJUn
 " this->out = out;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" this->out[0]  = com_amd_aparapi_test_AnotherClass__foo() + com_amd_aparapi_test_CallStaticInAnotherClass__doodoo(this);\n" +
+" this->out[0]  = com_aparapi_codegen_test_AnotherClass__foo() + com_aparapi_codegen_test_CallStaticInAnotherClass__doodoo(this);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/CallSuperTest.java b/src/test/java/com/aparapi/codegen/test/CallSuperTest.java
index 8b29436a72cf389642c6e9537812ace64ab27684..8736e70946134930cab5ff4e6b8052ce5fbd4599 100644
--- a/src/test/java/com/aparapi/codegen/test/CallSuperTest.java
+++ b/src/test/java/com/aparapi/codegen/test/CallSuperTest.java
@@ -27,11 +27,11 @@ public class CallSuperTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" int com_amd_aparapi_test_CallSuperBase__foo(This *this, int n){\n" +
+" int com_aparapi_codegen_test_CallSuperBase__foo(This *this, int n){\n" +
 " return((n * 2));\n" +
 " }\n" +
-" int com_amd_aparapi_test_CallSuper__foo(This *this, int n){\n" +
-" return((1 + com_amd_aparapi_test_CallSuperBase__foo(this, n)));\n" +
+" int com_aparapi_codegen_test_CallSuper__foo(This *this, int n){\n" +
+" return((1 + com_aparapi_codegen_test_CallSuperBase__foo(this, n)));\n" +
 " }\n" +
 " __kernel void run(\n" +
 " __global int *out,\n" +
@@ -42,7 +42,7 @@ public class CallSuperTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " this->out = out;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" this->out[0]  = com_amd_aparapi_test_CallSuper__foo(this, 2);\n" +
+" this->out[0]  = com_aparapi_codegen_test_CallSuper__foo(this, 2);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/CallTwiceTest.java b/src/test/java/com/aparapi/codegen/test/CallTwiceTest.java
index 485f4154c7c11339d653b38063050527df388819..c4ac2aae4eed66314a0f7c65bdf4d594221ee2e3 100644
--- a/src/test/java/com/aparapi/codegen/test/CallTwiceTest.java
+++ b/src/test/java/com/aparapi/codegen/test/CallTwiceTest.java
@@ -26,7 +26,7 @@ public class CallTwiceTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" int com_amd_aparapi_test_CallTwice__getOne(This *this){\n" +
+" int com_aparapi_codegen_test_CallTwice__getOne(This *this){\n" +
 " return(1);\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -38,7 +38,7 @@ public class CallTwiceTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " this->out = out;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" this->out[0]  = com_amd_aparapi_test_CallTwice__getOne(this) + com_amd_aparapi_test_CallTwice__getOne(this);\n" +
+" this->out[0]  = com_aparapi_codegen_test_CallTwice__getOne(this) + com_aparapi_codegen_test_CallTwice__getOne(this);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/CharAsParameterTest.java b/src/test/java/com/aparapi/codegen/test/CharAsParameterTest.java
index 5ff3c40d038ce585585a94793545cf9239c6a4e3..af722887f4e75ec21bbcaad07dffb5a88c456565 100644
--- a/src/test/java/com/aparapi/codegen/test/CharAsParameterTest.java
+++ b/src/test/java/com/aparapi/codegen/test/CharAsParameterTest.java
@@ -25,7 +25,7 @@ public class CharAsParameterTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" unsigned short com_amd_aparapi_test_CharAsParameter__doIt(This *this, unsigned short x){\n" +
+" unsigned short com_aparapi_codegen_test_CharAsParameter__doIt(This *this, unsigned short x){\n" +
 " return(x);\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -36,8 +36,8 @@ public class CharAsParameterTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " this->passid = passid;\n" +
 " {\n" +
 " char b = 1;\n" +
-" com_amd_aparapi_test_CharAsParameter__doIt(this, 65);\n" +
-" com_amd_aparapi_test_CharAsParameter__doIt(this, (unsigned short )b);\n" +
+" com_aparapi_codegen_test_CharAsParameter__doIt(this, 65);\n" +
+" com_aparapi_codegen_test_CharAsParameter__doIt(this, (unsigned short )b);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ClassHasStaticMethodSimpleTest.java b/src/test/java/com/aparapi/codegen/test/ClassHasStaticMethodSimpleTest.java
index b5b6b10a73c02bfd7a3f7dedf3b6d40efdacac72..897e43d92f74336d19d9f170b534648f86da2824 100644
--- a/src/test/java/com/aparapi/codegen/test/ClassHasStaticMethodSimpleTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ClassHasStaticMethodSimpleTest.java
@@ -25,7 +25,7 @@ public class ClassHasStaticMethodSimpleTest extends com.aparapi.codegen.CodeGenJ
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" void com_amd_aparapi_test_ClassHasStaticMethodSimple__staticMethod(){\n" +
+" void com_aparapi_codegen_test_ClassHasStaticMethodSimple__staticMethod(){\n" +
 " return;\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -35,7 +35,7 @@ public class ClassHasStaticMethodSimpleTest extends com.aparapi.codegen.CodeGenJ
 " This* this=&thisStruct;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" com_amd_aparapi_test_ClassHasStaticMethodSimple__staticMethod();\n" +
+" com_aparapi_codegen_test_ClassHasStaticMethodSimple__staticMethod();\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ClassHasStaticMethodTest.java b/src/test/java/com/aparapi/codegen/test/ClassHasStaticMethodTest.java
index a5e84f9c0df0b74ffb2583f8d72f9d0e635bce0b..7e4eba0593a655ba8226882d079f79f9824d12fb 100644
--- a/src/test/java/com/aparapi/codegen/test/ClassHasStaticMethodTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ClassHasStaticMethodTest.java
@@ -26,7 +26,7 @@ public class ClassHasStaticMethodTest extends com.aparapi.codegen.CodeGenJUnitBa
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" int com_amd_aparapi_test_ClassHasStaticMethod__getIntAndReturnIt(int a){\n" +
+" int com_aparapi_codegen_test_ClassHasStaticMethod__getIntAndReturnIt(int a){\n" +
 " return((1 - a));\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -43,7 +43,7 @@ public class ClassHasStaticMethodTest extends com.aparapi.codegen.CodeGenJUnitBa
 " if ((i % 2)==0){\n" +
 " this->ints[i] = foo;\n" +
 " } else {\n" +
-" this->ints[i] = com_amd_aparapi_test_ClassHasStaticMethod__getIntAndReturnIt(foo);\n" +
+" this->ints[i] = com_aparapi_codegen_test_ClassHasStaticMethod__getIntAndReturnIt(foo);\n" +
 " }\n" +
 " }\n" +
 " return;\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/CompositeArbitraryScopeTest.java b/src/test/java/com/aparapi/codegen/test/CompositeArbitraryScopeTest.java
index de3df1b128ce8ee9070d38450a6d9f551d349f9d..95b91e90cedad86ca318861e71a62d9ef7c40b9e 100644
--- a/src/test/java/com/aparapi/codegen/test/CompositeArbitraryScopeTest.java
+++ b/src/test/java/com/aparapi/codegen/test/CompositeArbitraryScopeTest.java
@@ -27,7 +27,7 @@ public class CompositeArbitraryScopeTest extends com.aparapi.codegen.CodeGenJUni
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" void com_amd_aparapi_test_CompositeArbitraryScope__t5(This *this){\n" +
+" void com_aparapi_codegen_test_CompositeArbitraryScope__t5(This *this){\n" +
 " int gid = get_global_id(0);\n" +
 " int numRemaining = 1;\n" +
 " int thisCount = 0;\n" +
@@ -39,7 +39,7 @@ public class CompositeArbitraryScopeTest extends com.aparapi.codegen.CodeGenJUni
 " gid = gid - thisCount;\n" +
 " return;\n" +
 " }\n" +
-" void com_amd_aparapi_test_CompositeArbitraryScope__t4(This *this){\n" +
+" void com_aparapi_codegen_test_CompositeArbitraryScope__t4(This *this){\n" +
 " int gid = get_global_id(0);\n" +
 " int numRemaining = 1;\n" +
 " while (numRemaining>0 && gid>0){\n" +
@@ -53,7 +53,7 @@ public class CompositeArbitraryScopeTest extends com.aparapi.codegen.CodeGenJUni
 " }\n" +
 " return;\n" +
 " }\n" +
-" void com_amd_aparapi_test_CompositeArbitraryScope__t3(This *this){\n" +
+" void com_aparapi_codegen_test_CompositeArbitraryScope__t3(This *this){\n" +
 " int gid = get_global_id(0);\n" +
 " int numRemaining = 1;\n" +
 " while (numRemaining>0){\n" +
@@ -66,7 +66,7 @@ public class CompositeArbitraryScopeTest extends com.aparapi.codegen.CodeGenJUni
 " }\n" +
 " return;\n" +
 " }\n" +
-" void com_amd_aparapi_test_CompositeArbitraryScope__t2(This *this){\n" +
+" void com_aparapi_codegen_test_CompositeArbitraryScope__t2(This *this){\n" +
 " int gid = get_global_id(0);\n" +
 " int numRemaining = 1;\n" +
 " for (; numRemaining>0; numRemaining){\n" +
@@ -77,7 +77,7 @@ public class CompositeArbitraryScopeTest extends com.aparapi.codegen.CodeGenJUni
 " }\n" +
 " return;\n" +
 " }\n" +
-" void com_amd_aparapi_test_CompositeArbitraryScope__t1(This *this){\n" +
+" void com_aparapi_codegen_test_CompositeArbitraryScope__t1(This *this){\n" +
 " int gid = get_global_id(0);\n" +
 " int numRemaining = 1;\n" +
 " while (numRemaining>0){\n" +
@@ -98,11 +98,11 @@ public class CompositeArbitraryScopeTest extends com.aparapi.codegen.CodeGenJUni
 " {\n" +
 " int gid = get_global_id(0);\n" +
 " int numRemaining = 1;\n" +
-" com_amd_aparapi_test_CompositeArbitraryScope__t1(this);\n" +
-" com_amd_aparapi_test_CompositeArbitraryScope__t2(this);\n" +
-" com_amd_aparapi_test_CompositeArbitraryScope__t3(this);\n" +
-" com_amd_aparapi_test_CompositeArbitraryScope__t4(this);\n" +
-" com_amd_aparapi_test_CompositeArbitraryScope__t5(this);\n" +
+" com_aparapi_codegen_test_CompositeArbitraryScope__t1(this);\n" +
+" com_aparapi_codegen_test_CompositeArbitraryScope__t2(this);\n" +
+" com_aparapi_codegen_test_CompositeArbitraryScope__t3(this);\n" +
+" com_aparapi_codegen_test_CompositeArbitraryScope__t4(this);\n" +
+" com_aparapi_codegen_test_CompositeArbitraryScope__t5(this);\n" +
 " while (numRemaining>0){\n" +
 " numRemaining++;\n" +
 " {\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ConstantAssignInExpressionTest.java b/src/test/java/com/aparapi/codegen/test/ConstantAssignInExpressionTest.java
index 962957ba6ecec24584d35df62e3badf3aed91323..895ff4d04db5af56d3f7b6bf02aa74525f9cbf8a 100644
--- a/src/test/java/com/aparapi/codegen/test/ConstantAssignInExpressionTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ConstantAssignInExpressionTest.java
@@ -27,7 +27,7 @@ public class ConstantAssignInExpressionTest extends com.aparapi.codegen.CodeGenJ
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" void com_amd_aparapi_test_ConstantAssignInExpression__func(This *this, int _arg){\n" +
+" void com_aparapi_codegen_test_ConstantAssignInExpression__func(This *this, int _arg){\n" +
 " return;\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -38,7 +38,7 @@ public class ConstantAssignInExpressionTest extends com.aparapi.codegen.CodeGenJ
 " this->passid = passid;\n" +
 " {\n" +
 " int result = 1;\n" +
-" com_amd_aparapi_test_ConstantAssignInExpression__func(this, result=0);\n" +
+" com_aparapi_codegen_test_ConstantAssignInExpression__func(this, result=0);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/FloatParamsSimpleTest.java b/src/test/java/com/aparapi/codegen/test/FloatParamsSimpleTest.java
index f05bdb5473d731cec9f8ca47ecaa986aa94a8061..f47a4ce03dc6281370329366ee56aefd8ab2e1b1 100644
--- a/src/test/java/com/aparapi/codegen/test/FloatParamsSimpleTest.java
+++ b/src/test/java/com/aparapi/codegen/test/FloatParamsSimpleTest.java
@@ -27,7 +27,7 @@ public class FloatParamsSimpleTest extends com.aparapi.codegen.CodeGenJUnitBase
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" void com_amd_aparapi_test_FloatParamsSimple__floatParams(This *this, float y){\n" +
+" void com_aparapi_codegen_test_FloatParamsSimple__floatParams(This *this, float y){\n" +
 " return;\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -37,7 +37,7 @@ public class FloatParamsSimpleTest extends com.aparapi.codegen.CodeGenJUnitBase
 " This* this=&thisStruct;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" com_amd_aparapi_test_FloatParamsSimple__floatParams(this, 0.0f);\n" +
+" com_aparapi_codegen_test_FloatParamsSimple__floatParams(this, 0.0f);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/FloatParamsTest.java b/src/test/java/com/aparapi/codegen/test/FloatParamsTest.java
index 968dad9b80a75fd4d2e529e135dba2062fbfaa1e..ecb8189f8e20e2fa2d1a7dcd95767a9c4fb77e83 100644
--- a/src/test/java/com/aparapi/codegen/test/FloatParamsTest.java
+++ b/src/test/java/com/aparapi/codegen/test/FloatParamsTest.java
@@ -27,7 +27,7 @@ public class FloatParamsTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" int com_amd_aparapi_test_FloatParams__addEmUp(This *this, float y, float z){\n" +
+" int com_aparapi_codegen_test_FloatParams__addEmUp(This *this, float y, float z){\n" +
 " return(((int)y + (int)z));\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -39,7 +39,7 @@ public class FloatParamsTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " {\n" +
 " int y = 2;\n" +
 " float x = 0.0f;\n" +
-" com_amd_aparapi_test_FloatParams__addEmUp(this, x=(float)y, x);\n" +
+" com_aparapi_codegen_test_FloatParams__addEmUp(this, x=(float)y, x);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ImplementsInterfaceTest.java b/src/test/java/com/aparapi/codegen/test/ImplementsInterfaceTest.java
index f74d054182c01fe428c1aaf4d1b7a2f015c06cec..7d9e5fbb8bb558f6419d2f21f34736ccf0278600 100644
--- a/src/test/java/com/aparapi/codegen/test/ImplementsInterfaceTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ImplementsInterfaceTest.java
@@ -28,7 +28,7 @@ public class ImplementsInterfaceTest extends com.aparapi.codegen.CodeGenJUnitBas
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" int com_amd_aparapi_test_ImplementsInterface__bar(This *this, int n){\n" +
+" int com_aparapi_codegen_test_ImplementsInterface__bar(This *this, int n){\n" +
 " return((n + this->ival));\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -42,7 +42,7 @@ public class ImplementsInterfaceTest extends com.aparapi.codegen.CodeGenJUnitBas
 " this->out = out;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" this->out[0]  = com_amd_aparapi_test_ImplementsInterface__bar(this, 1);\n" +
+" this->out[0]  = com_aparapi_codegen_test_ImplementsInterface__bar(this, 1);\n" +
 " char pass = 0;\n" +
 " return;\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/IncArrayArgContentTest.java b/src/test/java/com/aparapi/codegen/test/IncArrayArgContentTest.java
index d7e31a2cb81447fb2e3ba86cacd281c9a605ff34..253a7c4a4c8098b31dd3ce268d30e29ea180d73a 100644
--- a/src/test/java/com/aparapi/codegen/test/IncArrayArgContentTest.java
+++ b/src/test/java/com/aparapi/codegen/test/IncArrayArgContentTest.java
@@ -27,7 +27,7 @@ public class IncArrayArgContentTest extends com.aparapi.codegen.CodeGenJUnitBase
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" void com_amd_aparapi_test_IncArrayArgContent__incit(This *this,  __global int* arr){\n" +
+" void com_aparapi_codegen_test_IncArrayArgContent__incit(This *this,  __global int* arr){\n" +
 " arr[0]  = arr[0] + 1;\n" +
 " return;\n" +
 " }\n" +
@@ -40,7 +40,7 @@ public class IncArrayArgContentTest extends com.aparapi.codegen.CodeGenJUnitBase
 " this->arr = arr;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" com_amd_aparapi_test_IncArrayArgContent__incit(this, this->arr);\n" +
+" com_aparapi_codegen_test_IncArrayArgContent__incit(this, this->arr);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/MultipleAssignExprTest.java b/src/test/java/com/aparapi/codegen/test/MultipleAssignExprTest.java
index 0670ef1a8dd3b2c0b7ba8bda6fda6cee5b06975b..19ef61aa7a3115727611b6aa9eecb81902e59684 100644
--- a/src/test/java/com/aparapi/codegen/test/MultipleAssignExprTest.java
+++ b/src/test/java/com/aparapi/codegen/test/MultipleAssignExprTest.java
@@ -27,7 +27,7 @@ public class MultipleAssignExprTest extends com.aparapi.codegen.CodeGenJUnitBase
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" int com_amd_aparapi_test_MultipleAssignExpr__sum(This *this, int lhs, int rhs){\n" +
+" int com_aparapi_codegen_test_MultipleAssignExpr__sum(This *this, int lhs, int rhs){\n" +
 " return((lhs + rhs));\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -40,7 +40,7 @@ public class MultipleAssignExprTest extends com.aparapi.codegen.CodeGenJUnitBase
 " int a = 0;\n" +
 " int b = 0;\n" +
 " int c = 0;\n" +
-" a = b = c = com_amd_aparapi_test_MultipleAssignExpr__sum(this, 1, 2);\n" +
+" a = b = c = com_aparapi_codegen_test_MultipleAssignExpr__sum(this, 1, 2);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberAccessTest.java b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberAccessTest.java
index 8677dabbb26eddfade27371ab12e9f9b4db6e7d8..c37c1dd07dac15585f7633b99fe748ddc045084c 100644
--- a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberAccessTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberAccessTest.java
@@ -19,14 +19,14 @@ import org.junit.Test;
 
 public class ObjectArrayMemberAccessTest extends com.aparapi.codegen.CodeGenJUnitBase {
     private static final String[] expectedOpenCL = {
-        "typedef struct com_amd_aparapi_test_ObjectArrayMemberAccess$DummyOOA_s{\n" +
+        "typedef struct com_aparapi_codegen_test_ObjectArrayMemberAccess$DummyOOA_s{\n" +
 " int  mem;\n" +
 " float  floatField;\n" +
 "\n" +
-" } com_amd_aparapi_test_ObjectArrayMemberAccess$DummyOOA;\n" +
+" } com_aparapi_codegen_test_ObjectArrayMemberAccess$DummyOOA;\n" +
 "\n" +
 " typedef struct This_s{\n" +
-" __global com_amd_aparapi_test_ObjectArrayMemberAccess$DummyOOA *dummy;\n" +
+" __global com_aparapi_codegen_test_ObjectArrayMemberAccess$DummyOOA *dummy;\n" +
 " int passid;\n" +
 " }This;\n" +
 " int get_pass_id(This *this){\n" +
@@ -34,7 +34,7 @@ public class ObjectArrayMemberAccessTest extends com.aparapi.codegen.CodeGenJUni
 " }\n" +
 "\n" +
 " __kernel void run(\n" +
-" __global com_amd_aparapi_test_ObjectArrayMemberAccess$DummyOOA *dummy,\n" +
+" __global com_aparapi_codegen_test_ObjectArrayMemberAccess$DummyOOA *dummy,\n" +
 " int passid\n" +
 " ){\n" +
 " This thisStruct;\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberCallTest.java b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberCallTest.java
index 0b0e20bb82bb6a0348d8b12536530004287e6214..8392894551004c5890ce59ee1be92a1dfb1250f1 100644
--- a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberCallTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberCallTest.java
@@ -19,33 +19,33 @@ import org.junit.Test;
 
 public class ObjectArrayMemberCallTest extends com.aparapi.codegen.CodeGenJUnitBase {
     private static final String[] expectedOpenCL = {
-    "typedef struct com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA_s{\n" +
+    "typedef struct com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA_s{\n" +
 " int  mem;\n" +
 "\n" +
-" } com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA;\n" +
+" } com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA;\n" +
 "\n" +
 " typedef struct This_s{\n" +
-" __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *dummy;\n" +
+" __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *dummy;\n" +
 " int passid;\n" +
 " }This;\n" +
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" int com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__getMem( __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *this){\n" +
+" int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__getMem( __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this){\n" +
 " return(this->mem);\n" +
 " }\n" +
-" int com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUp( __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){\n" +
+" int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp( __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){\n" +
 " return((x + y));\n" +
 " }\n" +
-" int com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){\n" +
-" return(((com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUp(this, x, y) + 1) + com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__getMem(this)));\n" +
+" int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x, int y){\n" +
+" return(((com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp(this, x, y) + 1) + com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__getMem(this)));\n" +
 " }\n" +
-" int com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addToMem( __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *this, int x){\n" +
+" int com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addToMem( __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *this, int x){\n" +
 " return((x + this->mem));\n" +
 " }\n" +
 " __kernel void run(\n" +
-" __global com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA *dummy,\n" +
+" __global com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA *dummy,\n" +
 " int passid\n" +
 " ){\n" +
 " This thisStruct;\n" +
@@ -54,9 +54,9 @@ public class ObjectArrayMemberCallTest extends com.aparapi.codegen.CodeGenJUnitB
 " this->passid = passid;\n" +
 " {\n" +
 " int myId = get_global_id(0);\n" +
-" this->dummy[myId].mem=com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUp( &(this->dummy[myId]), this->dummy[myId].mem, 2);\n" +
-" int tmp = com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addToMem( &(this->dummy[myId]), 2);\n" +
-" int tmp2 = com_amd_aparapi_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( &(this->dummy[myId]), 2, tmp);\n" +
+" this->dummy[myId].mem=com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUp( &(this->dummy[myId]), this->dummy[myId].mem, 2);\n" +
+" int tmp = com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addToMem( &(this->dummy[myId]), 2);\n" +
+" int tmp2 = com_aparapi_codegen_test_ObjectArrayMemberCall$DummyOOA__addEmUpPlusOne( &(this->dummy[myId]), 2, tmp);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberGetterSetterTest.java b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberGetterSetterTest.java
index e2623a006ddb85dcec9937cfb6288544a8e33a2b..329a88015b7a9a7e35714a6c498de92ac6b73a91 100644
--- a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberGetterSetterTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberGetterSetterTest.java
@@ -19,12 +19,12 @@ import org.junit.Test;
 
 public class ObjectArrayMemberGetterSetterTest extends com.aparapi.codegen.CodeGenJUnitBase {
     private static final String[] expectedOpenCL = {
-    "typedef struct com_amd_aparapi_test_TheOtherOne_s{\n" +
+    "typedef struct com_aparapi_codegen_test_TheOtherOne_s{\n" +
 " int  mem;\n" +
 "\n" +
-" } com_amd_aparapi_test_TheOtherOne;\n" +
+" } com_aparapi_codegen_test_TheOtherOne;\n" +
 "\n" +
-" typedef struct com_amd_aparapi_test_DummyOOA_s{\n" +
+" typedef struct com_aparapi_codegen_test_DummyOOA_s{\n" +
 " long  longField;\n" +
 " float  floatField;\n" +
 " int  mem;\n" +
@@ -37,12 +37,12 @@ public class ObjectArrayMemberGetterSetterTest extends com.aparapi.codegen.CodeG
 " char _pad_22;\n" +
 " char _pad_23;\n" +
 "\n" +
-" } com_amd_aparapi_test_DummyOOA;\n" +
+" } com_aparapi_codegen_test_DummyOOA;\n" +
 "\n" +
 " typedef struct This_s{\n" +
 " int something;\n" +
-" __global com_amd_aparapi_test_DummyOOA *dummy;\n" +
-" __global com_amd_aparapi_test_TheOtherOne *other;\n" +
+" __global com_aparapi_codegen_test_DummyOOA *dummy;\n" +
+" __global com_aparapi_codegen_test_TheOtherOne *other;\n" +
 " __global int *out;\n" +
 " int passid;\n" +
 " }This;\n" +
@@ -50,51 +50,51 @@ public class ObjectArrayMemberGetterSetterTest extends com.aparapi.codegen.CodeG
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" void com_amd_aparapi_test_DummyOOA__setBoolField( __global com_amd_aparapi_test_DummyOOA *this, char x){\n" +
+" void com_aparapi_codegen_test_DummyOOA__setBoolField( __global com_aparapi_codegen_test_DummyOOA *this, char x){\n" +
 " this->boolField=x;\n" +
 " return;\n" +
 " }\n" +
-" char com_amd_aparapi_test_DummyOOA__isBoolField( __global com_amd_aparapi_test_DummyOOA *this){\n" +
+" char com_aparapi_codegen_test_DummyOOA__isBoolField( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
 " return(this->boolField);\n" +
 " }\n" +
-" char com_amd_aparapi_test_DummyOOA__getBoolField( __global com_amd_aparapi_test_DummyOOA *this){\n" +
+" char com_aparapi_codegen_test_DummyOOA__getBoolField( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
 " return(this->boolField);\n" +
 " }\n" +
-" void com_amd_aparapi_test_DummyOOA__setFloatField( __global com_amd_aparapi_test_DummyOOA *this, float x){\n" +
+" void com_aparapi_codegen_test_DummyOOA__setFloatField( __global com_aparapi_codegen_test_DummyOOA *this, float x){\n" +
 " this->floatField=x;\n" +
 " return;\n" +
 " }\n" +
-" float com_amd_aparapi_test_DummyOOA__getFloatField( __global com_amd_aparapi_test_DummyOOA *this){\n" +
+" float com_aparapi_codegen_test_DummyOOA__getFloatField( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
 " return(this->floatField);\n" +
 " }\n" +
-" void com_amd_aparapi_test_DummyOOA__setLongField( __global com_amd_aparapi_test_DummyOOA *this, long x){\n" +
+" void com_aparapi_codegen_test_DummyOOA__setLongField( __global com_aparapi_codegen_test_DummyOOA *this, long x){\n" +
 " this->longField=x;\n" +
 " return;\n" +
 " }\n" +
-" long com_amd_aparapi_test_DummyOOA__getLongField( __global com_amd_aparapi_test_DummyOOA *this){\n" +
+" long com_aparapi_codegen_test_DummyOOA__getLongField( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
 " return(this->longField);\n" +
 " }\n" +
-" void com_amd_aparapi_test_TheOtherOne__setMem( __global com_amd_aparapi_test_TheOtherOne *this, int x){\n" +
+" void com_aparapi_codegen_test_TheOtherOne__setMem( __global com_aparapi_codegen_test_TheOtherOne *this, int x){\n" +
 " this->mem=x;\n" +
 " return;\n" +
 " }\n" +
-" int com_amd_aparapi_test_ObjectArrayMemberGetterSetter__getSomething(This *this){\n" +
+" int com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(This *this){\n" +
 " return(this->something);\n" +
 " }\n" +
-" int com_amd_aparapi_test_TheOtherOne__getMem( __global com_amd_aparapi_test_TheOtherOne *this){\n" +
+" int com_aparapi_codegen_test_TheOtherOne__getMem( __global com_aparapi_codegen_test_TheOtherOne *this){\n" +
 " return(this->mem);\n" +
 " }\n" +
-" void com_amd_aparapi_test_DummyOOA__setMem( __global com_amd_aparapi_test_DummyOOA *this, int x){\n" +
+" void com_aparapi_codegen_test_DummyOOA__setMem( __global com_aparapi_codegen_test_DummyOOA *this, int x){\n" +
 " this->mem=x;\n" +
 " return;\n" +
 " }\n" +
-" int com_amd_aparapi_test_DummyOOA__getMem( __global com_amd_aparapi_test_DummyOOA *this){\n" +
+" int com_aparapi_codegen_test_DummyOOA__getMem( __global com_aparapi_codegen_test_DummyOOA *this){\n" +
 " return(this->mem);\n" +
 " }\n" +
 " __kernel void run(\n" +
 " int something,\n" +
-" __global com_amd_aparapi_test_DummyOOA *dummy,\n" +
-" __global com_amd_aparapi_test_TheOtherOne *other,\n" +
+" __global com_aparapi_codegen_test_DummyOOA *dummy,\n" +
+" __global com_aparapi_codegen_test_TheOtherOne *other,\n" +
 " __global int *out,\n" +
 " int passid\n" +
 " ){\n" +
@@ -107,14 +107,14 @@ public class ObjectArrayMemberGetterSetterTest extends com.aparapi.codegen.CodeG
 " this->passid = passid;\n" +
 " {\n" +
 " int myId = get_global_id(0);\n" +
-" int tmp = com_amd_aparapi_test_DummyOOA__getMem( &(this->dummy[myId]));\n" +
-" com_amd_aparapi_test_DummyOOA__setMem( &(this->dummy[myId]), (com_amd_aparapi_test_DummyOOA__getMem( &(this->dummy[myId])) + 2));\n" +
-" com_amd_aparapi_test_DummyOOA__setMem( &(this->dummy[myId]), (com_amd_aparapi_test_TheOtherOne__getMem( &(this->other[myId])) + com_amd_aparapi_test_ObjectArrayMemberGetterSetter__getSomething(this)));\n" +
-" com_amd_aparapi_test_TheOtherOne__setMem( &(this->other[myId]), (com_amd_aparapi_test_TheOtherOne__getMem( &(this->other[myId])) + com_amd_aparapi_test_ObjectArrayMemberGetterSetter__getSomething(this)));\n" +
-" com_amd_aparapi_test_DummyOOA__setLongField( &(this->dummy[myId]), (com_amd_aparapi_test_DummyOOA__getLongField( &(this->dummy[myId])) + 2L));\n" +
-" com_amd_aparapi_test_DummyOOA__setFloatField( &(this->dummy[myId]), (com_amd_aparapi_test_DummyOOA__getFloatField( &(this->dummy[myId])) + 2.0f));\n" +
-" com_amd_aparapi_test_DummyOOA__setBoolField( &(this->dummy[myId]), (com_amd_aparapi_test_DummyOOA__getBoolField( &(this->dummy[myId])) | com_amd_aparapi_test_DummyOOA__isBoolField( &(this->dummy[myId]))));\n" +
-" this->out[myId]  = com_amd_aparapi_test_ObjectArrayMemberGetterSetter__getSomething(this);\n" +
+" int tmp = com_aparapi_codegen_test_DummyOOA__getMem( &(this->dummy[myId]));\n" +
+" com_aparapi_codegen_test_DummyOOA__setMem( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getMem( &(this->dummy[myId])) + 2));\n" +
+" com_aparapi_codegen_test_DummyOOA__setMem( &(this->dummy[myId]), (com_aparapi_codegen_test_TheOtherOne__getMem( &(this->other[myId])) + com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this)));\n" +
+" com_aparapi_codegen_test_TheOtherOne__setMem( &(this->other[myId]), (com_aparapi_codegen_test_TheOtherOne__getMem( &(this->other[myId])) + com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this)));\n" +
+" com_aparapi_codegen_test_DummyOOA__setLongField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getLongField( &(this->dummy[myId])) + 2L));\n" +
+" com_aparapi_codegen_test_DummyOOA__setFloatField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getFloatField( &(this->dummy[myId])) + 2.0f));\n" +
+" com_aparapi_codegen_test_DummyOOA__setBoolField( &(this->dummy[myId]), (com_aparapi_codegen_test_DummyOOA__getBoolField( &(this->dummy[myId])) | com_aparapi_codegen_test_DummyOOA__isBoolField( &(this->dummy[myId]))));\n" +
+" this->out[myId]  = com_aparapi_codegen_test_ObjectArrayMemberGetterSetter__getSomething(this);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberHierarchyTest.java b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberHierarchyTest.java
index a8e1b3d2053d2984ef121cf1f162c468678401b8..5080332e715a8c50f3e956c499f6b9d988f257cd 100644
--- a/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberHierarchyTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ObjectArrayMemberHierarchyTest.java
@@ -19,34 +19,34 @@ import org.junit.Test;
 
 public class ObjectArrayMemberHierarchyTest extends com.aparapi.codegen.CodeGenJUnitBase {
     private static final String[] expectedOpenCL = {
-    "typedef struct com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA_s{\n" +
+    "typedef struct com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA_s{\n" +
 " float  floatField;\n" +
 " int  intField;\n" +
 "\n" +
-" } com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA;\n" +
+" } com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA;\n" +
 "\n" +
 " typedef struct This_s{\n" +
 " int something;\n" +
-" __global com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA *dummy;\n" +
+" __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *dummy;\n" +
 " int passid;\n" +
 " }This;\n" +
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
 "\n" +
-" void com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( __global com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA *this, float x){\n" +
+" void com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *this, float x){\n" +
 " this->floatField=x;\n" +
 " return;\n" +
 " }\n" +
-" int com_amd_aparapi_test_ObjectArrayMemberHierarchy__getSomething(This *this){\n" +
+" int com_aparapi_codegen_test_ObjectArrayMemberHierarchy__getSomething(This *this){\n" +
 " return(this->something);\n" +
 " }\n" +
-" int com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( __global com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA *this){\n" +
+" int com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *this){\n" +
 " return(this->intField);\n" +
 " }\n" +
 " __kernel void run(\n" +
 " int something,\n" +
-" __global com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA *dummy,\n" +
+" __global com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA *dummy,\n" +
 " int passid\n" +
 " ){\n" +
 " This thisStruct;\n" +
@@ -56,8 +56,8 @@ public class ObjectArrayMemberHierarchyTest extends com.aparapi.codegen.CodeGenJ
 " this->passid = passid;\n" +
 " {\n" +
 " int myId = get_global_id(0);\n" +
-" this->dummy[myId].intField=(com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( &(this->dummy[myId])) + 2) + com_amd_aparapi_test_ObjectArrayMemberHierarchy__getSomething(this);\n" +
-" com_amd_aparapi_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( &(this->dummy[myId]), (this->dummy[myId].floatField + 2.0f));\n" +
+" this->dummy[myId].intField=(com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyParent__getIntField( &(this->dummy[myId])) + 2) + com_aparapi_codegen_test_ObjectArrayMemberHierarchy__getSomething(this);\n" +
+" com_aparapi_codegen_test_ObjectArrayMemberHierarchy$DummyOOA__setFloatField( &(this->dummy[myId]), (this->dummy[myId].floatField + 2.0f));\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/OverloadMethodTest.java b/src/test/java/com/aparapi/codegen/test/OverloadMethodTest.java
index 5584ef3cbc64f1c3453ad01a42b5d542bbd4c957..d6d73e7277f8d9fa953e8f8a96926f2a2637e251 100644
--- a/src/test/java/com/aparapi/codegen/test/OverloadMethodTest.java
+++ b/src/test/java/com/aparapi/codegen/test/OverloadMethodTest.java
@@ -26,10 +26,10 @@ public class OverloadMethodTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" int com_amd_aparapi_test_OverloadMethod__foo(This *this, int a, int b){\n" +
+" int com_aparapi_codegen_test_OverloadMethod__foo(This *this, int a, int b){\n" +
 " return(min(a, b));\n" +
 " }\n" +
-" int com_amd_aparapi_test_OverloadMethod__foo(This *this, int n){\n" +
+" int com_aparapi_codegen_test_OverloadMethod__foo(This *this, int n){\n" +
 " return((n + 1));\n" +
 " }\n" +
 " __kernel void run(\n" +
@@ -41,7 +41,7 @@ public class OverloadMethodTest extends com.aparapi.codegen.CodeGenJUnitBase {
 " this->out = out;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" this->out[0]  = com_amd_aparapi_test_OverloadMethod__foo(this, 2) + com_amd_aparapi_test_OverloadMethod__foo(this, 2, 3);\n" +
+" this->out[0]  = com_aparapi_codegen_test_OverloadMethod__foo(this, 2) + com_aparapi_codegen_test_OverloadMethod__foo(this, 2, 3);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/OverriddenKernelFieldTest.java b/src/test/java/com/aparapi/codegen/test/OverriddenKernelFieldTest.java
index f00ab7b06610b152b4e4007a04245e1329113883..84821cdfa35ca9101e9f8a9c54f7d5c98baaa733 100644
--- a/src/test/java/com/aparapi/codegen/test/OverriddenKernelFieldTest.java
+++ b/src/test/java/com/aparapi/codegen/test/OverriddenKernelFieldTest.java
@@ -26,12 +26,12 @@ public class OverriddenKernelFieldTest extends com.aparapi.codegen.CodeGenJUnitB
 " int get_pass_id(This *this){\n" +
 " return this->passid;\n" +
 " }\n" +
-" int com_amd_aparapi_test_OverriddenKernelFieldParent__foo(This *this, int n){\n" +
+" int com_aparapi_codegen_test_OverriddenKernelFieldParent__foo(This *this, int n){\n" +
 " this->out[0]  = n + 1;\n" +
 " return(this->out[0]);\n" +
 " }\n" +
-" int com_amd_aparapi_test_OverriddenKernelField__foo(This *this, int n){\n" +
-" return(com_amd_aparapi_test_OverriddenKernelFieldParent__foo(this, (n + 1)));\n" +
+" int com_aparapi_codegen_test_OverriddenKernelField__foo(This *this, int n){\n" +
+" return(com_aparapi_codegen_test_OverriddenKernelFieldParent__foo(this, (n + 1)));\n" +
 " }\n" +
 " __kernel void run(\n" +
 " __global int *out,\n" +
@@ -42,7 +42,7 @@ public class OverriddenKernelFieldTest extends com.aparapi.codegen.CodeGenJUnitB
 " this->out = out;\n" +
 " this->passid = passid;\n" +
 " {\n" +
-" this->out[0]  = com_amd_aparapi_test_OverriddenKernelField__foo(this, 2);\n" +
+" this->out[0]  = com_aparapi_codegen_test_OverriddenKernelField__foo(this, 2);\n" +
 " return;\n" +
 " }\n" +
 " }\n" +
diff --git a/src/test/java/com/aparapi/codegen/test/PostDecByteTest.java b/src/test/java/com/aparapi/codegen/test/PostDecByteTest.java
index 7328f9053de121daade73405505e6ab4c3411490..c15acdc13d7224624c216b301fbe1ea7c7e419c9 100644
--- a/src/test/java/com/aparapi/codegen/test/PostDecByteTest.java
+++ b/src/test/java/com/aparapi/codegen/test/PostDecByteTest.java
@@ -27,7 +27,7 @@ public class PostDecByteTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " char com_amd_aparapi_test_PostDecByte__incByte(This *this, char a){\n"
+        + " char com_aparapi_codegen_test_PostDecByte__incByte(This *this, char a){\n"
         + " return(a++);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -38,7 +38,7 @@ public class PostDecByteTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " this->passid = passid;\n"
         + " {\n"
         + " char startValue = 3;\n"
-        + " char result = com_amd_aparapi_test_PostDecByte__incByte(this, startValue--);\n"
+        + " char result = com_aparapi_codegen_test_PostDecByte__incByte(this, startValue--);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/PostIncArrayItemAsParameterTest.java b/src/test/java/com/aparapi/codegen/test/PostIncArrayItemAsParameterTest.java
index 8131fdf805f29421be56b8e838119f72b9d30c6c..a5791b4997930f0e1d42d0634560db2951dd365d 100644
--- a/src/test/java/com/aparapi/codegen/test/PostIncArrayItemAsParameterTest.java
+++ b/src/test/java/com/aparapi/codegen/test/PostIncArrayItemAsParameterTest.java
@@ -29,7 +29,7 @@ public class PostIncArrayItemAsParameterTest extends com.aparapi.codegen.CodeGen
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " int com_amd_aparapi_test_PostIncArrayItemAsParameter__actuallyDoIt(This *this, int a){\n"
+        + " int com_aparapi_codegen_test_PostIncArrayItemAsParameter__actuallyDoIt(This *this, int a){\n"
         + " return(1);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -43,7 +43,7 @@ public class PostIncArrayItemAsParameterTest extends com.aparapi.codegen.CodeGen
         + " this->y = y;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " com_amd_aparapi_test_PostIncArrayItemAsParameter__actuallyDoIt(this, this->results[this->y]++);\n"
+        + " com_aparapi_codegen_test_PostIncArrayItemAsParameter__actuallyDoIt(this, this->results[this->y]++);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/PostIncByteTest.java b/src/test/java/com/aparapi/codegen/test/PostIncByteTest.java
index 32b237694393600e5a030d72ebaf5d3a4cb0607c..28a36a4131dd00de8f8be5ccf7a367e4c625c6b0 100644
--- a/src/test/java/com/aparapi/codegen/test/PostIncByteTest.java
+++ b/src/test/java/com/aparapi/codegen/test/PostIncByteTest.java
@@ -28,7 +28,7 @@ public class PostIncByteTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " char com_amd_aparapi_test_PostIncByte__incByte(This *this, char a){\n"
+        + " char com_aparapi_codegen_test_PostIncByte__incByte(This *this, char a){\n"
         + " return(a++);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -39,7 +39,7 @@ public class PostIncByteTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " this->passid = passid;\n"
         + " {\n"
         + " char startValue = 3;\n"
-        + " char result = com_amd_aparapi_test_PostIncByte__incByte(this, startValue++);\n"
+        + " char result = com_aparapi_codegen_test_PostIncByte__incByte(this, startValue++);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/PostIncIntTest.java b/src/test/java/com/aparapi/codegen/test/PostIncIntTest.java
index 63e925d9fa5bda2fae5defb755221aacbbd452a9..43e698ab99ab4f155366e0e4641081d331099b5e 100644
--- a/src/test/java/com/aparapi/codegen/test/PostIncIntTest.java
+++ b/src/test/java/com/aparapi/codegen/test/PostIncIntTest.java
@@ -28,7 +28,7 @@ public class PostIncIntTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " int com_amd_aparapi_test_PostIncInt__foo(This *this, int a){\n"
+        + " int com_aparapi_codegen_test_PostIncInt__foo(This *this, int a){\n"
         + " return(a);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -39,7 +39,7 @@ public class PostIncIntTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " this->passid = passid;\n"
         + " {\n"
         + " int y = 2;\n"
-        + " com_amd_aparapi_test_PostIncInt__foo(this,y++);\n"
+        + " com_aparapi_codegen_test_PostIncInt__foo(this,y++);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/PreIncByteTest.java b/src/test/java/com/aparapi/codegen/test/PreIncByteTest.java
index 2bca2a98f8a651bca9a252b7a7e35422c59f7e72..f9a079e13bddcbdeae98f11aea3ad2f760ba7451 100644
--- a/src/test/java/com/aparapi/codegen/test/PreIncByteTest.java
+++ b/src/test/java/com/aparapi/codegen/test/PreIncByteTest.java
@@ -26,7 +26,7 @@ public class PreIncByteTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " int get_pass_id(This *this){\n"
         + " return this->passid;\n"
         + " }\n"
-        + " char com_amd_aparapi_test_PreIncByte__preIncByte(This *this, char a){\n"
+        + " char com_aparapi_codegen_test_PreIncByte__preIncByte(This *this, char a){\n"
         + " a = (char )(a + 1);\n"
         + " return(a);\n"
         + " }\n"
@@ -38,7 +38,7 @@ public class PreIncByteTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " this->passid = passid;\n"
         + " {\n"
         + " char initValue = 0;\n"
-        + " char result = com_amd_aparapi_test_PreIncByte__preIncByte(this, ++initValue);\n"
+        + " char result = com_aparapi_codegen_test_PreIncByte__preIncByte(this, ++initValue);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/PreIncIntTest.java b/src/test/java/com/aparapi/codegen/test/PreIncIntTest.java
index 3380d14818c1aac3f774f0fd94404a54cb49ae99..1aec26833b3d6bca5c3f72757e482351f37a68f0 100644
--- a/src/test/java/com/aparapi/codegen/test/PreIncIntTest.java
+++ b/src/test/java/com/aparapi/codegen/test/PreIncIntTest.java
@@ -28,7 +28,7 @@ public class PreIncIntTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " int com_amd_aparapi_test_PreIncInt__preIncInt(This *this, int a){\n"
+        + " int com_aparapi_codegen_test_PreIncInt__preIncInt(This *this, int a){\n"
         + " return(a);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -39,7 +39,7 @@ public class PreIncIntTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " this->passid = passid;\n"
         + " {\n"
         + " int y = 2;\n"
-        + " com_amd_aparapi_test_PreIncInt__preIncInt(this,++y);\n"
+        + " com_aparapi_codegen_test_PreIncInt__preIncInt(this,++y);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/ReturnPostIncIntTest.java b/src/test/java/com/aparapi/codegen/test/ReturnPostIncIntTest.java
index 4532b453198a653e659142cb156be1eb88b482cf..83b7b562743811fa4d78beb65441d95fde2c13e3 100644
--- a/src/test/java/com/aparapi/codegen/test/ReturnPostIncIntTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ReturnPostIncIntTest.java
@@ -26,7 +26,7 @@ public class ReturnPostIncIntTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " int get_pass_id(This *this){\n"
         + " return this->passid;\n"
         + " }\n"
-        + " int com_amd_aparapi_test_ReturnPostIncInt__returnPostIncInt(This *this, int value){\n"
+        + " int com_aparapi_codegen_test_ReturnPostIncInt__returnPostIncInt(This *this, int value){\n"
         + " return(value++);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -36,7 +36,7 @@ public class ReturnPostIncIntTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " This* this=&thisStruct;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " com_amd_aparapi_test_ReturnPostIncInt__returnPostIncInt(this, 3);\n"
+        + " com_aparapi_codegen_test_ReturnPostIncInt__returnPostIncInt(this, 3);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/ReturnPreIncIntTest.java b/src/test/java/com/aparapi/codegen/test/ReturnPreIncIntTest.java
index a46ec32b6e5021c4d190b5d15e1ab8e612b97128..952b2a6114b38baaa5e75cad546f629eb95172b5 100644
--- a/src/test/java/com/aparapi/codegen/test/ReturnPreIncIntTest.java
+++ b/src/test/java/com/aparapi/codegen/test/ReturnPreIncIntTest.java
@@ -26,7 +26,7 @@ public class ReturnPreIncIntTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " int get_pass_id(This *this){\n"
         + " return this->passid;\n"
         + " }\n"
-        + " int com_amd_aparapi_test_ReturnPreIncInt__returnPreIncInt(This *this, int value){\n"
+        + " int com_aparapi_codegen_test_ReturnPreIncInt__returnPreIncInt(This *this, int value){\n"
         + " value++;\n"
         + " return(value);\n"
         + " }\n"
@@ -37,7 +37,7 @@ public class ReturnPreIncIntTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " This* this=&thisStruct;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " com_amd_aparapi_test_ReturnPreIncInt__returnPreIncInt(this, 3);\n"
+        + " com_aparapi_codegen_test_ReturnPreIncInt__returnPreIncInt(this, 3);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/StaticMethodCallTest.java b/src/test/java/com/aparapi/codegen/test/StaticMethodCallTest.java
index 5aa9af7fed2a87a8f0fb826ef4124f26e62d9933..50cff4c86d411939d2a60bc72398bbfdac7ad720 100644
--- a/src/test/java/com/aparapi/codegen/test/StaticMethodCallTest.java
+++ b/src/test/java/com/aparapi/codegen/test/StaticMethodCallTest.java
@@ -27,7 +27,7 @@ public class StaticMethodCallTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " int get_pass_id(This *this){\n"
         + " return this->passid;\n"
         + " }\n"
-        + " int com_amd_aparapi_test_StaticMethodCall__add(int i, int j){\n"
+        + " int com_aparapi_codegen_test_StaticMethodCall__add(int i, int j){\n"
         + " return((i + j));\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -39,7 +39,7 @@ public class StaticMethodCallTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " this->out = out;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " this->out[0]  = com_amd_aparapi_test_StaticMethodCall__add(1, 2);\n"
+        + " this->out[0]  = com_aparapi_codegen_test_StaticMethodCall__add(1, 2);\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/TernaryAndOrTest.java b/src/test/java/com/aparapi/codegen/test/TernaryAndOrTest.java
index e30b09f0b03da85657287b78032202a125643349..886e4a794cd4be500399a909d833444294c9a7df 100644
--- a/src/test/java/com/aparapi/codegen/test/TernaryAndOrTest.java
+++ b/src/test/java/com/aparapi/codegen/test/TernaryAndOrTest.java
@@ -26,7 +26,7 @@ public class TernaryAndOrTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " int get_pass_id(This *this){\n"
         + " return this->passid;\n"
         + " }\n"
-        + " float com_amd_aparapi_test_TernaryAndOr__random(This *this){\n"
+        + " float com_aparapi_codegen_test_TernaryAndOr__random(This *this){\n"
         + " return(0.1f);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -36,7 +36,7 @@ public class TernaryAndOrTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " This* this=&thisStruct;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " int count = (com_amd_aparapi_test_TernaryAndOr__random(this)==0.0f && com_amd_aparapi_test_TernaryAndOr__random(this)>0.8f || com_amd_aparapi_test_TernaryAndOr__random(this)<0.2f)?1:-1;\n"
+        + " int count = (com_aparapi_codegen_test_TernaryAndOr__random(this)==0.0f && com_aparapi_codegen_test_TernaryAndOr__random(this)>0.8f || com_aparapi_codegen_test_TernaryAndOr__random(this)<0.2f)?1:-1;\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/TernaryAndTest.java b/src/test/java/com/aparapi/codegen/test/TernaryAndTest.java
index 136cd056e466412edb894cae5a0ad8b8fe2523ad..e240822aa0911976a03828d8e91182b9a138c9ca 100644
--- a/src/test/java/com/aparapi/codegen/test/TernaryAndTest.java
+++ b/src/test/java/com/aparapi/codegen/test/TernaryAndTest.java
@@ -27,7 +27,7 @@ public class TernaryAndTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " float com_amd_aparapi_test_TernaryAnd__random(This *this){\n"
+        + " float com_aparapi_codegen_test_TernaryAnd__random(This *this){\n"
         + " return(0.1f);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -37,7 +37,7 @@ public class TernaryAndTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " This* this=&thisStruct;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " int count = (com_amd_aparapi_test_TernaryAnd__random(this)>0.8f && com_amd_aparapi_test_TernaryAnd__random(this)<0.2f)?1:-1;\n"
+        + " int count = (com_aparapi_codegen_test_TernaryAnd__random(this)>0.8f && com_aparapi_codegen_test_TernaryAnd__random(this)<0.2f)?1:-1;\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/TernaryOrTest.java b/src/test/java/com/aparapi/codegen/test/TernaryOrTest.java
index e977e88bab61afdcbb6bffb33a2b17447c3697c8..a6584cd2243908757f7db63e63fd76e8d4c61476 100644
--- a/src/test/java/com/aparapi/codegen/test/TernaryOrTest.java
+++ b/src/test/java/com/aparapi/codegen/test/TernaryOrTest.java
@@ -28,7 +28,7 @@ public class TernaryOrTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " float com_amd_aparapi_test_TernaryOr__random(This *this){\n"
+        + " float com_aparapi_codegen_test_TernaryOr__random(This *this){\n"
         + " return(0.1f);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -38,7 +38,7 @@ public class TernaryOrTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " This* this=&thisStruct;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " int count = (com_amd_aparapi_test_TernaryOr__random(this)>0.8f || com_amd_aparapi_test_TernaryOr__random(this)<0.2f)?1:-1;\n"
+        + " int count = (com_aparapi_codegen_test_TernaryOr__random(this)>0.8f || com_aparapi_codegen_test_TernaryOr__random(this)<0.2f)?1:-1;\n"
         + " return;\n"
         + " }\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/TernaryTest.java b/src/test/java/com/aparapi/codegen/test/TernaryTest.java
index 04ca55724c87820520c2d727b5d56588e3056d8a..5c584c4c51853ab4a3f1e69d885b68a43a0162f7 100644
--- a/src/test/java/com/aparapi/codegen/test/TernaryTest.java
+++ b/src/test/java/com/aparapi/codegen/test/TernaryTest.java
@@ -26,7 +26,7 @@ public class TernaryTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " int get_pass_id(This *this){\n"
         + " return this->passid;\n"
         + " }\n"
-        + " float com_amd_aparapi_test_Ternary__random(This *this){\n"
+        + " float com_aparapi_codegen_test_Ternary__random(This *this){\n"
         + " return(0.1f);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -36,7 +36,7 @@ public class TernaryTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " This* this=&thisStruct;\n"
         + " this->passid = passid;\n"
         + " {\n"
-        + " int count = (com_amd_aparapi_test_Ternary__random(this)>0.5f)?1:-1;\n"
+        + " int count = (com_aparapi_codegen_test_Ternary__random(this)>0.5f)?1:-1;\n"
         + " int foo = 3;\n"
         + " return;\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/UseObjectArrayLengthTest.java b/src/test/java/com/aparapi/codegen/test/UseObjectArrayLengthTest.java
index ab3df2f9c67c00b8d97f7ecacc2f3ecda5054292..fb3ef906cf6acf75ff30cfbbee8534b2010768dd 100644
--- a/src/test/java/com/aparapi/codegen/test/UseObjectArrayLengthTest.java
+++ b/src/test/java/com/aparapi/codegen/test/UseObjectArrayLengthTest.java
@@ -22,7 +22,7 @@ public class UseObjectArrayLengthTest extends com.aparapi.codegen.CodeGenJUnitBa
     private static final String[] expectedOpenCL = {
         "typedef struct This_s{\n"
         + " __global int *out;\n"
-        + " __global com_amd_aparapi_test_UseObjectArrayLength$Dummy *dummy;\n"
+        + " __global com_aparapi_codegen_test_UseObjectArrayLength$Dummy *dummy;\n"
         + " int dummy__javaArrayLength;\n"
         + " int passid;\n"
         + " }This;\n"
@@ -32,7 +32,7 @@ public class UseObjectArrayLengthTest extends com.aparapi.codegen.CodeGenJUnitBa
         + "\n"
         + " __kernel void run(\n"
         + " __global int *out,\n"
-        + " __global com_amd_aparapi_test_UseObjectArrayLength$Dummy *dummy,\n"
+        + " __global com_aparapi_codegen_test_UseObjectArrayLength$Dummy *dummy,\n"
         + " int dummy__javaArrayLength,\n"
         + " int passid\n"
         + " ){\n"
diff --git a/src/test/java/com/aparapi/codegen/test/UsesArrayLengthTest.java b/src/test/java/com/aparapi/codegen/test/UsesArrayLengthTest.java
index fcd5859b55a3272c34d154e1c1da2b98b9a13b8f..2f0e7fa1817fe372f230d2989b00e35cb57aee92 100644
--- a/src/test/java/com/aparapi/codegen/test/UsesArrayLengthTest.java
+++ b/src/test/java/com/aparapi/codegen/test/UsesArrayLengthTest.java
@@ -32,7 +32,7 @@ public class UsesArrayLengthTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " return this->passid;\n"
         + " }\n"
         + "\n"
-        + " char com_amd_aparapi_test_UsesArrayLength__actuallyDoIt(This *this, int index){\n"
+        + " char com_aparapi_codegen_test_UsesArrayLength__actuallyDoIt(This *this, int index){\n"
         + " int x = 0;\n"
         + " char y = this->values[(this->values__javaArrayLength - index)];\n"
         + " x = index + this->results__javaArrayLength;\n"
@@ -57,7 +57,7 @@ public class UsesArrayLengthTest extends com.aparapi.codegen.CodeGenJUnitBase {
         + " {\n"
         + " int myId = 0;\n"
         + " char x = (this->values__javaArrayLength>0)?1:0;\n"
-        + " this->results[myId]  = x & com_amd_aparapi_test_UsesArrayLength__actuallyDoIt(this, this->values__javaArrayLength);\n"
+        + " this->results[myId]  = x & com_aparapi_codegen_test_UsesArrayLength__actuallyDoIt(this, this->values__javaArrayLength);\n"
         + " this->results2[myId]  = (this->results[myId]==0)?1:0;\n"
         + " return;\n"
         + " }\n"
diff --git a/src/test/java/com/aparapi/codegen/test/WhileFloatCompoundTest.java b/src/test/java/com/aparapi/codegen/test/WhileFloatCompoundTest.java
index d11fa0b6ca27ee88c6a299e63c5eb5a5e3672974..86c07f4e3f2e420ae03fcc8f520760aa84a48031 100644
--- a/src/test/java/com/aparapi/codegen/test/WhileFloatCompoundTest.java
+++ b/src/test/java/com/aparapi/codegen/test/WhileFloatCompoundTest.java
@@ -26,7 +26,7 @@ public class WhileFloatCompoundTest extends com.aparapi.codegen.CodeGenJUnitBase
         + " int get_pass_id(This *this){\n"
         + " return this->passid;\n"
         + " }\n"
-        + " float com_amd_aparapi_test_WhileFloatCompound__randomFunc(This *this){\n"
+        + " float com_aparapi_codegen_test_WhileFloatCompound__randomFunc(This *this){\n"
         + " return(1.0f);\n"
         + " }\n"
         + " __kernel void run(\n"
@@ -40,8 +40,8 @@ public class WhileFloatCompoundTest extends com.aparapi.codegen.CodeGenJUnitBase
         + " float v2 = 0.0f;\n"
         + " float s = 1.0f;\n"
         + " for (; s<1.0f && s>0.0f; s = (v1 * v1) + (v2 * v2)){\n"
-        + " v1 = com_amd_aparapi_test_WhileFloatCompound__randomFunc(this);\n"
-        + " v2 = com_amd_aparapi_test_WhileFloatCompound__randomFunc(this);\n"
+        + " v1 = com_aparapi_codegen_test_WhileFloatCompound__randomFunc(this);\n"
+        + " v2 = com_aparapi_codegen_test_WhileFloatCompound__randomFunc(this);\n"
         + " }\n"
         + " return;\n"
         + " }\n"