diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 9a6d022a..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "OpenAM"]
-	path = OpenAM
-	url = https://github.com/OpenIdentityPlatform/OpenAM
diff --git a/OpenAM b/OpenAM
deleted file mode 160000
index 4d333c06..00000000
--- a/OpenAM
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4d333c0638fe9629880398081fccc95aa924ba92
diff --git a/jee-agents-agentapp/pom.xml b/jee-agents-agentapp/pom.xml
index b90bc7c4..f6491e96 100755
--- a/jee-agents-agentapp/pom.xml
+++ b/jee-agents-agentapp/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -34,7 +36,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -48,7 +50,7 @@
             <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
             <archive>
               <manifestEntries>
-                <Dependencies>org.forgerock.openam.agent</Dependencies>
+                <Dependencies>org.openidentityplatform.openam.agent</Dependencies>
               </manifestEntries>
             </archive>
           </configuration>
diff --git a/jee-agents-appserver/jee-agents-appserver-common/pom.xml b/jee-agents-appserver/jee-agents-appserver-common/pom.xml
index 1b5121bc..201206e3 100644
--- a/jee-agents-appserver/jee-agents-appserver-common/pom.xml
+++ b/jee-agents-appserver/jee-agents-appserver-common/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-appserver</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -68,7 +70,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-appserver/jee-agents-appserver-v81/pom.xml b/jee-agents-appserver/jee-agents-appserver-v81/pom.xml
index 6cc1d3d2..2974c297 100644
--- a/jee-agents-appserver/jee-agents-appserver-v81/pom.xml
+++ b/jee-agents-appserver/jee-agents-appserver-v81/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-appserver</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -78,8 +80,8 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-appserver-common</include>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-appserver-common</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -89,15 +91,15 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-appserver-common</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-appserver/pom.xml b/jee-agents-appserver/pom.xml
index 1fff66ae..cc4698fd 100755
--- a/jee-agents-appserver/pom.xml
+++ b/jee-agents-appserver/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-distribution/jee-agents-distribution-appserver-v10/pom.xml b/jee-agents-distribution/jee-agents-distribution-appserver-v10/pom.xml
index 056fbf6e..689ae35b 100644
--- a/jee-agents-distribution/jee-agents-distribution-appserver-v10/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-appserver-v10/pom.xml
@@ -15,12 +15,14 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -84,20 +86,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
          <dependency>
-             <groupId>org.forgerock.openam.agents</groupId>
+             <groupId>org.openidentityplatform.openam.agents</groupId>
              <artifactId>jee-agents-appserver-v81</artifactId>
          </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-appserver-ear</artifactId>
             <type>ear</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-appserver-v10/src/main/assembly/appserver-v10_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-appserver-v10/src/main/assembly/appserver-v10_KitAssembly_Descriptor.xml
index a4ac2c05..0d29ec87 100644
--- a/jee-agents-distribution/jee-agents-distribution-appserver-v10/src/main/assembly/appserver-v10_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-appserver-v10/src/main/assembly/appserver-v10_KitAssembly_Descriptor.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,8 +34,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
                 <include>commons-io:commons-io</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
@@ -43,7 +45,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-appserver-v81</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-appserver-v81</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -52,7 +54,7 @@
             <outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -61,7 +63,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -69,7 +71,7 @@
             <outputFileNameMapping>agentsample.ear</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-appserver-ear:ear</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-appserver-ear:ear</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/jee-agents-distribution-jboss-v42/pom.xml b/jee-agents-distribution/jee-agents-distribution-jboss-v42/pom.xml
index 121a7799..45a3bc38 100644
--- a/jee-agents-distribution/jee-agents-distribution-jboss-v42/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jboss-v42/pom.xml
@@ -15,12 +15,14 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -84,20 +86,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-jboss-v40</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jboss-ear</artifactId>
             <type>ear</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-jboss-v42/src/main/assembly/jboss-v42_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-jboss-v42/src/main/assembly/jboss-v42_KitAssembly_Descriptor.xml
index c4e2f4f5..92d8ac33 100644
--- a/jee-agents-distribution/jee-agents-distribution-jboss-v42/src/main/assembly/jboss-v42_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jboss-v42/src/main/assembly/jboss-v42_KitAssembly_Descriptor.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,8 +34,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -42,7 +44,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-jboss-v40</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-jboss-v40</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -51,7 +53,7 @@
             <outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -60,7 +62,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -68,7 +70,7 @@
             <outputFileNameMapping>agentsample.ear</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-jboss-ear:ear</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-jboss-ear:ear</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/jee-agents-distribution-jboss-v7/pom.xml b/jee-agents-distribution/jee-agents-distribution-jboss-v7/pom.xml
