diff --git a/sling-parent/pom.xml b/sling-parent/pom.xml
index d99ce8d..5be7539 100644
--- a/sling-parent/pom.xml
+++ b/sling-parent/pom.xml
@@ -885,11 +885,11 @@
                 Starter version. It is designed to include the current version of the bundle as an override
                 so that the tests are executed against the version of the bundle being built.
             -->
-            <id>run-starter-its</id>
+            <id>starter-its</id>
             <activation>
                 <property>
                     <!-- the version of the Starter and Starter ITs to run, e.g. 12 or 13-SNAPSHOT -->
-                    <name>it.starter.version</name>
+                    <name>starter-its.starter.version</name>
                 </property>
             </activation>
             <properties>
@@ -899,9 +899,12 @@
                 <dependency>
                      <groupId>org.apache.sling</groupId>
                      <artifactId>org.apache.sling.launchpad.integration-tests</artifactId>
-                     <version>${it.starter.version}</version>
+                     <version>${starter-its.starter.version}</version>
                      <scope>test</scope>
-                     <!-- TODO - the integration tests should not depend on the SCR annotations -->
+                     <!--
+                        Remove various banned dependencies. These should be gradually removed from the integration-tests
+                        module.
+                    -->
                      <exclusions>
                          <exclusion>
                              <groupId>org.apache.felix</groupId>
@@ -933,7 +936,7 @@
                                 <phase>pre-integration-test</phase>
                                 <configuration>
                                     <portNames>
-                                        <portName>http.port</portName>
+                                        <portName>starter-its.http.port</portName>
                                     </portNames>
                                 </configuration>
                             </execution>
@@ -946,12 +949,12 @@
                         <extensions>true</extensions>
                         <executions>
                             <execution>
-                                <id>create-local-feature</id>
+                                <id>create-current-artifact-feature</id>
                                 <goals>
                                     <goal>include-artifact</goal>
                                 </goals>
                                 <configuration>
-                                    <includeArtifactClassifier>local-feature</includeArtifactClassifier>
+                                    <includeArtifactClassifier>current-artifact-feature</includeArtifactClassifier>
                                 </configuration>
                             </execution>
                             <execution>
@@ -971,11 +974,11 @@
                                             <includeArtifact>
                                                 <groupId>org.apache.sling</groupId>
                                                 <artifactId>org.apache.sling.starter</artifactId>
-                                                <version>${it.starter.version}</version>
+                                                <version>${starter-its.starter.version}</version>
                                                 <classifier>oak_tar_test</classifier>
                                                 <type>slingosgifeature</type>
                                             </includeArtifact>
-                                            <includeClassifier>local-feature</includeClassifier>
+                                            <includeClassifier>current-artifact-feature</includeClassifier>
                                             <!-- To apply the same override rule for all clashes, a wildcard using '*' for
                                                  groupID and artifactID can be used; this can be used as a catch all --> 
                                             <artifactsOverrides>
@@ -1011,10 +1014,10 @@
                                     </feature>
                                     <launcherArguments>
                                         <frameworkProperties>
-                                            <org.osgi.service.http.port>${http.port}</org.osgi.service.http.port>
+                                            <org.osgi.service.http.port>${starter-its.http.port}</org.osgi.service.http.port>
                                         </frameworkProperties>
                                     </launcherArguments>
-                                    <startTimeoutSeconds>${it.startTimeoutSeconds}</startTimeoutSeconds>
+                                    <startTimeoutSeconds>${starter-its.startTimeoutSeconds}</startTimeoutSeconds>
                                 </launch>
                             </launches>
                         </configuration>
@@ -1060,8 +1063,8 @@
                                 <exclude>org/apache/sling/launchpad/webapp/integrationtest/provisioning/**.java</exclude>
                             </excludes>
                            <systemPropertyVariables>
-                               <launchpad.http.server.url>http://localhost:${http.port}/</launchpad.http.server.url>
-                               <starter.http.test.ports>false:${http.port}</starter.http.test.ports>
+                               <launchpad.http.server.url>http://localhost:${starter-its.http.port}/</launchpad.http.server.url>
+                               <starter.http.test.ports>false:${starter-its.http.port}</starter.http.test.ports>
                                <starter.min.bundles.count>100</starter.min.bundles.count>
                                <!-- Comma-separated list of paths to check for 200 status (added for SLING-10402) -->
                                <starter.check.paths>