diff --git a/external/tck/jsonp/installer/pom.xml b/external/coreprofile-tck/jsonp/installer/pom.xml
similarity index 92%
rename from external/tck/jsonp/installer/pom.xml
rename to external/coreprofile-tck/jsonp/installer/pom.xml
index 7dfffdc0d..8aaf566ff 100644
--- a/external/tck/jsonp/installer/pom.xml
+++ b/external/coreprofile-tck/jsonp/installer/pom.xml
@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.tck.jsonp</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck.jsonp</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>piranha-external-tck-jsonp-installer</artifactId>
+    <artifactId>piranha-external-coreprofiletck-jsonp-installer</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - JSON Processing - Installer</name>
+    <name>Piranha - External - Core Profile TCK - JSON Processing - Installer</name>
 
     <properties>
         <tck.home>${project.build.directory}/tck</tck.home>
diff --git a/external/tck/jsonp/pom.xml b/external/coreprofile-tck/jsonp/pom.xml
similarity index 82%
rename from external/tck/jsonp/pom.xml
rename to external/coreprofile-tck/jsonp/pom.xml
index fe91c2827..c0e3e521a 100644
--- a/external/tck/jsonp/pom.xml
+++ b/external/coreprofile-tck/jsonp/pom.xml
@@ -4,16 +4,16 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.tck</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <groupId>cloud.piranha.external.tck.jsonp</groupId>
+    <groupId>cloud.piranha.external.coreprofiletck.jsonp</groupId>
     <artifactId>project</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - JSON Processing - Project</name>
+    <name>Piranha - External - Core Profile TCK - JSON Processing - Project</name>
 
     <properties>
         <jsonp.tck.version>2.1.1</jsonp.tck.version>
diff --git a/external/tck/jsonp/runner/pom.xml b/external/coreprofile-tck/jsonp/runner/pom.xml
similarity index 87%
rename from external/tck/jsonp/runner/pom.xml
rename to external/coreprofile-tck/jsonp/runner/pom.xml
index 22c1a9d10..41035d535 100644
--- a/external/tck/jsonp/runner/pom.xml
+++ b/external/coreprofile-tck/jsonp/runner/pom.xml
@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>cloud.piranha.external.tck.jsonp</groupId>
+        <groupId>cloud.piranha.external.coreprofiletck.jsonp</groupId>
         <artifactId>project</artifactId>
         <version>25.1.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>cloud-piranha-external-tck-jsonp-runner</artifactId>
+    <artifactId>cloud-piranha-external-coreprofiletck-jsonp-runner</artifactId>
     <packaging>pom</packaging>
 
-    <name>Piranha - External - TCK - JSON Processing - Runner</name>
+    <name>Piranha - External - Core Profile TCK - JSON Processing - Runner</name>
 
     <properties>
         <tck.home>${project.build.directory}/../../installer/target/tck</tck.home>
@@ -31,8 +31,8 @@
     </dependencyManagement>
     <dependencies>
         <dependency>
-            <groupId>cloud.piranha.external.tck.jsonp</groupId>
-            <artifactId>piranha-external-tck-jsonp-installer</artifactId>
+            <groupId>cloud.piranha.external.coreprofiletck.jsonp</groupId>
+            <artifactId>piranha-external-coreprofiletck-jsonp-installer</artifactId>
             <version>${project.version}</version>
             <type>pom</type>
         </dependency>
diff --git a/external/tck/pom.xml b/external/tck/pom.xml
index 243ef3d4e..3ae0a9f84 100644
--- a/external/tck/pom.xml
+++ b/external/tck/pom.xml
@@ -18,7 +18,6 @@
     <modules>
         <module>cdi</module>
         <module>coreprofile</module>
-        <module>jsonp</module>
         <module>jwt</module>
         <module>server</module>
     </modules>