diff --git a/packages/kaizen-cg/_templates/component/new/component-script.js b/packages/kaizen-cg/_templates/component/new/component-script.js
index cdb2cca..b66d5b6 100644
--- a/packages/kaizen-cg/_templates/component/new/component-script.js
+++ b/packages/kaizen-cg/_templates/component/new/component-script.js
@@ -10,9 +10,10 @@ export default ({
   className = '<%= h.changeCase.lower(component_type).charAt(0) %>-<%= h.changeCase.lower(h.inflection.dasherize(name)) %>',
   processingName = className,
   context = document,
+  themeName = '<%= h.themeName %>',
 } = {}) => {
   once(processingName, `.${className}`, context).forEach((el) => {
     // eslint-disable-next-line no-console
-    console.log(el);
+    console.log(themeName, el);
   });
 };
diff --git a/packages/kaizen-cg/index.js b/packages/kaizen-cg/index.js
index c05b88e..ef8e9f6 100644
--- a/packages/kaizen-cg/index.js
+++ b/packages/kaizen-cg/index.js
@@ -2,6 +2,12 @@
 const hygen = require("hygen");
 const path = require("path");
 
+let themeName = 'kaizenComponent';
+const themeIndex = process.argv.indexOf('--theme_name');
+if (themeIndex > -1) {
+  themeName = process.argv[themeIndex + 1];
+}
+
 const config = {
   templates: `${__dirname}/_templates`,
   cwd: __dirname,
@@ -14,6 +20,7 @@ const config = {
   helpers: {
     relative: (from, to) => path.relative(from, to),
     src: () => process.cwd(),
+    themeName,
   },
 };
 
diff --git a/packages/kaizen-cg/package.json b/packages/kaizen-cg/package.json
index 158b933..80b28af 100644
--- a/packages/kaizen-cg/package.json
+++ b/packages/kaizen-cg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@skilld/kaizen-cg",
-  "version": "2.0.0-alpha.3",
+  "version": "2.0.0-alpha.4",
   "description": "Kaizen component generator",
   "bin": "index.js",
   "main": "index.js",
diff --git a/packages/kaizen-tg/_templates/drupal-9-theme/new/package.json.t b/packages/kaizen-tg/_templates/drupal-9-theme/new/package.json.t
index cc03f79..731c89e 100644
--- a/packages/kaizen-tg/_templates/drupal-9-theme/new/package.json.t
+++ b/packages/kaizen-tg/_templates/drupal-9-theme/new/package.json.t
@@ -69,7 +69,7 @@ to: <%= h.src() %>/<%= h.changeCase.lower(name) %>/package.json
     "browsersync": "yarn run browser-sync start --proxy '127.0.0.1:8888' --files ./dist",
     "watch": "cross-env ./node_modules/.bin/webpack -w",
     "watch:bs": "cross-env NODE_ENV=development ./node_modules/.bin/run-p browsersync watch",
-    "cc": "npx @skilld/kaizen-cg",
+    "cc": "npx @skilld/kaizen-cg --theme_name <%= h.inflection.camelize(name.replace(/ /g, '').replace(/-/g, '_'), true) %>",
     "storybook": "start-storybook",
     "build-storybook": "build-storybook -c .storybook -o dist/storybook"
   },
diff --git a/packages/kaizen-tg/package.json b/packages/kaizen-tg/package.json
index 2eb99d0..6affb2e 100644
--- a/packages/kaizen-tg/package.json
+++ b/packages/kaizen-tg/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@skilld/kaizen-tg",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "description": "Kaizen drupal theme generator",
   "bin": "index.js",
   "main": "index.js",