diff --git "a/examples/environment/\173\173 _environment_name \175\175/common.yml" "b/examples/environment/\173\173 cookiecutter._environment_name \175\175/common.yml"
similarity index 100%
rename from "examples/environment/\173\173 _environment_name \175\175/common.yml"
rename to "examples/environment/\173\173 cookiecutter._environment_name \175\175/common.yml"
diff --git "a/examples/environment/\173\173 _environment_name \175\175/init.yml" "b/examples/environment/\173\173 cookiecutter._environment_name \175\175/init.yml"
similarity index 93%
rename from "examples/environment/\173\173 _environment_name \175\175/init.yml"
rename to "examples/environment/\173\173 cookiecutter._environment_name \175\175/init.yml"
index ca63bc4..1b03d29 100644
--- "a/examples/environment/\173\173 _environment_name \175\175/init.yml"
+++ "b/examples/environment/\173\173 cookiecutter._environment_name \175\175/init.yml"
@@ -19,5 +19,5 @@
               {{ toyaml( node['parameters']['linux']['network']['interface'], width=14 ) }}
 {%- endif %}
           classes:
-          - environment.{{ _environment_name }}.common
+          - environment.{{ cookiecutter._environment_name }}.common
 {%- endfor %}
diff --git a/reclass_tools/cli.py b/reclass_tools/cli.py
index 864ba7b..2f1807d 100644
--- a/reclass_tools/cli.py
+++ b/reclass_tools/cli.py
@@ -144,7 +144,8 @@
         env_name_parser = argparse.ArgumentParser(add_help=False)
         env_name_parser.add_argument(
             '--env-name', '-e', dest='env_name',
-            help=("Name of the 'environment' to create or use"))
+            help=("Name of the 'environment' to create or use"),
+            default=None)
 
         vcp_only_parser = argparse.ArgumentParser(add_help=False)
         vcp_only_parser.add_argument(
diff --git a/reclass_tools/create_inventory.py b/reclass_tools/create_inventory.py
index a427c0d..a8e048b 100644
--- a/reclass_tools/create_inventory.py
+++ b/reclass_tools/create_inventory.py
@@ -80,7 +80,7 @@
     return current_underlay_context
 
 
-def render_dir(template_dir, output_dir, contexts, env_name):
+def render_dir(template_dir, output_dir, contexts, env_name=None):
     """Coockiecutter echancement to use several source JSON files
 
     :param template_dir: directory with templates to render
@@ -115,7 +115,8 @@
         merged_context = helpers.merge_nested_objects(merged_context, context)
 
     merged_context['toyaml'] = toyaml
-    merged_context['_environment_name'] = env_name
+    if env_name:
+        merged_context['cookiecutter']['_environment_name'] = env_name
 
     try:
         generate.generate_files(