diff --git a/.htaccess b/.htaccess
index fd7bd29..58ab95e 100644
--- a/.htaccess
+++ b/.htaccess
@@ -114,7 +114,7 @@ AddEncoding gzip svgz
   #
   # If your site is running in a VirtualDocumentRoot at http://example.com/,
   # uncomment the following line:
-  # RewriteBase /
+  RewriteBase /
 
   # Redirect common PHP files to their new locations.
   RewriteCond %{REQUEST_URI} ^(.*)?/(install.php) [OR]
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
index f15eef5..c8a1b0d 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
@@ -20,12 +20,7 @@ class ConfigEntityType extends EntityType implements ConfigEntityTypeInterface {
   /**
    * The config prefix set in the configuration entity type annotation.
    *
-   * The default configuration prefix is constructed from the name of the module
-   * that provides the entity type and the ID of the entity type. If a
-   * config_prefix annotation is present it will be used in place of the entity
-   * type ID.
-   *
-   * @see \Drupal\Core\Config\Entity\ConfigEntityType::getConfigPrefix()
+   * @see \Drupal\Core\Config\Entity\ConfigEntityTypeInterface::getConfigPrefix()
    */
   protected $config_prefix;
 
@@ -81,10 +76,7 @@ public function __construct($definition) {
    */
   public function getConfigPrefix() {
     // Ensure that all configuration entities are prefixed by the name of the
-    // module that provides the configuration entity type. This ensures that
-    // default configuration will be created as expected during module
-    // installation and dependencies can be calculated without the modules that
-    // provide the entity types being installed.
+    // module that provides the configuration entity type.
     if (isset($this->config_prefix)) {
       $config_prefix = $this->provider . '.' . $this->config_prefix;
     }
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php
index 0f26ae0..2d1926a 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityTypeInterface.php
@@ -49,15 +49,21 @@
   /**
    * Gets the config prefix used by the configuration entity type.
    *
-   * Ensures that all configuration entities are prefixed by the module that
-   * provides the configuration entity type. This ensures that if a
-   * configuration entity is contained in a extension's default configuration,
-   * it will be created during extension installation. Additionally, it allows
-   * dependencies to be calculated without the modules that provide
-   * configuration entity types being installed.
+   * The config prefix is used to prefix configuration entity IDs when they are
+   * stored in the configuration system. The default config prefix is
+   * constructed from the name of the module that provides the entity type and
+   * the ID of the entity type. If a config_prefix annotation is present it will
+   * be used in place of the entity type ID.
    *
-   * @return string|bool
-   *   The config prefix, or FALSE if not a configuration entity type.
+   * Prefixing with the module that provides the configuration entity type
+   * ensures that configuration entities depend on the module that provides the
+   * configuration entity type.
+   *
+   * @return string
+   *   The config prefix.
+   *
+   * @throws \Drupal\Core\Config\ConfigPrefixLengthException
+   *   Exception thrown when the length of the prefix exceeds PREFIX_LENGTH.
    */
   public function getConfigPrefix();