diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/ClusterITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java
similarity index 95%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/ClusterITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java
index 03912a6..9794619 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/ClusterITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/ClusterITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin;
+package org.glassfish.main.admin.test;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -24,15 +24,15 @@
 import java.net.URL;
 import java.net.URLConnection;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
 import static java.nio.charset.StandardCharsets.ISO_8859_1;
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.stringContainsInOrder;
 import static org.junit.jupiter.api.Assertions.fail;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/MiscCommandsITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/MiscCommandsITest.java
similarity index 87%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/MiscCommandsITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/MiscCommandsITest.java
index 66f27e7..330638e 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/MiscCommandsITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/MiscCommandsITest.java
@@ -15,17 +15,19 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin;
+package org.glassfish.main.admin.test;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
+
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.MatcherAssert.assertThat;
 
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/OSGiCommandsITest.java
similarity index 93%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/OSGiCommandsITest.java
index c7bf5b0..81c74af 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/OSGiCommandsITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/OSGiCommandsITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin;
+package org.glassfish.main.admin.test;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -26,13 +26,13 @@
 import java.util.List;
 import java.util.Set;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.AsadminResult;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.AsadminResult;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.hamcrest.collection.IsEmptyCollection;
 import org.junit.jupiter.api.Test;
 
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.not;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/RestITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/RestITest.java
similarity index 96%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/RestITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/RestITest.java
index 700048b..43945ef 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/RestITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/RestITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin;
+package org.glassfish.main.admin.test;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
@@ -23,7 +23,7 @@
 
 import org.junit.jupiter.api.Test;
 
-import static org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment.openConnection;
+import static org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment.openConnection;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/DetachAttachITest.java
similarity index 94%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/DetachAttachITest.java
index d76d7a8..0c7d3e5 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/DetachAttachITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/DetachAttachITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.progress;
+package org.glassfish.main.admin.test.progress;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -32,12 +32,12 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.AsadminResult;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.AsadminResult;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.Test;
 
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.greaterThan;
 import static org.hamcrest.Matchers.hasSize;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/JobManagerITest.java
similarity index 88%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/JobManagerITest.java
index 00f6088..40ba44a 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/JobManagerITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/JobManagerITest.java
@@ -15,20 +15,22 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.progress;
+package org.glassfish.main.admin.test.progress;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.AsadminResult;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.AsadminResult;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
+
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment.deleteJobsFile;
+import static org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment.deleteOsgiDirectory;
+import static org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment.getAsadmin;
+
 import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestMethodOrder;
 
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
-import static org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment.deleteJobsFile;
-import static org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment.deleteOsgiDirectory;
-import static org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment.getAsadmin;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.stringContainsInOrder;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressMessage.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressMessage.java
index 0be7e34..9198ae3 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressMessage.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressMessage.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.progress;
+package org.glassfish.main.admin.test.progress;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusBasicITest.java
similarity index 88%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusBasicITest.java
index 6074aa0..6ba8b05 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusBasicITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusBasicITest.java
@@ -15,17 +15,17 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.progress;
+package org.glassfish.main.admin.test.progress;
 
 import java.util.List;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.AsadminResult;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.AsadminResult;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.Test;
 
-import static org.glassfish.nucleus.admin.progress.ProgressMessage.isIncreasing;
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.progress.ProgressMessage.isIncreasing;
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.hasSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusComplexITest.java
similarity index 87%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusComplexITest.java
index 5c0e076..3b7ae11 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusComplexITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusComplexITest.java
@@ -15,19 +15,19 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.progress;
+package org.glassfish.main.admin.test.progress;
 
 import java.util.List;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.AsadminResult;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.AsadminResult;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.Test;
 