index d32b98a3..257d75f6 100644
--- a/jee-agents-distribution/jee-agents-distribution-jboss-v7/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jboss-v7/pom.xml
@@ -15,12 +15,14 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -84,20 +86,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
         <dependency>
-             <groupId>org.forgerock.openam.agents</groupId>
+             <groupId>org.openidentityplatform.openam.agents</groupId>
              <artifactId>jee-agents-jboss-v7</artifactId>
          </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jboss-ear</artifactId>
             <type>ear</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/config/configure.xml b/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/config/configure.xml
index f2bbb656..d0124da3 100644
--- a/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/config/configure.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/config/configure.xml
@@ -26,13 +26,14 @@
    $Id: configure.xml,v 1.2 2009/02/16 09:23:38 naghaon Exp $
 
    Portions Copyrighted 2013-2015 ForgeRock AS.
+   Portions copyright 2023 3A Systems LLC
 -->
 
 <configure>
     <class-prefix>
         <package type="system" name="com.sun.identity.install.tools.configurator" />
         <package type="common" name="com.sun.identity.agents.tools.jboss" />
-        <package type="custom" name="org.forgerock.openam.agents.jboss.install" />
+        <package type="custom" name="org.openidentityplatform.openam.agents.jboss.install" />
         <package type="agentsdk" name="com.sun.identity.agents.install.configurator" />
     </class-prefix>
     <welcome-message>
diff --git a/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/config/module.xml b/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/config/module.xml
index 94e2930f..c8f2954d 100644
--- a/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/config/module.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/config/module.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module xmlns="urn:jboss:module:1.0" name="org.forgerock.openam.agent">
+<module xmlns="urn:jboss:module:1.0" name="org.openidentityplatform.openam.agent">
 
     <dependencies>
       <module name="javax.servlet.api" />
diff --git a/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/jboss-v7_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/jboss-v7_KitAssembly_Descriptor.xml
index 4b14f6a8..c39f26d8 100644
--- a/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/jboss-v7_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jboss-v7/src/main/assembly/jboss-v7_KitAssembly_Descriptor.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,8 +34,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
                 <include>commons-io:commons-io</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
@@ -43,7 +45,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-jboss-v7</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-jboss-v7</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -52,7 +54,7 @@
             <outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -61,7 +63,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -69,7 +71,7 @@
             <outputFileNameMapping>agentsample.ear</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-jboss-ear:ear</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-jboss-ear:ear</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/jee-agents-distribution-jetty-v61/pom.xml b/jee-agents-distribution/jee-agents-distribution-jetty-v61/pom.xml
index f721f2eb..f79ae12f 100644
--- a/jee-agents-distribution/jee-agents-distribution-jetty-v61/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jetty-v61/pom.xml
@@ -15,12 +15,14 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -84,20 +86,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-jetty-v61</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jetty</artifactId>
             <type>war</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-jetty-v61/src/main/assembly/jetty-v61_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-jetty-v61/src/main/assembly/jetty-v61_KitAssembly_Descriptor.xml
index 1316ea4b..db3993e3 100644
--- a/jee-agents-distribution/jee-agents-distribution-jetty-v61/src/main/assembly/jetty-v61_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jetty-v61/src/main/assembly/jetty-v61_KitAssembly_Descriptor.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,8 +34,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -42,7 +44,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-jetty-v61</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-jetty-v61</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -51,7 +53,7 @@
             <outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -60,7 +62,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -68,7 +70,7 @@
             <outputFileNameMapping>agentsample.war</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-jetty:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-jetty:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/jee-agents-distribution-jetty-v7/pom.xml b/jee-agents-distribution/jee-agents-distribution-jetty-v7/pom.xml
index c811e3de..4a5b0265 100644
--- a/jee-agents-distribution/jee-agents-distribution-jetty-v7/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jetty-v7/pom.xml
@@ -15,12 +15,14 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -84,20 +86,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
          <dependency>
-             <groupId>org.forgerock.openam.agents</groupId>
+             <groupId>org.openidentityplatform.openam.agents</groupId>
              <artifactId>jee-agents-jetty-v7</artifactId>
          </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jetty</artifactId>
             <type>war</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-jetty-v7/src/main/assembly/jetty-v7_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-jetty-v7/src/main/assembly/jetty-v7_KitAssembly_Descriptor.xml
index 2bfd150a..a805783f 100644
--- a/jee-agents-distribution/jee-agents-distribution-jetty-v7/src/main/assembly/jetty-v7_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jetty-v7/src/main/assembly/jetty-v7_KitAssembly_Descriptor.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,8 +34,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -42,7 +44,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-jetty-v7</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-jetty-v7</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -51,7 +53,7 @@
             <outputFileNameMapping>openamclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -60,7 +62,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -68,7 +70,7 @@
             <outputFileNameMapping>agentsample.war</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-jetty:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-jetty:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/jee-agents-distribution-jsr196/pom.xml b/jee-agents-distribution/jee-agents-distribution-jsr196/pom.xml
