diff --git a/tests/src/Functional/BambooTwigTestBase.php b/tests/src/Functional/BambooTwigTestBase.php
index a82eab1..2b0f4de 100644
--- a/tests/src/Functional/BambooTwigTestBase.php
+++ b/tests/src/Functional/BambooTwigTestBase.php
@@ -51,7 +51,7 @@ abstract class BambooTwigTestBase extends BrowserTestBase {
   /**
    * {@inheritdoc}
    */
-  protected $defaultTheme = 'bamboo_twig_test';
+  protected $defaultTheme = 'bamboo_twig_theme_test';
 
   /**
    * {@inheritdoc}
diff --git a/tests/themes/bamboo_twig_test/bamboo_twig_test.info.yml b/tests/themes/bamboo_twig_theme_test/bamboo_twig_theme_test.info.yml
similarity index 79%
rename from tests/themes/bamboo_twig_test/bamboo_twig_test.info.yml
rename to tests/themes/bamboo_twig_theme_test/bamboo_twig_theme_test.info.yml
index c97655c..88c3db0 100644
--- a/tests/themes/bamboo_twig_test/bamboo_twig_test.info.yml
+++ b/tests/themes/bamboo_twig_theme_test/bamboo_twig_theme_test.info.yml
@@ -1,4 +1,4 @@
-name: Bamboo Twig Test
+name: Bamboo Twig Theme Test
 type: theme
 description: The Official Theme for Bamboo Twig Tests
 base theme: starterkit_theme
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/config.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/config.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/config.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/config.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/extensions.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/extensions.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/extensions.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/extensions.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/file.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/file.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/file.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/file.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/i18n.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/i18n.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/i18n.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/i18n.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/loader.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/loader.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/loader.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/loader.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/loader_revision.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/loader_revision.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/loader_revision.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/loader_revision.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/path.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/path.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/path.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/path.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/render.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/render.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/render.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/render.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/render_revision.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/render_revision.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/render_revision.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/render_revision.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/security.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/security.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/security.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/security.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/bamboo_twig/token.html.twig b/tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/token.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/bamboo_twig/token.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/bamboo_twig/token.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/content/node--article--full.html.twig b/tests/themes/bamboo_twig_theme_test/templates/content/node--article--full.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/content/node--article--full.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/content/node--article--full.html.twig
diff --git a/tests/themes/bamboo_twig_test/templates/content/node--page--full.html.twig b/tests/themes/bamboo_twig_theme_test/templates/content/node--page--full.html.twig
similarity index 100%
rename from tests/themes/bamboo_twig_test/templates/content/node--page--full.html.twig
rename to tests/themes/bamboo_twig_theme_test/templates/content/node--page--full.html.twig