-import static org.glassfish.nucleus.admin.progress.ProgressMessage.grepProgressMessages;
-import static org.glassfish.nucleus.admin.progress.ProgressMessage.isIncreasing;
-import static org.glassfish.nucleus.admin.progress.ProgressMessage.uniqueMessages;
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.progress.ProgressMessage.grepProgressMessages;
+import static org.glassfish.main.admin.test.progress.ProgressMessage.isIncreasing;
+import static org.glassfish.main.admin.test.progress.ProgressMessage.uniqueMessages;
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.CoreMatchers.anyOf;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusFailITest.java
similarity index 85%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusFailITest.java
index dfd0b1b..0ed4266 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusFailITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusFailITest.java
@@ -15,16 +15,16 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.progress;
+package org.glassfish.main.admin.test.progress;
 
 import java.util.List;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.AsadminResult;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.AsadminResult;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.Test;
 
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.not;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusSpecialITest.java
similarity index 85%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusSpecialITest.java
index 58bd344..e5a8bef 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/progress/ProgressStatusSpecialITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/progress/ProgressStatusSpecialITest.java
@@ -15,18 +15,18 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.progress;
+package org.glassfish.main.admin.test.progress;
 
 import java.util.Iterator;
 import java.util.List;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.AsadminResult;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.AsadminResult;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.Test;
 
-import static org.glassfish.nucleus.admin.progress.ProgressMessage.isIncreasing;
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.progress.ProgressMessage.isIncreasing;
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
 import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.lessThan;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ApplicationITest.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ApplicationITest.java
index 19d9bb0..d2f3934 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ApplicationITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ApplicationITest.java
@@ -15,15 +15,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
 import java.net.URISyntaxException;
 import java.util.Map;
 
-import org.glassfish.nucleus.test.tool.DomainAdminRestClient;
-import org.glassfish.nucleus.test.webapp.HelloServlet;
+import org.glassfish.main.admin.test.tool.DomainAdminRestClient;
+import org.glassfish.main.admin.test.webapp.HelloServlet;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/AuthRealmITest.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/AuthRealmITest.java
index 7466a75..c1d7225 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/AuthRealmITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/AuthRealmITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import com.sun.enterprise.security.auth.realm.certificate.CertificateRealm;
 import com.sun.enterprise.security.auth.realm.file.FileRealm;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ClusterITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ClusterITest.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ClusterITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ClusterITest.java
index 062970c..174bf79 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ClusterITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ClusterITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ConfigITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ConfigITest.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ConfigITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ConfigITest.java
index 8d82383..d156b82 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ConfigITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ConfigITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.MultivaluedHashMap;
 import jakarta.ws.rs.core.Response;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/DomainITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/DomainITest.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/DomainITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/DomainITest.java
index dcda4de..6368fe2 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/DomainITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/DomainITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ElementStarITest.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ElementStarITest.java
index 6c83feb..4d4d565 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ElementStarITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ElementStarITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ExternalResourceITest.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ExternalResourceITest.java
index 2128d65..12fc140 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ExternalResourceITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ExternalResourceITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JdbcITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JdbcITest.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JdbcITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JdbcITest.java
index 090f918..9643dba 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JdbcITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JdbcITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JmsITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JmsITest.java
similarity index 99%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JmsITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JmsITest.java
index 1757b0e..84dae21 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JmsITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JmsITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JobsResourceITest.java
similarity index 92%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JobsResourceITest.java
index 246b3d5..b20bb43 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JobsResourceITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JobsResourceITest.java
@@ -15,20 +15,20 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
 import org.codehaus.jettison.json.JSONArray;
 import org.codehaus.jettison.json.JSONObject;
-import org.glassfish.nucleus.test.tool.DomainAdminRestClient;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.DomainAdminRestClient;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
-import static org.glassfish.nucleus.test.tool.AsadminResultMatcher.asadminOK;
-import static org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment.getAsadmin;
+import static org.glassfish.main.admin.test.tool.AsadminResultMatcher.asadminOK;
+import static org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment.getAsadmin;
 import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JvmOptionsITest.java