index 6adff1bd..d3ad7f20 100644
--- a/jee-agents-distribution/jee-agents-distribution-jsr196/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jsr196/pom.xml
@@ -15,12 +15,14 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -84,20 +86,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-jsr196</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jsr196-ear</artifactId>
             <type>ear</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-jsr196/src/main/assembly/jsr196_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-jsr196/src/main/assembly/jsr196_KitAssembly_Descriptor.xml
index 2bd6a9a8..11886523 100644
--- a/jee-agents-distribution/jee-agents-distribution-jsr196/src/main/assembly/jsr196_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-jsr196/src/main/assembly/jsr196_KitAssembly_Descriptor.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,8 +34,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -42,7 +44,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-jsr196</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-jsr196</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -51,7 +53,7 @@
             <outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -60,7 +62,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -68,7 +70,7 @@
             <outputFileNameMapping>agentsample.ear</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-jsr196-ear:ear</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-jsr196-ear:ear</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/jee-agents-distribution-tomcat-v6/pom.xml b/jee-agents-distribution/jee-agents-distribution-tomcat-v6/pom.xml
index 90b029ad..317b1d39 100644
--- a/jee-agents-distribution/jee-agents-distribution-tomcat-v6/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-tomcat-v6/pom.xml
@@ -15,12 +15,14 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -84,20 +86,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
          <dependency>
-             <groupId>org.forgerock.openam.agents</groupId>
+             <groupId>org.openidentityplatform.openam.agents</groupId>
              <artifactId>jee-agents-tomcat-v6</artifactId>
          </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-tomcat</artifactId>
             <type>war</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-tomcat-v6/src/main/assembly/tomcat-v6_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-tomcat-v6/src/main/assembly/tomcat-v6_KitAssembly_Descriptor.xml
index e752e26b..28b29a1b 100644
--- a/jee-agents-distribution/jee-agents-distribution-tomcat-v6/src/main/assembly/tomcat-v6_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-tomcat-v6/src/main/assembly/tomcat-v6_KitAssembly_Descriptor.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,8 +34,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
                 <include>commons-io:commons-io</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
@@ -43,7 +45,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-tomcat-v6</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-tomcat-v6</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -52,7 +54,7 @@
             <outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -61,7 +63,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -69,7 +71,7 @@
             <outputFileNameMapping>agentsample.war</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-tomcat:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-tomcat:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/jee-agents-distribution-weblogic-v10/pom.xml b/jee-agents-distribution/jee-agents-distribution-weblogic-v10/pom.xml
index f443fc85..d123f9f7 100644
--- a/jee-agents-distribution/jee-agents-distribution-weblogic-v10/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-weblogic-v10/pom.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -22,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
@@ -86,20 +88,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-weblogic-v10</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-weblogic-ear</artifactId>
             <type>ear</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-weblogic-v10/src/main/assembly/weblogic-v10_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-weblogic-v10/src/main/assembly/weblogic-v10_KitAssembly_Descriptor.xml
index 6915322a..dbf19309 100644
--- a/jee-agents-distribution/jee-agents-distribution-weblogic-v10/src/main/assembly/weblogic-v10_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-weblogic-v10/src/main/assembly/weblogic-v10_KitAssembly_Descriptor.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -32,8 +34,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -42,7 +44,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-weblogic-v10</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-weblogic-v10</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -51,7 +53,7 @@
             <outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -60,7 +62,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -68,7 +70,7 @@
             <outputFileNameMapping>agentsample.ear</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-weblogic-ear:ear</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-weblogic-ear:ear</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/jee-agents-distribution-websphere-v61/pom.xml b/jee-agents-distribution/jee-agents-distribution-websphere-v61/pom.xml
index a4454f6f..7017b9f2 100644
--- a/jee-agents-distribution/jee-agents-distribution-websphere-v61/pom.xml
+++ b/jee-agents-distribution/jee-agents-distribution-websphere-v61/pom.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -22,7 +24,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-distribution</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
@@ -86,20 +88,20 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-agentapp</artifactId>
             <type>war</type>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-websphere-v61</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-websphere-ear</artifactId>
             <type>ear</type>
         </dependency>
diff --git a/jee-agents-distribution/jee-agents-distribution-websphere-v61/src/main/assembly/websphere-v61_KitAssembly_Descriptor.xml b/jee-agents-distribution/jee-agents-distribution-websphere-v61/src/main/assembly/websphere-v61_KitAssembly_Descriptor.xml
index e87b3ce5..d393284a 100644
--- a/jee-agents-distribution/jee-agents-distribution-websphere-v61/src/main/assembly/websphere-v61_KitAssembly_Descriptor.xml
+++ b/jee-agents-distribution/jee-agents-distribution-websphere-v61/src/main/assembly/websphere-v61_KitAssembly_Descriptor.xml
@@ -32,8 +32,8 @@
             <outputDirectory>lib</outputDirectory>
             <!-- Include fully packaged Modules -->
             <includes>
