Index: appserver/web/web-naming/src/main/java/org/apache/naming/resources/WebNamingStartup.java
===================================================================
--- appserver/web/web-naming/src/main/java/org/apache/naming/resources/WebNamingStartup.java	(revision 56857)
+++ appserver/web/web-naming/src/main/java/org/apache/naming/resources/WebNamingStartup.java	(working copy)
@@ -41,7 +41,7 @@
 
 package org.apache.naming.resources;
 
-import org.glassfish.api.StartupRunLevel;
+import org.glassfish.internal.api.InitRunLevel;
 import org.glassfish.hk2.runlevel.RunLevel;
 import org.jvnet.hk2.annotations.Service;
 
@@ -51,6 +51,6 @@
  * @author sanjeeb.sahoo@oracle.com
  */
 @Service
-@RunLevel(StartupRunLevel.VAL)
+@RunLevel(InitRunLevel.VAL) // This is an Init level service - see GLASSFISH-19216
 public class WebNamingStartup {
 }
Index: appserver/web/web-naming/pom.xml
===================================================================
--- appserver/web/web-naming/pom.xml	(revision 56857)
+++ appserver/web/web-naming/pom.xml	(working copy)
@@ -96,7 +96,7 @@
         <dependency>
             <!-- Needed for Startup service -->
             <groupId>org.glassfish.main.common</groupId>
-            <artifactId>glassfish-api</artifactId>
+            <artifactId>internal-api</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>