similarity index 99%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JvmOptionsITest.java
index 18beffe..18c8471 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/JvmOptionsITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/JvmOptionsITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.MultivaluedHashMap;
 import jakarta.ws.rs.core.MultivaluedMap;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MetadataITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MetadataITest.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MetadataITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MetadataITest.java
index fb15ba7..7109299 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MetadataITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MetadataITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MonitoringITest.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MonitoringITest.java
index fbf87af..8cd5b9a 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/MonitoringITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/MonitoringITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 
 import jakarta.ws.rs.core.Response;
@@ -23,7 +23,7 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import org.glassfish.nucleus.test.tool.DomainAdminRestClient;
+import org.glassfish.main.admin.test.tool.DomainAdminRestClient;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.MethodOrderer.OrderAnnotation;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/NetworkListenerITest.java
similarity index 99%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/NetworkListenerITest.java
index 4e26dce..3c315e4 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NetworkListenerITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/NetworkListenerITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/NoCLICommandResourceCreationITest.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/NoCLICommandResourceCreationITest.java
index 2e3a45e..f831288 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/NoCLICommandResourceCreationITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/NoCLICommandResourceCreationITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.core.Response;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/PartialUpdateITest.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/PartialUpdateITest.java
index 11f7751..7fab0c0 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PartialUpdateITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/PartialUpdateITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/PropertiesBagITest.java
similarity index 99%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/PropertiesBagITest.java
index ba6a813..fe476a6 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/PropertiesBagITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/PropertiesBagITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.core.Response;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ProvidersITest.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ProvidersITest.java
index 8d93960..e911bcd 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ProvidersITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ProvidersITest.java
@@ -15,11 +15,11 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
-import org.glassfish.nucleus.test.tool.DomainAdminRestClient;
+import org.glassfish.main.admin.test.tool.DomainAdminRestClient;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ResourceRefITest.java
similarity index 95%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ResourceRefITest.java
index cb71888..14c2d70 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ResourceRefITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ResourceRefITest.java
@@ -15,15 +15,15 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/RestTestBase.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/RestTestBase.java
index 76d9b9c..fa5a84a 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/RestTestBase.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/RestTestBase.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.client.Client;
 import jakarta.ws.rs.core.MultivaluedMap;
@@ -37,8 +37,8 @@
 import java.util.logging.Logger;
 
 import org.glassfish.admin.rest.client.utils.MarshallingUtils;
-import org.glassfish.nucleus.test.tool.DomainAdminRestClient;
-import org.glassfish.nucleus.test.webapp.HelloServlet;
+import org.glassfish.main.admin.test.tool.DomainAdminRestClient;
+import org.glassfish.main.admin.test.webapp.HelloServlet;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.exporter.ZipExporter;
 import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
@@ -49,7 +49,7 @@
 import org.junit.jupiter.api.TestInfo;
 
 import static jakarta.ws.rs.core.MediaType.TEXT_PLAIN;
-import static org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment.getTargetDirectory;
+import static org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment.getTargetDirectory;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/SystemPropertiesITest.java
similarity index 99%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/SystemPropertiesITest.java
index a68d242..2211a03 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/SystemPropertiesITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/SystemPropertiesITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/TokenAuthenticationITest.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/TokenAuthenticationITest.java
index db2456d..13bd63f 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/TokenAuthenticationITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/TokenAuthenticationITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Cookie;
 import jakarta.ws.rs.core.Response;
@@ -25,7 +25,7 @@
 import org.glassfish.admin.rest.client.ClientWrapper;
 import org.glassfish.admin.rest.client.utils.MarshallingUtils;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
-import org.glassfish.nucleus.test.tool.DomainAdminRestClient;
+import org.glassfish.main.admin.test.tool.DomainAdminRestClient;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.Test;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigITest.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ZeroConfigITest.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigITest.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ZeroConfigITest.java
index 5e3da6b..103ebda 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/admin/rest/ZeroConfigITest.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/rest/ZeroConfigITest.java
@@ -15,7 +15,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.admin.rest;
+package org.glassfish.main.admin.test.rest;
 
 import jakarta.ws.rs.core.Response;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/AsadminResultMatcher.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/AsadminResultMatcher.java