-                <include>org.forgerock.openam:openam-installtools</include>
-                <include>org.forgerock.openam:openam-installtools-launcher</include>
+                <include>org.openidentityplatform.openam:openam-installtools</include>
+                <include>org.openidentityplatform.openam:openam-installtools-launcher</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -42,7 +42,7 @@
             <outputFileNameMapping>agent.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-websphere-v61</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-websphere-v61</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -51,7 +51,7 @@
             <outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
             <outputDirectory>lib</outputDirectory>
             <includes>
-                <include>org.forgerock.openam:openam-clientsdk</include>
+                <include>org.openidentityplatform.openam:openam-clientsdk</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -60,7 +60,7 @@
             <outputFileNameMapping>agentapp.war</outputFileNameMapping>
             <outputDirectory>etc</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
@@ -68,7 +68,7 @@
             <outputFileNameMapping>agentsample.ear</outputFileNameMapping>
             <outputDirectory>sampleapp/dist</outputDirectory>
             <includes>
-                <include>org.forgerock.openam.agents:jee-agents-sampleapp-websphere-ear:ear</include>
+                <include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-websphere-ear:ear</include>
             </includes>
             <useProjectArtifact>false</useProjectArtifact>
         </dependencySet>
diff --git a/jee-agents-distribution/pom.xml b/jee-agents-distribution/pom.xml
index 764b7ccf..aa27b9fc 100644
--- a/jee-agents-distribution/pom.xml
+++ b/jee-agents-distribution/pom.xml
@@ -15,12 +15,14 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-jboss/jee-agents-jboss-common/pom.xml b/jee-agents-jboss/jee-agents-jboss-common/pom.xml
index 9f6e84c0..4f25eea5 100644
--- a/jee-agents-jboss/jee-agents-jboss-common/pom.xml
+++ b/jee-agents-jboss/jee-agents-jboss-common/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-jboss</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -68,11 +70,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-jboss/jee-agents-jboss-v40/pom.xml b/jee-agents-jboss/jee-agents-jboss-v40/pom.xml
index a64dccb3..a50a2556 100644
--- a/jee-agents-jboss/jee-agents-jboss-v40/pom.xml
+++ b/jee-agents-jboss/jee-agents-jboss-v40/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-jboss</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -78,8 +80,8 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-jboss-common</include>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-jboss-common</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -89,15 +91,15 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-jboss-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-jboss/jee-agents-jboss-v7/pom.xml b/jee-agents-jboss/jee-agents-jboss-v7/pom.xml
index 26cfb375..064c0ef5 100644
--- a/jee-agents-jboss/jee-agents-jboss-v7/pom.xml
+++ b/jee-agents-jboss/jee-agents-jboss-v7/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-jboss</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -78,8 +80,8 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-jboss-common</include>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-jboss-common</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -89,7 +91,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
             <!-- Remove reference to older version of the Servlet API -->
             <exclusions>
@@ -100,11 +102,11 @@
             </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-jboss-common</artifactId>
         </dependency>
         <!-- Include newer Servlet API required by JBoss v7 agent. -->
diff --git a/jee-agents-jboss/pom.xml b/jee-agents-jboss/pom.xml
index 41d027da..1d2ec24d 100755
--- a/jee-agents-jboss/pom.xml
+++ b/jee-agents-jboss/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-jetty/jee-agents-jetty-v61/pom.xml b/jee-agents-jetty/jee-agents-jetty-v61/pom.xml
index 5b5d84c7..0b7b1af6 100644
--- a/jee-agents-jetty/jee-agents-jetty-v61/pom.xml
+++ b/jee-agents-jetty/jee-agents-jetty-v61/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-jetty</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -78,7 +80,7 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -88,11 +90,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-jetty/jee-agents-jetty-v7/pom.xml b/jee-agents-jetty/jee-agents-jetty-v7/pom.xml
index eaf18622..097abb52 100644
--- a/jee-agents-jetty/jee-agents-jetty-v7/pom.xml
+++ b/jee-agents-jetty/jee-agents-jetty-v7/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-jetty</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -78,7 +80,7 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -88,11 +90,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-jetty/pom.xml b/jee-agents-jetty/pom.xml
index 9947b7b5..90649e5a 100755
--- a/jee-agents-jetty/pom.xml
+++ b/jee-agents-jetty/pom.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -22,7 +24,7 @@
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-jsr196/pom.xml b/jee-agents-jsr196/pom.xml
index 5a8a47f1..17fd2db7 100755
--- a/jee-agents-jsr196/pom.xml
+++ b/jee-agents-jsr196/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -77,7 +79,7 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -88,15 +90,15 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-clientsdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-ear/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-ear/pom.xml
index 1cd2bfac..d60b2b88 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-ear/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-ear/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-appserver</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -40,13 +42,13 @@
                 <configuration>
                     <modules>
                         <webModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-appserver-war</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentservlets.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-appserver-ejb</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentejb.jar</bundleFileName>
