diff --git a/_config/base-config.yml b/_config/base-config.yml
index e99f8d8..c70651c 100755
--- a/_config/base-config.yml
+++ b/_config/base-config.yml
@@ -1,5 +1,5 @@
 ---
-Name: webapp-base-config
+Name: a2nt-cms-niceties-base-config
 ---
 SilverStripe\Core\Manifest\ModuleManifest:
   project: app
diff --git a/_config/base-extensions.yml b/_config/base-extensions.yml
index 5ddc89c..db541e4 100755
--- a/_config/base-extensions.yml
+++ b/_config/base-extensions.yml
@@ -1,5 +1,5 @@
 ---
-Name: webapp-base-extensions
+Name: a2nt-cms-niceties-base-extensions
 ---
 # Basic extensions
 SilverStripe\Admin\LeftAndMain:
diff --git a/_config/base-files.yml b/_config/base-files.yml
index 881603a..71dbc17 100755
--- a/_config/base-files.yml
+++ b/_config/base-files.yml
@@ -1,5 +1,5 @@
 ---
-Name: webapp-base-files
+Name: a2nt-cms-niceties-base-files
 ---
 SilverStripe\Blog\Model\BlogPost:
     featured_images_directory: 'blog-posts'
diff --git a/_config/base-graphql.yml b/_config/base-graphql.yml
index 9f98f7e..1083cb3 100644
--- a/_config/base-graphql.yml
+++ b/_config/base-graphql.yml
@@ -1,5 +1,5 @@
 ---
-Name: webapp-base-graphql
+Name: a2nt-cms-niceties-base-graphql
 After: graphqlconfig
 ---
 SilverStripe\Control\Director:
diff --git a/_config/base-logs.yml_ b/_config/base-logs.yml_
index 3da07ff..04fe1a6 100755
--- a/_config/base-logs.yml_
+++ b/_config/base-logs.yml_
@@ -1,5 +1,5 @@
 ---
-Name: webapp-base-logs-dev
+Name: a2nt-cms-niceties-base-logs-dev
 Only:
   environment: dev
 ---
@@ -15,7 +15,7 @@ SilverStripe\Core\Injector\Injector:
       Formatter: '%$SilverStripe\Logging\DetailedErrorFormatter'
       CLIFormatter: '%$SilverStripe\Logging\DetailedErrorFormatter'
 ---
-Name: webapp-base-logs-live
+Name: a2nt-cms-niceties-base-logs-live
 Except:
   environment: dev
 ---
diff --git a/_config/base-mimevalidator.yml b/_config/base-mimevalidator.yml
index d1261af..77faf5d 100644
--- a/_config/base-mimevalidator.yml
+++ b/_config/base-mimevalidator.yml
@@ -1,5 +1,5 @@
 ---
-Name: webapp-base-mimeuploadvalidator
+Name: a2nt-cms-niceties-base-mimeuploadvalidator
 After: '#mimeuploadvalidator'
 Only:
   moduleexists: 'silverstripe/mimevalidator'
diff --git a/_config/base-security.yml b/_config/base-security.yml
index e7b4c8a..762bfd3 100755
--- a/_config/base-security.yml
+++ b/_config/base-security.yml
@@ -1,5 +1,5 @@
 ---
-Name: 'webapp-base-security'
+Name: 'a2nt-cms-niceties-base-security'
 After: 'framework/*, cms/*, security_baseline'
 ---
 SilverStripe\Core\Injector\Injector:
diff --git a/_config/base-version-truncator.yml b/_config/base-version-truncator.yml
index 66bca45..98d67b4 100755
--- a/_config/base-version-truncator.yml
+++ b/_config/base-version-truncator.yml
@@ -1,5 +1,5 @@
 ---
-Name: 'webapp-base-version-truncator'
+Name: 'a2nt-cms-niceties-base-version-truncator'
 ---
 Axllent\VersionTruncator\VersionTruncator:
   keep_versions: 4           # how many (published) versions of each page to keep
diff --git a/_config/debugbar.yml b/_config/debugbar.yml
index 2154cb2..3cb1b59 100755
--- a/_config/debugbar.yml
+++ b/_config/debugbar.yml
@@ -1,5 +1,5 @@
 ---
-Name: 'webapp-debugbar'
+Name: 'a2nt-cms-niceties-debugbar'
 After:
   - 'framework'
   - 'debugbar'