similarity index 88%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/AsadminResultMatcher.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/AsadminResultMatcher.java
index 960ae54..5e7ef0d 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/AsadminResultMatcher.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/AsadminResultMatcher.java
@@ -14,10 +14,10 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.test.tool;
+package org.glassfish.main.admin.test.tool;
 
-import org.glassfish.nucleus.test.tool.asadmin.Asadmin;
-import org.glassfish.nucleus.test.tool.asadmin.AsadminResult;
+import org.glassfish.main.admin.test.tool.asadmin.Asadmin;
+import org.glassfish.main.admin.test.tool.asadmin.AsadminResult;
 import org.hamcrest.CustomTypeSafeMatcher;
 
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/DomainAdminRestClient.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/DomainAdminRestClient.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/DomainAdminRestClient.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/DomainAdminRestClient.java
index 0c86fb7..280b000 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/DomainAdminRestClient.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/DomainAdminRestClient.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.test.tool;
+package org.glassfish.main.admin.test.tool;
 
 import jakarta.ws.rs.client.Entity;
 import jakarta.ws.rs.client.Invocation.Builder;
@@ -33,7 +33,7 @@
 import org.glassfish.admin.rest.client.ClientWrapper;
 import org.glassfish.jersey.media.multipart.FormDataMultiPart;
 import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
-import org.glassfish.nucleus.test.tool.asadmin.GlassFishTestEnvironment;
+import org.glassfish.main.admin.test.tool.asadmin.GlassFishTestEnvironment;
 
 import static jakarta.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/Asadmin.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/Asadmin.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/Asadmin.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/Asadmin.java
index 12da171..e40e999 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/Asadmin.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/Asadmin.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.test.tool.asadmin;
+package org.glassfish.main.admin.test.tool.asadmin;
 
 import com.sun.enterprise.universal.process.ProcessManager;
 import com.sun.enterprise.universal.process.ProcessManagerException;
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/AsadminResult.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/AsadminResult.java
similarity index 97%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/AsadminResult.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/AsadminResult.java
index 1850ea5..e11433b 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/AsadminResult.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/AsadminResult.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.test.tool.asadmin;
+package org.glassfish.main.admin.test.tool.asadmin;
 
 /**
  * Result of the {@link Asadmin} execution.
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/GlassFishTestEnvironment.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/GlassFishTestEnvironment.java
similarity index 98%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/GlassFishTestEnvironment.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/GlassFishTestEnvironment.java
index a8f057f..b41b7b3 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/tool/asadmin/GlassFishTestEnvironment.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/tool/asadmin/GlassFishTestEnvironment.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.test.tool.asadmin;
+package org.glassfish.main.admin.test.tool.asadmin;
 
 import jakarta.ws.rs.client.Client;
 
@@ -35,7 +35,7 @@
 import java.util.logging.Logger;
 
 import org.glassfish.admin.rest.client.ClientWrapper;
-import org.glassfish.nucleus.test.tool.AsadminResultMatcher;
+import org.glassfish.main.admin.test.tool.AsadminResultMatcher;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 
diff --git a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/webapp/HelloServlet.java b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/webapp/HelloServlet.java
similarity index 96%
rename from appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/webapp/HelloServlet.java
rename to appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/webapp/HelloServlet.java
index 7db815e..1515674 100644
--- a/appserver/tests/admin/tests/src/test/java/org/glassfish/nucleus/test/webapp/HelloServlet.java
+++ b/appserver/tests/admin/tests/src/test/java/org/glassfish/main/admin/test/webapp/HelloServlet.java
@@ -14,7 +14,7 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  */
 
-package org.glassfish.nucleus.test.webapp;
+package org.glassfish.main.admin.test.webapp;
 
 import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;