@@ -59,13 +61,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-appserver-war</artifactId>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-appserver-ejb</artifactId>
             <type>ejb</type>
             <scope>provided</scope>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-ejb/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-ejb/pom.xml
index 9348d106..40071771 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-ejb/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-ejb/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-appserver</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -46,7 +48,7 @@
                         <configuration>
                             <filters>
                                 <filter>
-                                    <artifact>org.forgerock.openam.agents:jee-agents-sampleapp-ejb</artifact>
+                                    <artifact>org.openidentityplatform.openam.agents:jee-agents-sampleapp-ejb</artifact>
                                     <includes>
                                         <include>**/*.class</include>
                                     </includes>
@@ -65,7 +67,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-war/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-war/pom.xml
index b2f91fba..2ef2d739 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-war/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-appserver/jee-agents-sampleapp-appserver-war/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-appserver</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -77,17 +79,17 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-webservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejbservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-appserver/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-appserver/pom.xml
index 814f2dc6..70af55b2 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-appserver/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-appserver/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-ejb/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-ejb/pom.xml
index 7cbefa12..8c6ae448 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-ejb/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-ejb/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-ejbservlet/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-ejbservlet/pom.xml
index f6a8d904..fd4697ad 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-ejbservlet/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-ejbservlet/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -68,11 +70,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-webservlet</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-ear/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-ear/pom.xml
index cb8de49e..912f9fb4 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-ear/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-ear/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-jboss</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -40,13 +42,13 @@
                 <configuration>
                     <modules>
                         <webModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-jboss-war</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentservlets.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-jboss-ejb</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentejb.jar</bundleFileName>
@@ -59,13 +61,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jboss-war</artifactId>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jboss-ejb</artifactId>
             <type>ejb</type>
             <scope>provided</scope>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-ejb/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-ejb/pom.xml
index 4d28c72e..5b46d61f 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-ejb/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-ejb/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-jboss</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -46,7 +48,7 @@
                         <configuration>
                             <filters>
                                 <filter>
-                                    <artifact>org.forgerock.openam.agents:jee-agents-sampleapp-ejb</artifact>
+                                    <artifact>org.openidentityplatform.openam.agents:jee-agents-sampleapp-ejb</artifact>
                                     <includes>
                                         <include>**/*.class</include>
                                     </includes>
@@ -65,7 +67,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-war/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-war/pom.xml
index e9a84b72..87dffab8 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-war/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jboss/jee-agents-sampleapp-jboss-war/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-jboss</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -40,7 +42,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Dependencies>org.forgerock.openam.agent</Dependencies>
+                            <Dependencies>org.openidentityplatform.openam.agent</Dependencies>
                         </manifestEntries>
                     </archive>
                     <webResources>
@@ -82,17 +84,17 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-webservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejbservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jboss/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jboss/pom.xml
index 39c95b1a..c55b18e8 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jboss/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jboss/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jetty/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jetty/pom.xml
index f527b5e9..66f0f56b 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jetty/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jetty/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -78,7 +80,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-webservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-ear/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-ear/pom.xml
index c158c866..71f2d9ff 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-ear/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-ear/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-jsr196</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -40,13 +42,13 @@
                 <configuration>
                     <modules>
                         <webModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-jsr196-war</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentservlets.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-jsr196-ejb</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentejb.jar</bundleFileName>
@@ -59,13 +61,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jsr196-war</artifactId>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-jsr196-ejb</artifactId>
             <type>ejb</type>
             <scope>provided</scope>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-ejb/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-ejb/pom.xml
index 095e6bc2..c6626efa 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-ejb/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-ejb/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-jsr196</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -46,7 +48,7 @@
                         <configuration>
                             <filters>
                                 <filter>