diff --git a/_config/env-check.yml b/_config/env-check.yml
index 8d3b8fc..5a4dfce 100755
--- a/_config/env-check.yml
+++ b/_config/env-check.yml
@@ -1,5 +1,5 @@
 ---
-Name: webapp-env-check
+Name: a2nt-cms-niceties-env-check
 ---
 
 SilverStripe\EnvironmentCheck\EnvironmentCheckSuite:
diff --git a/_config/locale-fluent.yml_ b/_config/locale-fluent.yml_
index 83bbe2b..a3fe82a 100755
--- a/_config/locale-fluent.yml_
+++ b/_config/locale-fluent.yml_
@@ -1,9 +1,9 @@
 ---
-Name: webapp-locale-fluent
+Name: a2nt-cms-niceties-locale-fluent
 After:
-  - webapp-extensions
-  - webapp-elemental
-  - webapp-locale
+  - a2nt-cms-niceties-extensions
+  - a2nt-cms-niceties-elemental
+  - a2nt-cms-niceties-locale
 ---
 # Define Fluent locales
 TractorCow\Fluent\Model\Locale:
diff --git a/_config/locale.yml b/_config/locale.yml
index d29471d..60f5386 100755
--- a/_config/locale.yml
+++ b/_config/locale.yml
@@ -1,5 +1,5 @@
 ---
-Name: webapp-locale
+Name: a2nt-cms-niceties-locale
 ---
 
 Symbiote\Addressable\Addressable:
diff --git a/_config/options-elements.yml b/_config/options-elements.yml
index d7b2da6..40aa8c2 100755
--- a/_config/options-elements.yml
+++ b/_config/options-elements.yml
@@ -1,10 +1,11 @@
 ---
-Name: webapp-options-elements
+Name: a2nt-cms-niceties-options-elements
 After:
   - elemental
   - elemental-list
   - elementalvirtual
-  - webapp-base-extensions
+  - elemental-basics
+  - a2nt-cms-niceties-base-extensions
 ---
 Page:
   searchable_elements:
diff --git a/_config/options-widgets.yml b/_config/options-widgets.yml
index a0f1ab1..d0c56dd 100755
--- a/_config/options-widgets.yml
+++ b/_config/options-widgets.yml
@@ -1,5 +1,5 @@
 ---
-Name: webapp-options-widgets
+Name: a2nt-cms-niceties-options-widgets
 ---
 # Blog + Widgets module extensions
 Page:
diff --git a/_config/shop.yml_ b/_config/shop.yml_
index 41ac173..975c2a5 100755
--- a/_config/shop.yml_
+++ b/_config/shop.yml_
@@ -1,5 +1,5 @@
 ---
-Name: webapp-shop
+Name: a2nt-cms-niceties-shop
 ---
 SilverStripe\Core\Injector\Injector:
   SilverShop\Checkout\SinglePageCheckoutComponentConfig:
diff --git a/_config/templates-requirements.yml b/_config/templates-requirements.yml
index 0691bce..ff6ac46 100755
--- a/_config/templates-requirements.yml
+++ b/_config/templates-requirements.yml
@@ -1,7 +1,7 @@
 ---
-Name: webapp-templates-requirements
+Name: a2nt-cms-niceties-templates-requirements
 ---
-App\Templates\DeferredRequirements:
+A2nt\CMSNiceties\Templates\DeferredRequirements:
   nofontawesome: false
   version: false
   static_domain: false
diff --git a/_config/templates-themes.yml b/_config/templates-themes.yml
index c26bf12..6f3a1d1 100755
--- a/_config/templates-themes.yml
+++ b/_config/templates-themes.yml
@@ -1,19 +1,19 @@
 ---
-Name: webapp-templates-themes
+Name: a2nt-cms-niceties-templates-themes
 After:
-  - webapp-options-elements
+  - a2nt-cms-niceties-options-elements
 ---
 SilverStripe\View\SSViewer:
-  source_file_comments: true
+  source_file_comments: false
   themes:
     - '$public'
     - '$default'
 
-App\Elements\SliderElement:
+A2nt\ElementalBasics\Elements\SliderElement:
   slide_width: 2140
   slide_height: 700
 
 # 2x container width to automatically resize images for 2K display
-App\Elements\Extensions\ElementRows:
+A2nt\ElementalBasics\Extensions\ElementRows:
   container_max_width: 2280
   column_class: 'col-block col-md'