diff --git a/flow-server/src/main/java/com/vaadin/flow/component/page/AppShellConfigurator.java b/flow-server/src/main/java/com/vaadin/flow/component/page/AppShellConfigurator.java
index 9ac47086df4..29953196e72 100644
--- a/flow-server/src/main/java/com/vaadin/flow/component/page/AppShellConfigurator.java
+++ b/flow-server/src/main/java/com/vaadin/flow/component/page/AppShellConfigurator.java
@@ -58,7 +58,7 @@
  * @BodySize(height = "100vh", width = "100vw")
  * @PageTitle("my-title")
  * CPush(value = PushMode.AUTOMATIC, transport = Transport.WEBSOCKET_XHR)
- * public class AppShell implements VaadinAppShell {
+ * public class AppShell implements AppShellConfigurator {
  * }
  * </code>
  *
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/AppShellRegistry.java b/flow-server/src/main/java/com/vaadin/flow/server/AppShellRegistry.java
index 0aef056ebf1..18381755805 100644
--- a/flow-server/src/main/java/com/vaadin/flow/server/AppShellRegistry.java
+++ b/flow-server/src/main/java/com/vaadin/flow/server/AppShellRegistry.java
@@ -121,7 +121,7 @@ public void reset() {
      * null to reset the previous one when reusing the instance.
      *
      * @param shell
-     *            the class extending VaadinAppShell class.
+     *            the class implementing AppShellConfigurator.
      */
     public void setShell(Class<? extends AppShellConfigurator> shell) {
         if (this.appShellClass != null && shell != null) {
diff --git a/flow-server/src/main/java/com/vaadin/flow/server/startup/VaadinAppShellInitializer.java b/flow-server/src/main/java/com/vaadin/flow/server/startup/VaadinAppShellInitializer.java
index e6a4832b2f3..971c48d8516 100644
--- a/flow-server/src/main/java/com/vaadin/flow/server/startup/VaadinAppShellInitializer.java
+++ b/flow-server/src/main/java/com/vaadin/flow/server/startup/VaadinAppShellInitializer.java
@@ -126,7 +126,7 @@ public static void init(Set<Class<?>> classes, ServletContext context,
         List<String> offendingAnnotations = new ArrayList<>();
 
         classes.stream()
-                // sort classes by putting VaadinAppShell in first position
+                // sort classes by putting the app shell in first position
                 .sorted((a, b) -> registry.isShell(a) ? -1
                         : registry.isShell(b) ? 1 : 0)
                 .forEach(clz -> {