You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ss...@apache.org on 2025/11/28 10:42:59 UTC

(sling-org-apache-sling-starter-integration-tests) branch master updated: SLING-12623 Rename to Sling Starter Integration Tests (#36)

This is an automated email from the ASF dual-hosted git repository.

sseifert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter-integration-tests.git


The following commit(s) were added to refs/heads/master by this push:
     new 5488649  SLING-12623 Rename to Sling Starter Integration Tests (#36)
5488649 is described below

commit 5488649c64f5a0e2e94395b7aca8816ef0182515
Author: Stefan Seifert <st...@users.noreply.github.com>
AuthorDate: Fri Nov 28 11:42:53 2025 +0100

    SLING-12623 Rename to Sling Starter Integration Tests (#36)
---
 README.md                                          |   4 +-
 pom.xml                                            |  12 +-
 .../customizers/LaunchpadCustomizer.java           |  10 +-
 .../AbstractSlingResourceTypeRenderingTest.java    |   2 +-
 .../integrationtest/AuthenticatedTestUtil.java     |   2 +-
 .../webapp/integrationtest/BundleContentTest.java  |   4 +-
 .../ContentLoaderMiscPropertyTest.java             |   2 +-
 .../webapp/integrationtest/CreateNodeTest.java     |   2 +-
 .../DavExDisabledAnonAccessTest.java               |   2 +-
 .../integrationtest/DavExIntegrationTest.java      |   2 +-
 .../webapp/integrationtest/EspLoadTest.java        |   2 +-
 .../webapp/integrationtest/EventsCounterTest.java  |   4 +-
 .../webapp/integrationtest/ExecuteScriptTest.java  |   2 +-
 .../integrationtest/ExportedPackagesTest.java      |   4 +-
 .../webapp/integrationtest/FileUploadTest.java     |   2 +-
 .../webapp/integrationtest/FiltersTest.java        |   2 +-
 .../webapp/integrationtest/FiltersTest2.java       |   2 +-
 .../webapp/integrationtest/ForwardTest.java        |   4 +-
 .../integrationtest/GeneratedNodeNameTest.java     |   2 +-
 .../integrationtest/GeneratedNodeNameTestStar.java |   2 +-
 .../webapp/integrationtest/GetStarTest.java        |   2 +-
 .../webapp/integrationtest/GetWithSuffixTest.java  |   4 +-
 .../webapp/integrationtest/HttpPingTest.java       |   2 +-
 .../ImmediateScriptActivationTest.java             |   2 +-
 .../webapp/integrationtest/IncludeTest.java        |   4 +-
 .../webapp/integrationtest/InitialContentTest.java |   2 +-
 .../integrationtest/JavascriptWrappersTest.java    |   2 +-
 .../webapp/integrationtest/JsonRenderingTest.java  |   6 +-
 .../webapp/integrationtest/JspForwardTest.java     |   4 +-
 .../webapp/integrationtest/JspIncludeTest.java     |   2 +-
 .../webapp/integrationtest/JspScriptingTest.java   |   2 +-
 .../LaunchpadConfigInstallerTest.java              |   2 +-
 .../integrationtest/MappingEventsProxyTest.java    |   6 +-
 .../webapp/integrationtest/MiscUnsafeTest.java     |   2 +-
 .../webapp/integrationtest/MkdirTest.java          |   2 +-
 .../NodeTypeBasedRenderingTest.java                |   2 +-
 .../integrationtest/NodetypeRenderingTest.java     |   4 +-
 .../webapp/integrationtest/PostRedirectTest.java   |   2 +-
 .../integrationtest/PropertyRenderingTest.java     |   4 +-
 .../webapp/integrationtest/RangeStreamingTest.java |   2 +-
 .../webapp/integrationtest/RedirectTest.java       |   4 +-
 .../webapp/integrationtest/RenderingTestBase.java  |   2 +-
 .../integrationtest/RequestAttributeTest.java      |   4 +-
 .../integrationtest/ResourceDecoratorTest.java     |   2 +-
 .../integrationtest/ResourceSuperTypeTest.java     |   2 +-
 .../ScriptBindingsValuesProviderTest.java          |   2 +-
 .../integrationtest/ScriptBuiltinObjectsTest.java  |   2 +-
 .../integrationtest/ServerSideScriptsTest.java     |   4 +-
 .../integrationtest/ServletResolverConfigTest.java |   4 +-
 .../SlingResourceTypeRenderingTest.java            |   2 +-
 .../integrationtest/SlingWebDavServletTest.java    |   2 +-
 .../webapp/integrationtest/StaticContentTest.java  |   2 +-
 .../webapp/integrationtest/StreamServletTest.java  |   2 +-
 .../integrationtest/SyntheticResourceTest.java     |   2 +-
 .../webapp/integrationtest/UploadFileTest.java     |   2 +-
 .../webapp/integrationtest/ValueFromTest.java      |   2 +-
 .../webapp/integrationtest/VanityPathTest.java     |   4 +-
 .../integrationtest/VersionInfoServletTest.java    |   4 +-
 .../integrationtest/VersionParameterTest.java      |   4 +-
 .../integrationtest/WebDavDoubleSlashTest.java     |   2 +-
 .../webapp/integrationtest/WebdavDeleteTest.java   |   2 +-
 .../webapp/integrationtest/WebdavOptionsTest.java  |   2 +-
 .../webapp/integrationtest/WebdavUploadTest.java   |   2 +-
 .../WriteableResourcesProxyTest.java               |   6 +-
 .../auth/AuthenticationResponseCodeTest.java       |   2 +-
 .../caconfig/ContextAwareConfigurationTest.java    |   2 +-
 .../webapp/integrationtest/crud/CrudTest.java      |   4 +-
 .../indexing/FullTextIndexingTest.java             |   2 +-
 .../installer/InstallManyBundlesTest.java          |   4 +-
 .../installer/ServerSideInstallerTest.java         |   2 +-
 .../integrationtest/issues/SLING2082Test.java      |   2 +-
 .../integrationtest/issues/SLING2085Test.java      |   2 +-
 .../integrationtest/issues/SLING2094Test.java      |   4 +-
 .../integrationtest/issues/SLING2522Test.java      |   2 +-
 .../integrationtest/issues/SLING2617Test.java      |   2 +-
 .../integrationtest/issues/SLING457Test.java       |   4 +-
 .../integrationtest/issues/SLING760Test.java       |   2 +-
 .../webapp/integrationtest/jakarta/JsonTest.java   |   2 +-
 .../integrationtest/jaxb/JaxbMarshallingTest.java  |   2 +-
 .../webapp/integrationtest/jmx/JmxTest.java        |   4 +-
 .../integrationtest/login/AnonymousAccessTest.java |   2 +-
 .../login/AuthRequestLoginTest.java                |   2 +-
 .../login/RedirectOnLoginErrorTest.java            |   2 +-
 .../login/RedirectOnLogoutTest.java                |   2 +-
 .../webapp/integrationtest/package.html            |   0
 .../repository/RepoinitPathTest.java               |   2 +-
 .../repository/RepositoryInitializersTest.java     |   6 +-
 .../repository/RepositoryNameTest.java             |   4 +-
 .../repository/SystemUsersTest.java                |   2 +-
 .../PlanetsResourceProviderTest.java               |   2 +-
 .../resourceresolver/ResourceResolverApiTest.java  |   4 +-
 .../ResourceResolverGeneralTest.java               |   8 +-
 .../runmodes/InactiveRunModeTest.java              |   2 +-
 .../scripting/SlingJSPTaglibTest.java              | 168 ++++++++++-----------
 .../scripting/StandaloneScriptExecutionTest.java   |   2 +-
 .../integrationtest/scripting/htl/HtlTest.java     |   2 +-
 .../integrationtest/servlets/HeadServletTest.java  |   2 +-
 .../servlets/R6WhiteboardServletTest.java          |   2 +-
 .../servlets/RequestDispatcherServletTest.java     |   2 +-
 .../servlets/post/CustomPostOperationTest.java     |   6 +-
 .../servlets/post/PostResponseCreatorTest.java     |   2 +-
 .../servlets/post/PostSendErrorTest.java           |   2 +-
 .../servlets/post/PostServletAtCopyTest.java       |   2 +-
 .../servlets/post/PostServletAtDeleteTest.java     |   4 +-
 .../servlets/post/PostServletAtMoveTest.java       |   2 +-
 .../servlets/post/PostServletCopyTest.java         |   4 +-
 .../servlets/post/PostServletCreateTest.java       |   2 +-
 .../servlets/post/PostServletDeleteParentTest.java |   2 +-
 .../servlets/post/PostServletDeleteTest.java       |   2 +-
 .../servlets/post/PostServletImportTest.java       |   4 +-
 .../servlets/post/PostServletMoveTest.java         |   4 +-
 .../servlets/post/PostServletNopTest.java          |   2 +-
 .../servlets/post/PostServletOrderTest.java        |   4 +-
 .../post/PostServletOutputContentTypeTest.java     |   2 +-
 .../servlets/post/PostServletPatchTest.java        |   2 +-
 .../post/PostServletPrivilegesUpdateTest.java      |   6 +-
 .../servlets/post/PostServletUpdateTest.java       |   6 +-
 .../servlets/post/PostServletVersionableTest.java  |   2 +-
 .../servlets/post/PostStatusTest.java              |   2 +-
 .../servlets/post/PostToRootTest.java              |   2 +-
 .../servlets/post/ReferenceTypeHintTest.java       |   4 +-
 .../servlets/post/SlingAutoPropertiesTest.java     |   2 +-
 .../servlets/post/SlingDateValuesTest.java         |   2 +-
 .../servlets/post/SlingDefaultValuesTest.java      |   2 +-
 .../servlets/post/SlingPostProcessorTest.java      |   2 +-
 .../servlets/post/SlingSessionInfoTest.java        |   2 +-
 .../servlets/resolution/ExtensionServletTest.java  |   2 +-
 .../resolution/HtmlDefaultServletTest.java         |   4 +-
 .../servlets/resolution/PathsServletTest.java      |   2 +-
 .../resolution/PathsServletWithNodeTest.java       |   2 +-
 .../servlets/resolution/PrefixTest.java            |   2 +-
 .../servlets/resolution/PrioritiesTest.java        |   2 +-
 .../servlets/resolution/PutMethodServletTest.java  |   2 +-
 .../servlets/resolution/RequestObjectTest.java     |   2 +-
 .../resolution/RequestUriOptingServletTest.java    |   2 +-
 .../servlets/resolution/ResolutionTestBase.java    |   4 +-
 .../servlets/resolution/SelectorServletTest.java   |   2 +-
 .../resolver/errorhandler/ErrorHandlingTest.java   |   4 +-
 .../teleporter/BasicTeleporterTest.java            |   2 +-
 .../EmbeddedDependenciesTeleporterTest.java        |   2 +-
 .../integrationtest/teleporter/GeneratorRule.java  |   2 +-
 .../teleporter/LdapFilterTeleporterTest.java       |   4 +-
 .../teleporter/LocalServiceTeleporterTest.java     |   2 +-
 .../teleporter/MultipleRulesTeleporterTest.java    |   2 +-
 .../teleporter/ServicesPresentTest.java            |   2 +-
 .../integrationtest/teleporter/SomePojo.java       |   2 +-
 .../integrationtest/teleporter/SomeService.java    |   2 +-
 .../integrationtest/teleporter/SomeString.java     |   2 +-
 .../integrationtest/teleporter/SomeUtility.java    |   2 +-
 .../teleporter/TeleportedResourcesFolderTest.java  |   2 +-
 .../teleporter/TeleportedResourcesSingleTest.java  |   2 +-
 .../teleporter/TeleporterOptionsTest.java          |   2 +-
 .../integrationtest/util/EventsCounterUtil.java    |   2 +-
 .../webapp/integrationtest/util/JsonUtil.java      |   2 +-
 .../integrationtest/util/RepositoryTestUtil.java   |   2 +-
 .../integrationtest/util/ServerSideTestClient.java |   2 +-
 .../integrationtest/util/UniqueResourceType.java   |   2 +-
 .../webapp/integrationtest/xml/DomTest.java        |   2 +-
 .../webapp/integrationtest/xml/SaxTest.java        |   2 +-
 .../webapp/integrationtest/xml/XPathTest.java      |   2 +-
 .../webapp/jsp/TagFileTest.java                    |   2 +-
 src/main/resources/integration-test/enum-test.jsp  |   2 +-
 src/main/resources/integration-test/htl/model.html |   2 +-
 163 files changed, 305 insertions(+), 305 deletions(-)

diff --git a/README.md b/README.md
index 0165442..a93431a 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 [![Apache Sling](https://sling.apache.org/res/logos/sling.png)](https://sling.apache.org)
 
-&#32;[![Build Status](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-launchpad-integration-tests/job/master/badge/icon)](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-launchpad-integration-tests/job/master/)&#32;[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=apache_sling-org-apache-sling-launchpad-integration-tests&metric=coverage)](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-launch [...]
+&#32;[![Build Status](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-starter-integration-tests/job/master/badge/icon)](https://ci-builds.apache.org/job/Sling/job/modules/job/sling-org-apache-sling-starter-integration-tests/job/master/)&#32;[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=apache_sling-org-apache-sling-starter-integration-tests&metric=coverage)](https://sonarcloud.io/dashboard?id=apache_sling-org-apache-sling-starter-inte [...]
 
-# Apache Sling Launchpad Integration Tests
+# Apache Sling Starter Integration Tests
 
 This module is part of the [Apache Sling](https://sling.apache.org) project and
 contains test classes used by the 
diff --git a/pom.xml b/pom.xml
index 1e4e218..b43f47c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,19 +24,19 @@
         <relativePath />
     </parent>
 
-    <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
+    <artifactId>org.apache.sling.starter.integration-tests</artifactId>
     <version>14-SNAPSHOT</version>
     <packaging>jar</packaging>
 
-    <name>Apache Sling Launchpad Integration Tests</name>
+    <name>Apache Sling Starter Integration Tests</name>
     <description>Sling Integration Tests, contains integration tests that
         are used by the testing project and other upstream testing projects.</description>
 
     <scm>
-        <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git</connection>
-        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-launchpad-integration-tests.git</developerConnection>
+        <connection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter-integration-tests.git</connection>
+        <developerConnection>scm:git:https://gitbox.apache.org/repos/asf/sling-org-apache-sling-starter-integration-tests.git</developerConnection>
         <tag>HEAD</tag>
-        <url>https://github.com/apache/sling-org-apache-sling-launchpad-integration-tests.git</url>
+        <url>https://github.com/apache/sling-org-apache-sling-starter-integration-tests.git</url>
     </scm>
 
     <properties>
@@ -296,7 +296,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.launchpad.test-services</artifactId>
+            <artifactId>org.apache.sling.starter.test-services</artifactId>
             <version>14-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
diff --git a/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java b/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java
index 77c8194..2994199 100644
--- a/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java
+++ b/src/main/java/org/apache/sling/junit/teleporter/customizers/LaunchpadCustomizer.java
@@ -20,7 +20,7 @@ package org.apache.sling.junit.teleporter.customizers;
 
 import org.apache.sling.commons.testing.integration.HttpTest;
 import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.launchpad.webapp.integrationtest.teleporter.TeleporterOptionsTest;
+import org.apache.sling.starter.webapp.integrationtest.teleporter.TeleporterOptionsTest;
 import org.apache.sling.testing.teleporter.client.ClientSideTeleporter;
 
 import static org.junit.Assert.fail;
@@ -54,14 +54,14 @@ public class LaunchpadCustomizer implements TeleporterRule.Customizer {
         final ClientSideTeleporter cst = (ClientSideTeleporter) t;
         cst.setBaseUrl(HttpTest.HTTP_BASE_URL);
         cst.setTestReadyTimeoutSeconds(testReadyTimeout);
-        cst.includeDependencyPrefix("org.apache.sling.launchpad.webapp");
+        cst.includeDependencyPrefix("org.apache.sling.starter.webapp");
 
         // Get the testservices classes from that bundle, importing them
-        cst.includeDependencyPrefix("org.apache.sling.launchpad.testservices");
-        cst.excludeDependencyPrefix(org.apache.sling.launchpad.testservices.events.EventsCounter.class
+        cst.includeDependencyPrefix("org.apache.sling.starter.testservices");
+        cst.excludeDependencyPrefix(org.apache.sling.starter.testservices.events.EventsCounter.class
                 .getPackage()
                 .getName());
-        cst.excludeDependencyPrefix(org.apache.sling.launchpad.testservices.exported.StringTransformer.class.getName());
+        cst.excludeDependencyPrefix(org.apache.sling.starter.testservices.exported.StringTransformer.class.getName());
 
         cst.setServerCredentials("admin", "admin");
     }
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
index 384eb35..87a301f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/AbstractSlingResourceTypeRenderingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AuthenticatedTestUtil.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/AuthenticatedTestUtil.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AuthenticatedTestUtil.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/AuthenticatedTestUtil.java
index 607498f..0517891 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/AuthenticatedTestUtil.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/AuthenticatedTestUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/BundleContentTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/BundleContentTest.java
index 89d196d..789f5d0 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/BundleContentTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/BundleContentTest.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
 import jakarta.json.JsonObject;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 public class BundleContentTest extends HttpTestBase {
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
index 5b708e1..d62c51d 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ContentLoaderMiscPropertyTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/CreateNodeTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/CreateNodeTest.java
index 0485913..3652489 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/CreateNodeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/CreateNodeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExDisabledAnonAccessTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/DavExDisabledAnonAccessTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExDisabledAnonAccessTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/DavExDisabledAnonAccessTest.java
index 3c92b64..79f00f0 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExDisabledAnonAccessTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/DavExDisabledAnonAccessTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.util.Collections;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExIntegrationTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/DavExIntegrationTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExIntegrationTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/DavExIntegrationTest.java
index 8cd1781..8b0eb86 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/DavExIntegrationTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/DavExIntegrationTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import javax.jcr.Credentials;
 import javax.jcr.Node;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EspLoadTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/EspLoadTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EspLoadTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/EspLoadTest.java
index 4097793..1c6064c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EspLoadTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/EspLoadTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EventsCounterTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/EventsCounterTest.java
similarity index 94%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EventsCounterTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/EventsCounterTest.java
index 7bd6525..47841f9 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/EventsCounterTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/EventsCounterTest.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import org.apache.sling.commons.testing.integration.HttpTest;
 import org.apache.sling.commons.testing.junit.Retry;
 import org.apache.sling.commons.testing.junit.RetryRule;
-import org.apache.sling.launchpad.webapp.integrationtest.util.EventsCounterUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.EventsCounterUtil;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Rule;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ExecuteScriptTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ExecuteScriptTest.java
index a71761c..4566afb 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExecuteScriptTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ExecuteScriptTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 /** Test the executeScript test method */
 public class ExecuteScriptTest extends RenderingTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ExportedPackagesTest.java
similarity index 92%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ExportedPackagesTest.java
index 11a1a2c..65e65f9 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ExportedPackagesTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ExportedPackagesTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 
@@ -35,6 +35,6 @@ public class ExportedPackagesTest extends HttpTestBase {
     }
 
     public void testPackageFromTestServices() throws Exception {
-        assertExported("org.apache.sling.launchpad.testservices.exported");
+        assertExported("org.apache.sling.starter.testservices.exported");
     }
 }
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/FileUploadTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/FileUploadTest.java
index b19a4d1..6b450ba 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FileUploadTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/FileUploadTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/FiltersTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/FiltersTest.java
index 83713d4..4de908a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/FiltersTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest2.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/FiltersTest2.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest2.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/FiltersTest2.java
index f6f4986..4067a44 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/FiltersTest2.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/FiltersTest2.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 /* Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ForwardTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ForwardTest.java
index 825d7e4..f054f03 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ForwardTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ForwardTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,8 +26,8 @@ import java.util.Set;
 
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.UniqueResourceType;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.UniqueResourceType;
 
 /** Test the {link ScriptHelper#forward) functionality */
 public class ForwardTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/GeneratedNodeNameTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/GeneratedNodeNameTest.java
index 0a4b7e9..f0c7f5e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/GeneratedNodeNameTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/GeneratedNodeNameTestStar.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/GeneratedNodeNameTestStar.java
index cfaa764..8ced59e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GeneratedNodeNameTestStar.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/GeneratedNodeNameTestStar.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/GetStarTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/GetStarTest.java
index b49c2bb..3f605d2 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetStarTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/GetStarTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/GetWithSuffixTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/GetWithSuffixTest.java
index 3b8967b..6e8130c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/GetWithSuffixTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/GetWithSuffixTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -24,7 +24,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.sling.launchpad.webapp.integrationtest.util.UniqueResourceType;
+import org.apache.sling.starter.webapp.integrationtest.util.UniqueResourceType;
 
 /** GET requests with a suffix should fail with a 404, otherwise
  *  we get a lot of extra possible URLs which point to the same
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/HttpPingTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/HttpPingTest.java
index f8b17fe..498f8a7 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/HttpPingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/HttpPingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.methods.GetMethod;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ImmediateScriptActivationTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ImmediateScriptActivationTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ImmediateScriptActivationTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ImmediateScriptActivationTest.java
index 7bb5172..9134601 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ImmediateScriptActivationTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ImmediateScriptActivationTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.concurrent.atomic.AtomicInteger;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/IncludeTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/IncludeTest.java
index e0e9978..61cad11 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/IncludeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/IncludeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,8 +26,8 @@ import java.util.Set;
 
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.UniqueResourceType;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.UniqueResourceType;
 
 /** Test the {link ScriptHelper#include) functionality */
 public class IncludeTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/InitialContentTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/InitialContentTest.java
index 34d2aff..bf74250 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/InitialContentTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/InitialContentTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JavascriptWrappersTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/JavascriptWrappersTest.java
index a081c00..54648c0 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JavascriptWrappersTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JavascriptWrappersTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JsonRenderingTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/JsonRenderingTest.java
index 4730450..82f3afb 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JsonRenderingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JsonRenderingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -130,10 +130,10 @@ public class JsonRenderingTest extends HttpTestBase {
         log.info("Url: {}", url);
         log.info("postUrl: {}", postUrl);
         // Get the resource url. (everything after the port)
-        // We skip http://localhost:8080/org.apache.sling.launchpad.testing-6-SNAPSHOT/
+        // We skip http://localhost:8080/org.apache.sling.starter.testing-6-SNAPSHOT/
         // or http://localhost:8080/
         String resourceUrl = url;
-        final int toSkip = resourceUrl.contains("/org.apache.sling.launchpad") ? 4 : 3;
+        final int toSkip = resourceUrl.contains("/org.apache.sling.starter") ? 4 : 3;
         for (int i = toSkip; i > 0; i--) {
             resourceUrl = resourceUrl.substring(resourceUrl.indexOf("/") + 1);
         }
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JspForwardTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/JspForwardTest.java
index 6dc8dbb..538c072 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspForwardTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JspForwardTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -28,8 +28,8 @@ import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.sling.commons.testing.integration.HttpTest;
 import org.apache.sling.commons.testing.junit.Retry;
 import org.apache.sling.commons.testing.junit.RetryRule;
-import org.apache.sling.launchpad.webapp.integrationtest.util.UniqueResourceType;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.UniqueResourceType;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JspIncludeTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/JspIncludeTest.java
index f0eac74..3a2e560 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspIncludeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JspIncludeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JspScriptingTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/JspScriptingTest.java
index 32e7f4b..dfada8f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/JspScriptingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/JspScriptingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import org.apache.sling.commons.testing.integration.HttpTest;
 import org.apache.sling.commons.testing.integration.HttpTestNode;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/LaunchpadConfigInstallerTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/LaunchpadConfigInstallerTest.java
index 5ab9e3c..780a471 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/LaunchpadConfigInstallerTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/LaunchpadConfigInstallerTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MappingEventsProxyTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/MappingEventsProxyTest.java
similarity index 80%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MappingEventsProxyTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/MappingEventsProxyTest.java
index e4e1e87..3b492ac 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MappingEventsProxyTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/MappingEventsProxyTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
-import org.apache.sling.launchpad.webapp.integrationtest.util.ServerSideTestClient;
+import org.apache.sling.starter.webapp.integrationtest.util.ServerSideTestClient;
 import org.junit.Test;
 
 /** Run the server-side MappingEventsTest */
@@ -26,6 +26,6 @@ public class MappingEventsProxyTest {
     @Test
     public void runWriteableResourcesTest() throws Exception {
         new ServerSideTestClient()
-                .assertTestsPass("org.apache.sling.launchpad.testservices.serversidetests.MappingEventsTest", -1);
+                .assertTestsPass("org.apache.sling.starter.testservices.serversidetests.MappingEventsTest", -1);
     }
 }
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MiscUnsafeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/MiscUnsafeTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MiscUnsafeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/MiscUnsafeTest.java
index ddffa2e..dfe9f66 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MiscUnsafeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/MiscUnsafeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/MkdirTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/MkdirTest.java
index c7efc2b..f5cd2a9 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/MkdirTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/MkdirTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/NodeTypeBasedRenderingTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/NodeTypeBasedRenderingTest.java
index 8cf2c05..4c1b824 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodeTypeBasedRenderingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/NodeTypeBasedRenderingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.ArrayList;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/NodetypeRenderingTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/NodetypeRenderingTest.java
index fb1f75c..2bfd857 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/NodetypeRenderingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/NodetypeRenderingTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.sling.launchpad.webapp.integrationtest.util.UniqueResourceType;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.UniqueResourceType;
 
 /** Test creating a Node and rendering it using scripts in
  *  various supported languages, using nodetype-based
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/PostRedirectTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/PostRedirectTest.java
index 321da69..f0ecce4 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PostRedirectTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/PostRedirectTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/PropertyRenderingTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/PropertyRenderingTest.java
index 92b3ac8..3025c67 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/PropertyRenderingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/PropertyRenderingTest.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
 import jakarta.json.JsonObject;
 import org.apache.sling.commons.testing.integration.NameValuePairList;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RangeStreamingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/RangeStreamingTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RangeStreamingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/RangeStreamingTest.java
index ce07308..7d238f7 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RangeStreamingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/RangeStreamingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/RedirectTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/RedirectTest.java
index 30be1c6..c3aae83 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RedirectTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/RedirectTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,8 +26,8 @@ import jakarta.json.JsonException;
 import jakarta.json.JsonObject;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /** Test redirects */
 public class RedirectTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/RenderingTestBase.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/RenderingTestBase.java
index bd5ee40..922cc69 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RenderingTestBase.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/RenderingTestBase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RequestAttributeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/RequestAttributeTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RequestAttributeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/RequestAttributeTest.java
index fbb5116..9cfb3f2 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/RequestAttributeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/RequestAttributeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.ByteArrayInputStream;
 import java.net.URL;
@@ -27,8 +27,8 @@ import java.util.Properties;
 import java.util.Set;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.UniqueResourceType;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.UniqueResourceType;
 
 /**
  * Test the "org.apache.sling.api.include.servlet" and
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceDecoratorTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ResourceDecoratorTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceDecoratorTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ResourceDecoratorTest.java
index bb3b091..5830ea8 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceDecoratorTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ResourceDecoratorTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ResourceSuperTypeTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ResourceSuperTypeTest.java
index 4f8f374..5191db5 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ResourceSuperTypeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ResourceSuperTypeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
index 1e843f3..8fda89a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ScriptBindingsValuesProviderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ScriptBuiltinObjectsTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ScriptBuiltinObjectsTest.java
index fa44966..dd45495 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ScriptBuiltinObjectsTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ScriptBuiltinObjectsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ServerSideScriptsTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ServerSideScriptsTest.java
index 1d9a8bf..fbea4e4 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServerSideScriptsTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ServerSideScriptsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.sling.launchpad.webapp.integrationtest.util.ServerSideTestClient;
+import org.apache.sling.starter.webapp.integrationtest.util.ServerSideTestClient;
 import org.codehaus.plexus.util.Expand;
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ServletResolverConfigTest.java
similarity index 93%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ServletResolverConfigTest.java
index 1e2dc07..9d468a6 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ServletResolverConfigTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ServletResolverConfigTest.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import jakarta.json.JsonObject;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /** Verify that the ServletResolver cache is disabled for testing */
 public class ServletResolverConfigTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/SlingResourceTypeRenderingTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/SlingResourceTypeRenderingTest.java
index a0ff752..8fc1acc 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingResourceTypeRenderingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/SlingResourceTypeRenderingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/SlingWebDavServletTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/SlingWebDavServletTest.java
index f7a1ffa..1f7c00b 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SlingWebDavServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/SlingWebDavServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/StaticContentTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/StaticContentTest.java
index 423629e..2dd7f5f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StaticContentTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/StaticContentTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/StreamServletTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/StreamServletTest.java
index efba023..fd2af13 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/StreamServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/StreamServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 /** Test the streaming of static files uploaded to the repository */
 public class StreamServletTest extends RenderingTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/SyntheticResourceTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/SyntheticResourceTest.java
index 544f2ac..09087cb 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/SyntheticResourceTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/SyntheticResourceTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/UploadFileTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/UploadFileTest.java
index e6a1488..cf90ebb 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/UploadFileTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/UploadFileTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.File;
 import java.io.FileWriter;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ValueFromTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/ValueFromTest.java
index f03dedf..af9579d 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/ValueFromTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/ValueFromTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/VanityPathTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/VanityPathTest.java
index 9e72b3a..c9048ba 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VanityPathTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/VanityPathTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.Arrays;
@@ -28,8 +28,8 @@ import jakarta.json.JsonException;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.EventsCounterUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.EventsCounterUtil;
 
 /**
  * Tests of the sling:VanityPath mixin support.
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionInfoServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/VersionInfoServletTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionInfoServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/VersionInfoServletTest.java
index 1b18bd1..b12de51 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionInfoServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/VersionInfoServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,8 +26,8 @@ import jakarta.json.JsonException;
 import jakarta.json.JsonObject;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 public class VersionInfoServletTest extends HttpTestBase {
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionParameterTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/VersionParameterTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionParameterTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/VersionParameterTest.java
index 01dc0f5..54d37db 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/VersionParameterTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/VersionParameterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,8 +26,8 @@ import jakarta.json.JsonException;
 import jakarta.json.JsonObject;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 public class VersionParameterTest extends HttpTestBase {
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WebDavDoubleSlashTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/WebDavDoubleSlashTest.java
index 0f5b0fd..218324a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebDavDoubleSlashTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WebDavDoubleSlashTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.IOException;
 import java.util.UUID;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavDeleteTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavDeleteTest.java
index a4f4cfb..84390fc 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavDeleteTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavDeleteTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavOptionsTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavOptionsTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavOptionsTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavOptionsTest.java
index 75d9e48..6e16011 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavOptionsTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavOptionsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HttpClient;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavUploadTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavUploadTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavUploadTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavUploadTest.java
index 6eeb26e..2afd395 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WebdavUploadTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WebdavUploadTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WriteableResourcesProxyTest.java
similarity index 79%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/WriteableResourcesProxyTest.java
index fceb64f..c0cd38d 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/WriteableResourcesProxyTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/WriteableResourcesProxyTest.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest;
+package org.apache.sling.starter.webapp.integrationtest;
 
-import org.apache.sling.launchpad.webapp.integrationtest.util.ServerSideTestClient;
+import org.apache.sling.starter.webapp.integrationtest.util.ServerSideTestClient;
 import org.junit.Test;
 
 /** Run the server-side WriteableResourcesTest */
@@ -26,6 +26,6 @@ public class WriteableResourcesProxyTest {
     @Test
     public void runWriteableResourcesTest() throws Exception {
         new ServerSideTestClient()
-                .assertTestsPass("org.apache.sling.launchpad.testservices.serversidetests.WriteableResourcesTest", 1);
+                .assertTestsPass("org.apache.sling.starter.testservices.serversidetests.WriteableResourcesTest", 1);
     }
 }
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java
index 0205aa8..d9c5ce5 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/auth/AuthenticationResponseCodeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.auth;
+package org.apache.sling.starter.webapp.integrationtest.auth;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/caconfig/ContextAwareConfigurationTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/caconfig/ContextAwareConfigurationTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/caconfig/ContextAwareConfigurationTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/caconfig/ContextAwareConfigurationTest.java
index 0514eef..8a88dba 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/caconfig/ContextAwareConfigurationTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/caconfig/ContextAwareConfigurationTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.caconfig;
+package org.apache.sling.starter.webapp.integrationtest.caconfig;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/crud/CrudTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/crud/CrudTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/crud/CrudTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/crud/CrudTest.java
index 423a42e..fe04614 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/crud/CrudTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/crud/CrudTest.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.crud;
+package org.apache.sling.starter.webapp.integrationtest.crud;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.sling.commons.testing.integration.NameValuePairList;
-import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.RenderingTestBase;
 
 public class CrudTest extends RenderingTestBase {
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/indexing/FullTextIndexingTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/indexing/FullTextIndexingTest.java
index 28e01fe..6e90f35 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/indexing/FullTextIndexingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/indexing/FullTextIndexingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.indexing;
+package org.apache.sling.starter.webapp.integrationtest.indexing;
 
 import java.io.InputStream;
 import java.net.URLEncoder;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/InstallManyBundlesTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/installer/InstallManyBundlesTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/InstallManyBundlesTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/installer/InstallManyBundlesTest.java
index 824ebc6..d4220db 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/InstallManyBundlesTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/installer/InstallManyBundlesTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.installer;
+package org.apache.sling.starter.webapp.integrationtest.installer;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -30,7 +30,7 @@ import jakarta.json.JsonException;
 import jakarta.json.JsonObject;
 import junit.framework.AssertionFailedError;
 import org.apache.sling.commons.testing.integration.HttpTest;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.testing.tools.sling.TimeoutsProvider;
 import org.junit.After;
 import org.junit.Before;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/ServerSideInstallerTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/installer/ServerSideInstallerTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/ServerSideInstallerTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/installer/ServerSideInstallerTest.java
index 92a9e77..d0daefa 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/installer/ServerSideInstallerTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/installer/ServerSideInstallerTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.installer;
+package org.apache.sling.starter.webapp.integrationtest.installer;
 
 import java.util.List;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2082Test.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2082Test.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2082Test.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2082Test.java
index 772b656..c4538f6 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2082Test.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2082Test.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.issues;
+package org.apache.sling.starter.webapp.integrationtest.issues;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2085Test.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2085Test.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2085Test.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2085Test.java
index 816b834..0cffae6 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2085Test.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2085Test.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.issues;
+package org.apache.sling.starter.webapp.integrationtest.issues;
 
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2094Test.java
similarity index 94%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2094Test.java
index 8b4e1d0..8c77dcc 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2094Test.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2094Test.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.issues;
+package org.apache.sling.starter.webapp.integrationtest.issues;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
+import org.apache.sling.starter.webapp.integrationtest.RenderingTestBase;
 
 /** Test the SLING-2094 JSP errorpage statement */
 public class SLING2094Test extends RenderingTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2522Test.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2522Test.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2522Test.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2522Test.java
index 91f9365..93867da 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2522Test.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2522Test.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.issues;
+package org.apache.sling.starter.webapp.integrationtest.issues;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2617Test.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2617Test.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2617Test.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2617Test.java
index 742bc31..a2d6e8e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING2617Test.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING2617Test.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.issues;
+package org.apache.sling.starter.webapp.integrationtest.issues;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING457Test.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING457Test.java
index 6f5e727..18bf320 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING457Test.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING457Test.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.issues;
+package org.apache.sling.starter.webapp.integrationtest.issues;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
+import org.apache.sling.starter.webapp.integrationtest.RenderingTestBase;
 
 public class SLING457Test extends RenderingTestBase {
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING760Test.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING760Test.java
index 4d1e2cf..a62c61e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/issues/SLING760Test.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/issues/SLING760Test.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.issues;
+package org.apache.sling.starter.webapp.integrationtest.issues;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jakarta/JsonTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/jakarta/JsonTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jakarta/JsonTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/jakarta/JsonTest.java
index 2ed47c6..9898532 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jakarta/JsonTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/jakarta/JsonTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.jakarta;
+package org.apache.sling.starter.webapp.integrationtest.jakarta;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jaxb/JaxbMarshallingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/jaxb/JaxbMarshallingTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jaxb/JaxbMarshallingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/jaxb/JaxbMarshallingTest.java
index e7cf704..a38204c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jaxb/JaxbMarshallingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/jaxb/JaxbMarshallingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.jaxb;
+package org.apache.sling.starter.webapp.integrationtest.jaxb;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jmx/JmxTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/jmx/JmxTest.java
similarity index 93%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jmx/JmxTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/jmx/JmxTest.java
index 73aa202..69308d0 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/jmx/JmxTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/jmx/JmxTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.jmx;
+package org.apache.sling.starter.webapp.integrationtest.jmx;
 
 import java.io.IOException;
 import java.util.List;
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
 
 import jakarta.json.JsonValue;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /**
  * The <tt>DomTest</tt> verifies that simple DOM executions are successful
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AnonymousAccessTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/login/AnonymousAccessTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AnonymousAccessTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/login/AnonymousAccessTest.java
index ffddfac..20c09d3 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AnonymousAccessTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/login/AnonymousAccessTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.login;
+package org.apache.sling.starter.webapp.integrationtest.login;
 
 import java.net.URL;
 import java.util.UUID;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AuthRequestLoginTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/login/AuthRequestLoginTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AuthRequestLoginTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/login/AuthRequestLoginTest.java
index 082f13e..9f35776 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/AuthRequestLoginTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/login/AuthRequestLoginTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.login;
+package org.apache.sling.starter.webapp.integrationtest.login;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLoginErrorTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/login/RedirectOnLoginErrorTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLoginErrorTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/login/RedirectOnLoginErrorTest.java
index 0e1d36b..30a9ac7 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLoginErrorTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/login/RedirectOnLoginErrorTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.login;
+package org.apache.sling.starter.webapp.integrationtest.login;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLogoutTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/login/RedirectOnLogoutTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLogoutTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/login/RedirectOnLogoutTest.java
index 7b78364..b495c02 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/login/RedirectOnLogoutTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/login/RedirectOnLogoutTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.login;
+package org.apache.sling.starter.webapp.integrationtest.login;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/package.html b/src/main/java/org/apache/sling/starter/webapp/integrationtest/package.html
similarity index 100%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/package.html
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/package.html
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepoinitPathTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepoinitPathTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepoinitPathTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepoinitPathTest.java
index 2ddc051..f85594a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepoinitPathTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepoinitPathTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.repository;
+package org.apache.sling.starter.webapp.integrationtest.repository;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepositoryInitializersTest.java
similarity index 88%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepositoryInitializersTest.java
index e72ca5f..48e7802 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryInitializersTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepositoryInitializersTest.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.repository;
+package org.apache.sling.starter.webapp.integrationtest.repository;
 
 import java.io.IOException;
 
 import org.apache.sling.commons.testing.integration.HttpTest;
-import org.apache.sling.launchpad.testservices.repository.FirstRepositoryInitializer;
-import org.apache.sling.launchpad.testservices.repository.SecondRepositoryInitializer;
+import org.apache.sling.starter.testservices.repository.FirstRepositoryInitializer;
+import org.apache.sling.starter.testservices.repository.SecondRepositoryInitializer;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepositoryNameTest.java
similarity index 91%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepositoryNameTest.java
index 71bcb90..6f8249b 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/RepositoryNameTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/RepositoryNameTest.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.repository;
+package org.apache.sling.starter.webapp.integrationtest.repository;
 
 import org.apache.sling.commons.testing.integration.HttpTest;
-import org.apache.sling.launchpad.webapp.integrationtest.util.RepositoryTestUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.RepositoryTestUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/SystemUsersTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/SystemUsersTest.java
index 10471d7..dce9616 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/repository/SystemUsersTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/repository/SystemUsersTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.repository;
+package org.apache.sling.starter.webapp.integrationtest.repository;
 
 import javax.jcr.Credentials;
 import javax.jcr.RepositoryException;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java
index b0a9000..5363c42 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceprovider/PlanetsResourceProviderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.resourceprovider;
+package org.apache.sling.starter.webapp.integrationtest.resourceprovider;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java
index f7e4af3..d6e43a4 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceresolver/ResourceResolverApiTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.resourceresolver;
+package org.apache.sling.starter.webapp.integrationtest.resourceresolver;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -29,7 +29,7 @@ import org.apache.sling.api.resource.ResourceResolver;
 import org.apache.sling.api.resource.ResourceResolverFactory;
 import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.launchpad.testservices.exported.FakeSlingHttpServletRequest;
+import org.apache.sling.starter.testservices.exported.FakeSlingHttpServletRequest;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java
index 4f68f67..d462e92 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/resourceresolver/ResourceResolverGeneralTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.resourceresolver;
+package org.apache.sling.starter.webapp.integrationtest.resourceresolver;
 
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
@@ -45,9 +45,9 @@ import org.apache.sling.api.resource.ResourceUtil;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.jcr.base.util.AccessControlUtil;
 import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.launchpad.testservices.events.EventsCounter;
-import org.apache.sling.launchpad.testservices.exported.FakeSlingHttpServletRequest;
-import org.apache.sling.launchpad.testservices.exported.MappingsFacade;
+import org.apache.sling.starter.testservices.events.EventsCounter;
+import org.apache.sling.starter.testservices.exported.FakeSlingHttpServletRequest;
+import org.apache.sling.starter.testservices.exported.MappingsFacade;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/runmodes/InactiveRunModeTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/runmodes/InactiveRunModeTest.java
index a8fb74a..281ed8a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/runmodes/InactiveRunModeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/runmodes/InactiveRunModeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.runmodes;
+package org.apache.sling.starter.webapp.integrationtest.runmodes;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/SlingJSPTaglibTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/SlingJSPTaglibTest.java
similarity index 93%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/SlingJSPTaglibTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/SlingJSPTaglibTest.java
index 1b8b3f6..1b1c35d 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/SlingJSPTaglibTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/SlingJSPTaglibTest.java
@@ -1,84 +1,84 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.sling.launchpad.webapp.integrationtest.scripting;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
-import org.apache.sling.servlets.post.SlingPostConstants;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Integration test of the new taglibs. Sets up a Sling instance, posts a simple
- * Test JSP and page to it and then checks to make sure the page responds with a
- * 200 response.
- */
-public class SlingJSPTaglibTest extends RenderingTestBase {
-    private static final Logger log = LoggerFactory.getLogger(SlingJSPTaglibTest.class);
-    private String testPage;
-
-    protected void setUp() throws Exception {
-        super.setUp();
-        log.info("setUp");
-
-        final String testRootPath = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis();
-        log.info("Creating testing content...");
-        Map<String, String> props = new HashMap<String, String>() {
-            {
-                this.put("jcr:primaryType", "nt:unstructured");
-                this.put("sling:resourceType", "integration-test/taglib-test");
-            }
-        };
-        testPage = testClient.createNode(testRootPath + SlingPostConstants.DEFAULT_CREATE_SUFFIX, props);
-
-        log.info("Creating testing component...");
-        testClient.mkdirs(HTTP_BASE_URL, "/apps/integration-test/taglib-test");
-        testClient.upload(
-                HTTP_BASE_URL + "/apps/integration-test/taglib-test/taglib-test.jsp",
-                SlingJSPTaglibTest.class.getClassLoader().getResourceAsStream("integration-test/taglib-test.jsp"));
-
-        log.info("Initialization successful");
-    }
-
-    /**
-     * Tests the taglib.
-     *
-     * @throws Exception
-     */
-    public void testTaglib() throws Exception {
-        log.info("testTaglib");
-
-        log.info("Executing content check");
-
-        final String content = getContent(testPage + ".html", CONTENT_TYPE_HTML);
-        log.info(content);
-        assertContains(content, "All Tests Succeeded");
-
-        // tests for the encoding stuff
-        assertContains(content, "HTML_ENCODE:&amp;amp;Hello World!&lt;script&gt;&lt;/script&gt;");
-        assertContains(content, "DEFAULT:&amp;amp;Hello World!&lt;script&gt;&lt;/script&gt;");
-        assertContains(content, "EL_VALUE:I&#39;m Awesome!!");
-        assertContains(content, "BODY_CONTENT:&amp;copy;Body Content");
-        assertContains(content, "BODY_CONTENT_FALLBACK:1");
-
-        log.info("testTaglib - TEST SUCCESSFUL");
-    }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.starter.webapp.integrationtest.scripting;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.RenderingTestBase;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Integration test of the new taglibs. Sets up a Sling instance, posts a simple
+ * Test JSP and page to it and then checks to make sure the page responds with a
+ * 200 response.
+ */
+public class SlingJSPTaglibTest extends RenderingTestBase {
+    private static final Logger log = LoggerFactory.getLogger(SlingJSPTaglibTest.class);
+    private String testPage;
+
+    protected void setUp() throws Exception {
+        super.setUp();
+        log.info("setUp");
+
+        final String testRootPath = HTTP_BASE_URL + "/" + getClass().getSimpleName() + "/" + System.currentTimeMillis();
+        log.info("Creating testing content...");
+        Map<String, String> props = new HashMap<String, String>() {
+            {
+                this.put("jcr:primaryType", "nt:unstructured");
+                this.put("sling:resourceType", "integration-test/taglib-test");
+            }
+        };
+        testPage = testClient.createNode(testRootPath + SlingPostConstants.DEFAULT_CREATE_SUFFIX, props);
+
+        log.info("Creating testing component...");
+        testClient.mkdirs(HTTP_BASE_URL, "/apps/integration-test/taglib-test");
+        testClient.upload(
+                HTTP_BASE_URL + "/apps/integration-test/taglib-test/taglib-test.jsp",
+                SlingJSPTaglibTest.class.getClassLoader().getResourceAsStream("integration-test/taglib-test.jsp"));
+
+        log.info("Initialization successful");
+    }
+
+    /**
+     * Tests the taglib.
+     *
+     * @throws Exception
+     */
+    public void testTaglib() throws Exception {
+        log.info("testTaglib");
+
+        log.info("Executing content check");
+
+        final String content = getContent(testPage + ".html", CONTENT_TYPE_HTML);
+        log.info(content);
+        assertContains(content, "All Tests Succeeded");
+
+        // tests for the encoding stuff
+        assertContains(content, "HTML_ENCODE:&amp;amp;Hello World!&lt;script&gt;&lt;/script&gt;");
+        assertContains(content, "DEFAULT:&amp;amp;Hello World!&lt;script&gt;&lt;/script&gt;");
+        assertContains(content, "EL_VALUE:I&#39;m Awesome!!");
+        assertContains(content, "BODY_CONTENT:&amp;copy;Body Content");
+        assertContains(content, "BODY_CONTENT_FALLBACK:1");
+
+        log.info("testTaglib - TEST SUCCESSFUL");
+    }
+}
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java
index 158d543..3ccb607 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/StandaloneScriptExecutionTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.scripting;
+package org.apache.sling.starter.webapp.integrationtest.scripting;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/htl/HtlTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/htl/HtlTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/htl/HtlTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/htl/HtlTest.java
index ca08a2f..f57f43d 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/scripting/htl/HtlTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/scripting/htl/HtlTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.scripting.htl;
+package org.apache.sling.starter.webapp.integrationtest.scripting.htl;
 
 import java.io.IOException;
 import java.util.Collections;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/HeadServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/HeadServletTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/HeadServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/HeadServletTest.java
index 94a9d24..c62978a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/HeadServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/HeadServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets;
+package org.apache.sling.starter.webapp.integrationtest.servlets;
 
 import java.io.IOException;
 import java.util.UUID;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/R6WhiteboardServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
similarity index 94%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
index 2396611..0ef9877 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/R6WhiteboardServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets;
+package org.apache.sling.starter.webapp.integrationtest.servlets;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/RequestDispatcherServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/RequestDispatcherServletTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/RequestDispatcherServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/RequestDispatcherServletTest.java
index d8701cf..522cf1f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/RequestDispatcherServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/RequestDispatcherServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets;
+package org.apache.sling.starter.webapp.integrationtest.servlets;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/CustomPostOperationTest.java
similarity index 90%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/CustomPostOperationTest.java
index d207e27..4ac3e72 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/CustomPostOperationTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/CustomPostOperationTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -55,12 +55,12 @@ public class CustomPostOperationTest extends HttpTestBase {
     public void testCustomPostOperation() throws Exception {
         assertCustomPostOperation(
                 "test:SlingPostOperationExample",
-                "org.apache.sling.launchpad.testservices.post.SlingPostOperationExample");
+                "org.apache.sling.starter.testservices.post.SlingPostOperationExample");
     }
 
     public void testOldStyleCustomPostOperation() throws Exception {
         assertCustomPostOperation(
                 "test:OldStylePostOperationExample",
-                "org.apache.sling.launchpad.testservices.post.OldStylePostOperationExample");
+                "org.apache.sling.starter.testservices.post.OldStylePostOperationExample");
     }
 }
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostResponseCreatorTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostResponseCreatorTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostResponseCreatorTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostResponseCreatorTest.java
index 91dbed6..2a0cbdb 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostResponseCreatorTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostResponseCreatorTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostSendErrorTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostSendErrorTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostSendErrorTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostSendErrorTest.java
index 7188372..21552e2 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostSendErrorTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostSendErrorTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java
index 15de1e2..dc039a0 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtCopyTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java
index 9cacd0d..db3e413 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtDeleteTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -29,8 +29,8 @@ import java.util.Map;
 import jakarta.json.JsonObject;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /** Test support of @Delete suffix of SLING-458 */
 public class PostServletAtDeleteTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java
index d6bbfc5..da96512 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletAtMoveTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCopyTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletCopyTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCopyTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletCopyTest.java
index 5b52a59..d30951a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCopyTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletCopyTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -30,8 +30,8 @@ import jakarta.json.JsonObject;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.sling.commons.testing.integration.HttpStatusCodeException;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /** Test node copy via the MicrojaxPostServlet */
 public class PostServletCopyTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletCreateTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletCreateTest.java
index 27e5a61..197293e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletCreateTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletCreateTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteParentTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletDeleteParentTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteParentTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletDeleteParentTest.java
index 37be4b7..793d91a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteParentTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletDeleteParentTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
index 09b0338..641e00b 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletDeleteTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletImportTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletImportTest.java
index 0ec4762..81ef169 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletImportTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletImportTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -42,8 +42,8 @@ import org.apache.commons.httpclient.HttpMethod;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 import org.apache.sling.commons.testing.integration.NameValuePairList;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /** Test content import via the MicrojaxPostServlet */
 public class PostServletImportTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletMoveTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletMoveTest.java
index 0577242..801ac04 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletMoveTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletMoveTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -30,8 +30,8 @@ import jakarta.json.JsonObject;
 import org.apache.commons.httpclient.NameValuePair;
 import org.apache.sling.commons.testing.integration.HttpStatusCodeException;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /** Test node move via the MicrojaxPostServlet */
 public class PostServletMoveTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletNopTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletNopTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletNopTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletNopTest.java
index 680d4fe..b2a0835 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletNopTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletNopTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletOrderTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletOrderTest.java
index 5dc8f90..cc2e24f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOrderTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletOrderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -25,7 +25,7 @@ import java.util.Map;
 import jakarta.json.JsonException;
 import jakarta.json.JsonObject;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /** Test the order option for node creation via the MicrojaxPostServlet */
 public class PostServletOrderTest extends HttpTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOutputContentTypeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletOutputContentTypeTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOutputContentTypeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletOutputContentTypeTest.java
index ffcd7f6..28ffcbe 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletOutputContentTypeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletOutputContentTypeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.NameValuePair;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPatchTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletPatchTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPatchTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletPatchTest.java
index e1f2af7..803e278 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPatchTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletPatchTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 import org.apache.sling.commons.testing.integration.NameValuePairList;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java
index a7f383b..5641b91 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletPrivilegesUpdateTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
@@ -45,9 +45,9 @@ import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.sling.commons.testing.integration.HttpTest;
 import org.apache.sling.commons.testing.integration.NameValuePairList;
-import org.apache.sling.launchpad.webapp.integrationtest.AuthenticatedTestUtil;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.AuthenticatedTestUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Ignore;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
index 078978f..396bf01 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletUpdateTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -30,9 +30,9 @@ import jakarta.json.JsonArray;
 import jakarta.json.JsonException;
 import jakarta.json.JsonObject;
 import org.apache.commons.httpclient.NameValuePair;
-import org.apache.sling.launchpad.webapp.integrationtest.AuthenticatedTestUtil;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.AuthenticatedTestUtil;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 
 /** Test node updates via the MicrojaxPostServlet */
 public class PostServletUpdateTest extends AuthenticatedTestUtil {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletVersionableTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletVersionableTest.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletVersionableTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletVersionableTest.java
index 883e323..ea2bb74 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostServletVersionableTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostServletVersionableTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostStatusTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostStatusTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostStatusTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostStatusTest.java
index 4947978..bcd640f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostStatusTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostStatusTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostToRootTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostToRootTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostToRootTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostToRootTest.java
index 17caf01..1fa07f4 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/PostToRootTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/PostToRootTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java
index dd2b700..441dce6 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/ReferenceTypeHintTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -26,8 +26,8 @@ import jakarta.json.JsonArray;
 import jakarta.json.JsonObject;
 import org.apache.sling.commons.testing.integration.HttpTestBase;
 import org.apache.sling.commons.testing.integration.NameValuePairList;
-import org.apache.sling.launchpad.webapp.integrationtest.util.JsonUtil;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.util.JsonUtil;
 import org.custommonkey.xmlunit.NamespaceContext;
 import org.custommonkey.xmlunit.SimpleNamespaceContext;
 import org.custommonkey.xmlunit.XMLAssert;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java
index c45c66d..0532407 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingAutoPropertiesTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDateValuesTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingDateValuesTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDateValuesTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingDateValuesTest.java
index 5da4aeb..12b40ff 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDateValuesTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingDateValuesTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.io.IOException;
 import java.text.DateFormat;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java
index 51d84c3..6e1e73f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingDefaultValuesTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingPostProcessorTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingPostProcessorTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingPostProcessorTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingPostProcessorTest.java
index b5d93cd..1a98163 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingPostProcessorTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingPostProcessorTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import java.io.IOException;
 import java.util.UUID;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
index 80a92b9..491486d 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/post/SlingSessionInfoTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.post;
+package org.apache.sling.starter.webapp.integrationtest.servlets.post;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
similarity index 94%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
index 549e206..fd3bad8 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/ExtensionServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 /** Test the ExtensionServlet */
 public class ExtensionServletTest extends ResolutionTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/HtmlDefaultServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/HtmlDefaultServletTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/HtmlDefaultServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/HtmlDefaultServletTest.java
index d3b4d8e..6e464c7 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/HtmlDefaultServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/HtmlDefaultServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -29,7 +29,7 @@ import org.apache.sling.testing.tools.retry.RetryLoop.Condition;
 public class HtmlDefaultServletTest extends ResolutionTestBase {
 
     public static final String CONFIG_SERVLET = HTTP_BASE_URL
-            + "/system/console/configMgr/org.apache.sling.launchpad.testservices.servlets.HtmlDefaultServlet";
+            + "/system/console/configMgr/org.apache.sling.starter.testservices.servlets.HtmlDefaultServlet";
 
     @Override
     protected void setUp() throws Exception {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PathsServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PathsServletTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PathsServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PathsServletTest.java
index 6c6334a..5ec78b3 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PathsServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PathsServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 import javax.servlet.http.HttpServletResponse;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PathsServletWithNodeTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PathsServletWithNodeTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PathsServletWithNodeTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PathsServletWithNodeTest.java
index f1a6569..18ad397 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PathsServletWithNodeTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PathsServletWithNodeTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 import java.util.Collections;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PrefixTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PrefixTest.java
index fc5495b..a9f5485 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrefixTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PrefixTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 /** Verify that PrefixServletZero overrides PrefixServletMinusOne */
 public class PrefixTest extends ResolutionTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
similarity index 93%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
index 99e5ee3..69e9d21 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PrioritiesTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 /** Test the priority of servlet selection mechanisms */
 public class PrioritiesTest extends ResolutionTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
index 503f96f..ddc87ae 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/PutMethodServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 import org.apache.commons.httpclient.methods.PutMethod;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestObjectTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/RequestObjectTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestObjectTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/RequestObjectTest.java
index 995b7a8..f7ed987 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestObjectTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/RequestObjectTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 import java.io.IOException;
 import java.util.Properties;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestUriOptingServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/RequestUriOptingServletTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestUriOptingServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/RequestUriOptingServletTest.java
index 23a31e1..b1db37d 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/RequestUriOptingServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/RequestUriOptingServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 import org.apache.commons.httpclient.methods.PostMethod;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
index 9ec33b3..f2d5051 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/ResolutionTestBase.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@ import org.apache.sling.commons.testing.integration.HttpTestBase;
 /** Base class for servlet resolution tests */
 class ResolutionTestBase extends HttpTestBase {
     public static final String CLASS_PROP = "servlet.class.name";
-    public static final String TEST_SERVLET_MARKER = "created by org.apache.sling.launchpad.testservices.servlets";
+    public static final String TEST_SERVLET_MARKER = "created by org.apache.sling.starter.testservices.servlets";
     public static final String TEST_RESOURCE_TYPE = "LAUNCHPAD_TEST_ResourceType";
     public static final String TEST_PATH = "/servlet-resolution-tests/" + System.currentTimeMillis();
     public static final String NONEXISTING_RESOURCE_URL = HTTP_BASE_URL + TEST_PATH + "/NonExistingResource";
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
index 4f34847..843f8a9 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolution/SelectorServletTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolution;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolution;
 
 import org.apache.commons.httpclient.methods.PostMethod;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
index 79348fb..3bee622 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/servlets/resolver/errorhandler/ErrorHandlingTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.servlets.resolver.errorhandler;
+package org.apache.sling.starter.webapp.integrationtest.servlets.resolver.errorhandler;
 
 import java.io.StringReader;
 import java.util.ArrayList;
@@ -28,8 +28,8 @@ import jakarta.json.Json;
 import jakarta.json.JsonObject;
 import jakarta.json.JsonReader;
 import org.apache.commons.httpclient.NameValuePair;
-import org.apache.sling.launchpad.webapp.integrationtest.RenderingTestBase;
 import org.apache.sling.servlets.post.SlingPostConstants;
+import org.apache.sling.starter.webapp.integrationtest.RenderingTestBase;
 
 /** Test the sling error handling mechanism http://sling.apache.org/site/errorhandling.html*/
 public class ErrorHandlingTest extends RenderingTestBase {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/BasicTeleporterTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/BasicTeleporterTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/BasicTeleporterTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/BasicTeleporterTest.java
index defdfa7..ed2531b 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/BasicTeleporterTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/BasicTeleporterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import java.io.IOException;
 import java.util.UUID;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/EmbeddedDependenciesTeleporterTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/EmbeddedDependenciesTeleporterTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/EmbeddedDependenciesTeleporterTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/EmbeddedDependenciesTeleporterTest.java
index 733bc9d..e617143 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/EmbeddedDependenciesTeleporterTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/EmbeddedDependenciesTeleporterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/GeneratorRule.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/GeneratorRule.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/GeneratorRule.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/GeneratorRule.java
index 57f4f3c..a588d45 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/GeneratorRule.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/GeneratorRule.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/LdapFilterTeleporterTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/LdapFilterTeleporterTest.java
similarity index 92%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/LdapFilterTeleporterTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/LdapFilterTeleporterTest.java
index a664b74..c2d9714 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/LdapFilterTeleporterTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/LdapFilterTeleporterTest.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import org.apache.sling.junit.rules.TeleporterRule;
-import org.apache.sling.launchpad.testservices.exported.StringTransformer;
+import org.apache.sling.starter.testservices.exported.StringTransformer;
 import org.junit.Rule;
 import org.junit.Test;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/LocalServiceTeleporterTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/LocalServiceTeleporterTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/LocalServiceTeleporterTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/LocalServiceTeleporterTest.java
index 104cc3f..0b7145c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/LocalServiceTeleporterTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/LocalServiceTeleporterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import java.util.UUID;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/MultipleRulesTeleporterTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/MultipleRulesTeleporterTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/MultipleRulesTeleporterTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/MultipleRulesTeleporterTest.java
index 1b9a3c3..da61da5 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/MultipleRulesTeleporterTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/MultipleRulesTeleporterTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import org.apache.sling.junit.rules.TeleporterRule;
 import org.junit.After;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/ServicesPresentTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/ServicesPresentTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/ServicesPresentTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/ServicesPresentTest.java
index 41c6b9f..a8d5695 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/ServicesPresentTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/ServicesPresentTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import org.apache.sling.junit.rules.TeleporterRule;
 import org.junit.Rule;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomePojo.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomePojo.java
similarity index 93%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomePojo.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomePojo.java
index 8f12721..ca1341a 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomePojo.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomePojo.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 /** POJO used indirectly by RequiredDependenciesTest */
 public class SomePojo {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeService.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeService.java
similarity index 92%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeService.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeService.java
index 47837a4..42e8f99 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeService.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeService.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 public interface SomeService {
     String getValue();
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeString.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeString.java
similarity index 93%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeString.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeString.java
index 62588fc..6fda6ed 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeString.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeString.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 /** POJO used indirectly by RequiredDependenciesTest */
 public class SomeString {
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeUtility.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeUtility.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeUtility.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeUtility.java
index fe6590d..e18d02d 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/SomeUtility.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/SomeUtility.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleportedResourcesFolderTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleportedResourcesFolderTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleportedResourcesFolderTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleportedResourcesFolderTest.java
index 0a06f25..7fe1a95 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleportedResourcesFolderTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleportedResourcesFolderTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleportedResourcesSingleTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleportedResourcesSingleTest.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleportedResourcesSingleTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleportedResourcesSingleTest.java
index 226df40..6b1e12c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleportedResourcesSingleTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleportedResourcesSingleTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleporterOptionsTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleporterOptionsTest.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleporterOptionsTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleporterOptionsTest.java
index d6bc7f7..ede1c1f 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/teleporter/TeleporterOptionsTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/teleporter/TeleporterOptionsTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.teleporter;
+package org.apache.sling.starter.webapp.integrationtest.teleporter;
 
 import java.util.UUID;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/EventsCounterUtil.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/EventsCounterUtil.java
similarity index 97%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/EventsCounterUtil.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/util/EventsCounterUtil.java
index 3957079..e747154 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/EventsCounterUtil.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/EventsCounterUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.util;
+package org.apache.sling.starter.webapp.integrationtest.util;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/JsonUtil.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/JsonUtil.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/JsonUtil.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/util/JsonUtil.java
index 5cef860..bad108e 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/JsonUtil.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/JsonUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.util;
+package org.apache.sling.starter.webapp.integrationtest.util;
 
 import java.io.StringReader;
 import java.io.StringWriter;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/RepositoryTestUtil.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/RepositoryTestUtil.java
similarity index 96%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/RepositoryTestUtil.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/util/RepositoryTestUtil.java
index 0943ff2..4a19d81 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/RepositoryTestUtil.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/RepositoryTestUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.util;
+package org.apache.sling.starter.webapp.integrationtest.util;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/ServerSideTestClient.java
similarity index 99%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/util/ServerSideTestClient.java
index c850d5e..6c57ec5 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/ServerSideTestClient.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/ServerSideTestClient.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.util;
+package org.apache.sling.starter.webapp.integrationtest.util;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/UniqueResourceType.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/UniqueResourceType.java
similarity index 94%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/UniqueResourceType.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/util/UniqueResourceType.java
index 2c92eb4..d33e08c 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/util/UniqueResourceType.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/util/UniqueResourceType.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.util;
+package org.apache.sling.starter.webapp.integrationtest.util;
 
 import java.util.UUID;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/DomTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/DomTest.java
index d3c9307..b9a6aa7 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/DomTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/DomTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.xml;
+package org.apache.sling.starter.webapp.integrationtest.xml;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/SaxTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/SaxTest.java
index 2db20bc..bc2f859 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/SaxTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/SaxTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.xml;
+package org.apache.sling.starter.webapp.integrationtest.xml;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/XPathTest.java b/src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/XPathTest.java
similarity index 95%
rename from src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/XPathTest.java
rename to src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/XPathTest.java
index 258e54a..c0638a1 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/integrationtest/xml/XPathTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/integrationtest/xml/XPathTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.integrationtest.xml;
+package org.apache.sling.starter.webapp.integrationtest.xml;
 
 import java.io.IOException;
 
diff --git a/src/main/java/org/apache/sling/launchpad/webapp/jsp/TagFileTest.java b/src/main/java/org/apache/sling/starter/webapp/jsp/TagFileTest.java
similarity index 98%
rename from src/main/java/org/apache/sling/launchpad/webapp/jsp/TagFileTest.java
rename to src/main/java/org/apache/sling/starter/webapp/jsp/TagFileTest.java
index ad5be04..65f8bdf 100644
--- a/src/main/java/org/apache/sling/launchpad/webapp/jsp/TagFileTest.java
+++ b/src/main/java/org/apache/sling/starter/webapp/jsp/TagFileTest.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.launchpad.webapp.jsp;
+package org.apache.sling.starter.webapp.jsp;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
diff --git a/src/main/resources/integration-test/enum-test.jsp b/src/main/resources/integration-test/enum-test.jsp
index b8b8132..8a17d98 100644
--- a/src/main/resources/integration-test/enum-test.jsp
+++ b/src/main/resources/integration-test/enum-test.jsp
@@ -21,7 +21,7 @@
 <%@page 
   session="false"
   contentType="text/plain"
-  import="org.apache.sling.launchpad.testservices.exported.TestEnum"
+  import="org.apache.sling.starter.testservices.exported.TestEnum"
 %>
 
 1) FOO=<%
diff --git a/src/main/resources/integration-test/htl/model.html b/src/main/resources/integration-test/htl/model.html
index 5a5b55c..8c677f5 100644
--- a/src/main/resources/integration-test/htl/model.html
+++ b/src/main/resources/integration-test/htl/model.html
@@ -22,7 +22,7 @@
    <title>Page with Model use-bean</title>
   </head>
   <body>
-  	<div data-sly-use.model="org.apache.sling.launchpad.testservices.models.DummyModel">
+  	<div data-sly-use.model="org.apache.sling.starter.testservices.models.DummyModel">
   		${model.message}
   	</div>
   </body>