-                                    <artifact>org.forgerock.openam.agents:jee-agents-sampleapp-ejb</artifact>
+                                    <artifact>org.openidentityplatform.openam.agents:jee-agents-sampleapp-ejb</artifact>
                                     <includes>
                                         <include>**/*.class</include>
                                     </includes>
@@ -65,7 +67,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-war/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-war/pom.xml
index d0b61114..a6fa2d06 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-war/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/jee-agents-sampleapp-jsr196-war/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-jsr196</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -77,17 +79,17 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-webservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejbservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/pom.xml
index a542b272..0f75bbca 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-jsr196/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-tomcat/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-tomcat/pom.xml
index f94966a0..cffa9c2e 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-tomcat/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-tomcat/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -78,7 +80,7 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-webservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-ear/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-ear/pom.xml
index 4846e741..2ccd2afb 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-ear/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-ear/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-weblogic</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -40,13 +42,13 @@
                 <configuration>
                     <modules>
                         <webModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-weblogic-war</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentservlets.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-weblogic-ejb</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentejb.jar</bundleFileName>
@@ -59,13 +61,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-weblogic-war</artifactId>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-weblogic-ejb</artifactId>
             <type>ejb</type>
             <scope>provided</scope>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-ejb/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-ejb/pom.xml
index 51c5b103..8723ac76 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-ejb/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-ejb/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-weblogic</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -46,7 +48,7 @@
                         <configuration>
                             <filters>
                                 <filter>
-                                    <artifact>org.forgerock.openam.agents:jee-agents-sampleapp-ejb</artifact>
+                                    <artifact>org.openidentityplatform.openam.agents:jee-agents-sampleapp-ejb</artifact>
                                     <includes>
                                         <include>**/*.class</include>
                                     </includes>
@@ -65,7 +67,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-war/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-war/pom.xml
index 4f68ffa2..10d5ca31 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-war/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/jee-agents-sampleapp-weblogic-war/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-weblogic</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -76,17 +78,17 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-webservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejbservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/pom.xml
index 6793d4bd..7c0625c3 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-weblogic/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-webservlet/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-webservlet/pom.xml
index 88df272b..b9fb818c 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-webservlet/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-webservlet/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-ear/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-ear/pom.xml
index a1737ccb..4ba20004 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-ear/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-ear/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-websphere</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -40,13 +42,13 @@
                 <configuration>
                     <modules>
                         <webModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-websphere-war</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentservlets.war</bundleFileName>
                         </webModule>
                         <ejbModule>
-                            <groupId>org.forgerock.openam.agents</groupId>
+                            <groupId>org.openidentityplatform.openam.agents</groupId>
                             <artifactId>jee-agents-sampleapp-websphere-ejb</artifactId>
                             <!-- To match the value in the application.xml -->
                             <bundleFileName>agentejb.jar</bundleFileName>
@@ -59,13 +61,13 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-websphere-war</artifactId>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-websphere-ejb</artifactId>
             <type>ejb</type>
             <scope>provided</scope>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-ejb/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-ejb/pom.xml
index e00f8e9a..4c2926fe 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-ejb/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-ejb/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-websphere</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -46,7 +48,7 @@
                         <configuration>
                             <filters>
                                 <filter>
-                                    <artifact>org.forgerock.openam.agents:jee-agents-sampleapp-ejb</artifact>
+                                    <artifact>org.openidentityplatform.openam.agents:jee-agents-sampleapp-ejb</artifact>
                                     <includes>
                                         <include>**/*.class</include>
                                     </includes>
@@ -65,7 +67,7 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>runtime</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-war/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-war/pom.xml
index 65918d11..547f3437 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-war/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-websphere/jee-agents-sampleapp-websphere-war/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp-websphere</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -77,17 +79,17 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-webservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejbservlet</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sampleapp-ejb</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/jee-agents-sampleapp/jee-agents-sampleapp-websphere/pom.xml b/jee-agents-sampleapp/jee-agents-sampleapp-websphere/pom.xml
index ab2b4c1b..c0a932c9 100644
--- a/jee-agents-sampleapp/jee-agents-sampleapp-websphere/pom.xml
+++ b/jee-agents-sampleapp/jee-agents-sampleapp-websphere/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-sampleapp</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-sampleapp/pom.xml b/jee-agents-sampleapp/pom.xml
index d11e8b9b..6c3e5104 100755
--- a/jee-agents-sampleapp/pom.xml
+++ b/jee-agents-sampleapp/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-sdk/pom.xml b/jee-agents-sdk/pom.xml
index c86f417f..47f88d36 100644
--- a/jee-agents-sdk/pom.xml
+++ b/jee-agents-sdk/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -140,15 +142,15 @@
         </dependency>
         <!-- OpenAM project dependencies -->
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-clientsdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools-launcher</artifactId>
         </dependency>
     </dependencies>
diff --git a/jee-agents-tomcat/jee-agents-tomcat-test/pom.xml b/jee-agents-tomcat/jee-agents-tomcat-test/pom.xml
index 423d8ee3..df2d0d8a 100644
--- a/jee-agents-tomcat/jee-agents-tomcat-test/pom.xml
+++ b/jee-agents-tomcat/jee-agents-tomcat-test/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
 
  	<parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-tomcat</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
@@ -21,12 +21,12 @@
 
     <dependencies>
     	<dependency>
-    		<groupId>org.forgerock.openam.agents</groupId>
+    		<groupId>org.openidentityplatform.openam.agents</groupId>
     		<artifactId>jee-agents-sdk</artifactId>
     		<version>4.0.0-SNAPSHOT</version>
     	</dependency>
     	<dependency>
-    		<groupId>org.forgerock.openam.agents</groupId>
+    		<groupId>org.openidentityplatform.openam.agents</groupId>
     		<artifactId>jee-agents-tomcat-v6</artifactId>
     		<version>4.0.0-SNAPSHOT</version>
     	</dependency>
diff --git a/jee-agents-tomcat/jee-agents-tomcat-v6/pom.xml b/jee-agents-tomcat/jee-agents-tomcat-v6/pom.xml
index 5777a363..fc51d32f 100644
--- a/jee-agents-tomcat/jee-agents-tomcat-v6/pom.xml
+++ b/jee-agents-tomcat/jee-agents-tomcat-v6/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-tomcat</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
@@ -78,7 +80,7 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -98,11 +100,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-tomcat/pom.xml b/jee-agents-tomcat/pom.xml
index 76cceb04..0e331250 100755
--- a/jee-agents-tomcat/pom.xml
+++ b/jee-agents-tomcat/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.1.5-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-weblogic/jee-agents-weblogic-v10/pom.xml b/jee-agents-weblogic/jee-agents-weblogic-v10/pom.xml
index 492b0a00..bc9d3a11 100644
--- a/jee-agents-weblogic/jee-agents-weblogic-v10/pom.xml
+++ b/jee-agents-weblogic/jee-agents-weblogic-v10/pom.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -22,7 +24,7 @@
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-weblogic</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
@@ -79,7 +81,7 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -89,11 +91,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-weblogic/pom.xml b/jee-agents-weblogic/pom.xml
index c5736b03..564bc308 100755
--- a/jee-agents-weblogic/pom.xml
+++ b/jee-agents-weblogic/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
diff --git a/jee-agents-websphere/jee-agents-websphere-common/pom.xml b/jee-agents-websphere/jee-agents-websphere-common/pom.xml
index 503bbe2f..60fa68f2 100644
--- a/jee-agents-websphere/jee-agents-websphere-common/pom.xml
+++ b/jee-agents-websphere/jee-agents-websphere-common/pom.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -22,7 +24,7 @@
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-websphere</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
@@ -69,15 +71,15 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-sdk</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-clientsdk</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-websphere/jee-agents-websphere-v61/pom.xml b/jee-agents-websphere/jee-agents-websphere-v61/pom.xml
index 9ddfc0dc..f101ea10 100644
--- a/jee-agents-websphere/jee-agents-websphere-v61/pom.xml
+++ b/jee-agents-websphere/jee-agents-websphere-v61/pom.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -22,7 +24,7 @@
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents-websphere</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
@@ -79,8 +81,8 @@
                 <configuration>
                     <artifactSet>
                         <includes>
-                            <include>org.forgerock.openam.agents:jee-agents-websphere-common</include>
-                            <include>org.forgerock.openam.agents:jee-agents-sdk</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-websphere-common</include>
+                            <include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
                             <include>org.owasp.esapi:esapiport</include>
                         </includes>
                     </artifactSet>
@@ -90,11 +92,11 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.forgerock.openam</groupId>
+            <groupId>org.openidentityplatform.openam</groupId>
             <artifactId>openam-installtools</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.forgerock.openam.agents</groupId>
+            <groupId>org.openidentityplatform.openam.agents</groupId>
             <artifactId>jee-agents-websphere-common</artifactId>
         </dependency>
         <dependency>
diff --git a/jee-agents-websphere/pom.xml b/jee-agents-websphere/pom.xml
index 9176739d..e680603c 100755
--- a/jee-agents-websphere/pom.xml
+++ b/jee-agents-websphere/pom.xml
@@ -15,13 +15,15 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <!-- Parent Project -->
     <parent>
-        <groupId>org.forgerock.openam.agents</groupId>
+        <groupId>org.openidentityplatform.openam.agents</groupId>
         <artifactId>jee-agents</artifactId>
         <version>4.0.0-SNAPSHOT</version>
     </parent>
diff --git a/pom.xml b/pom.xml
index 32a90851..b875fd3c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,8 @@
  * Header, with the fields enclosed by brackets [] replaced by your own identifying
  * information: "Portions copyright [year] [name of copyright owner]".
  *
+ * Portions copyright 2023 3A Systems LLC
+ *
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -22,12 +24,12 @@
     <!-- Component Definition -->
     <name>OpenAM JavaEE Policy Agents</name>
     <description>OpenAM JavaEE Policy Agents</description>
-    <groupId>org.forgerock.openam.agents</groupId>
+    <groupId>org.openidentityplatform.openam.agents</groupId>
     <artifactId>jee-agents</artifactId>
     <version>4.1.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <properties>
-        <openam.version>14.4.2-SNAPSHOT</openam.version>
+        <openam.version>14.7.4-SNAPSHOT</openam.version>
 <!--         <websphere.libraries.v61.system.path>/var/tmp/extlib/websphere/v61</websphere.libraries.v61.system.path> -->
 <!--         <com.ibm.ws.runtime.v61.version>6.1.0</com.ibm.ws.runtime.v61.version> -->
 <!--         <weblogic.libraries.v10.system.path>/var/tmp/extlib/weblogic/v10</weblogic.libraries.v10.system.path> -->
@@ -59,6 +61,13 @@
         <url>https://github.com/OpenIdentityPlatform/OpenAM-JEE-Agents</url>
       	<tag>HEAD</tag>
   	</scm>
+    <repositories>
+        <repository>
+            <id>jboss-nexus-public</id>
+            <name>JBoss Nexus Public Repository</name>
+            <url>https://repository.jboss.org/nexus/content/groups/public/</url>
+        </repository>
+    </repositories>
     <build>
         <pluginManagement>
             <plugins>
@@ -103,189 +112,189 @@
         <dependencies>
             <!-- Project dependencies -->
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sdk</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-appserver-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-agentapp</artifactId>
                  <type>war</type>
                  <version>${project.version}</version>
              </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-appserver-v81</artifactId>
                  <version>${project.version}</version>
              </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-appserver-ear</artifactId>
                 <version>${project.version}</version>
                 <type>ear</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-jboss-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-jboss-v7</artifactId>
                  <version>${project.version}</version>
              </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-jboss-v40</artifactId>
                  <version>${project.version}</version>
              </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-jboss-ear</artifactId>
                 <version>${project.version}</version>
                 <type>ear</type>
             </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-jetty-v7</artifactId>
                  <version>${project.version}</version>
              </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-jetty-v61</artifactId>
                  <version>${project.version}</version>
              </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-jetty</artifactId>
                 <version>${project.version}</version>
                 <type>war</type>
             </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-jsr196</artifactId>
                  <version>${project.version}</version>
              </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-sampleapp-jsr196-ear</artifactId>
                  <version>${project.version}</version>
                  <type>ear</type>
              </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-tomcat-v6</artifactId>
                  <version>${project.version}</version>
              </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-tomcat</artifactId>
                 <type>war</type>
                 <version>${project.version}</version>
             </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-weblogic-v10</artifactId>
                  <version>${project.version}</version>
              </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-weblogic-ear</artifactId>
                 <version>${project.version}</version>
                 <type>ear</type>
             </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-websphere-v61</artifactId>
                  <version>${project.version}</version>
              </dependency>
              <dependency>
-                 <groupId>org.forgerock.openam.agents</groupId>
+                 <groupId>org.openidentityplatform.openam.agents</groupId>
                  <artifactId>jee-agents-sampleapp-websphere-ear</artifactId>
                  <version>${project.version}</version>
                  <type>ear</type>
              </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-websphere-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-webservlet</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-ejb</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-ejbservlet</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-appserver-war</artifactId>
                 <version>${project.version}</version>
                 <type>war</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-appserver-ejb</artifactId>
                 <version>${project.version}</version>
                 <type>ejb</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-jboss-war</artifactId>
                 <version>${project.version}</version>
                 <type>war</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-jboss-ejb</artifactId>
                 <version>${project.version}</version>
                 <type>ejb</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-jsr196-war</artifactId>
                 <version>${project.version}</version>
                 <type>war</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-jsr196-ejb</artifactId>
                 <version>${project.version}</version>
                 <type>ejb</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-weblogic-war</artifactId>
                 <version>${project.version}</version>
                 <type>war</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-weblogic-ejb</artifactId>
                 <version>${project.version}</version>
                 <type>ejb</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-websphere-war</artifactId>
                 <version>${project.version}</version>
                 <type>war</type>
             </dependency>
             <dependency>
-                <groupId>org.forgerock.openam.agents</groupId>
+                <groupId>org.openidentityplatform.openam.agents</groupId>
                 <artifactId>jee-agents-sampleapp-websphere-ejb</artifactId>
                 <version>${project.version}</version>
                 <type>ejb</type>
@@ -469,7 +478,7 @@
 
             <!-- OpenAM project dependencies -->
             <dependency>
-            			<groupId>org.forgerock.openam</groupId>
+            			<groupId>org.openidentityplatform.openam</groupId>
 			        <artifactId>openam</artifactId>
 			        <version>${openam.version}</version>
 			        <type>pom</type>