diff --git a/README.rst b/README.rst
index 9b0e384..ae15a6e 100644
--- a/README.rst
+++ b/README.rst
@@ -17,4 +17,4 @@ To use, `cd` into the project directory then run::
 
     cookiecutter https://git.openstack.org/openstack/tempest-plugin-cookiecutter.git
 
-You will be prompted for the name/class of the tempest plugin to create.
+You will be prompted for the project name/repository name/class of the tempest plugin to create.
diff --git a/cookiecutter.json b/cookiecutter.json
index 86cf323..e187819 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -1,4 +1,5 @@
 {
-    "project": "sample",
+    "project": "Sample",
+    "repo_name": "sample",
     "testclass": "SampleTempestPlugin"
 }
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/README.rst b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/README.rst
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/README.rst
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/README.rst
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/config.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/config.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/config.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/config.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/plugin.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/plugin.py
similarity index 87%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/plugin.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/plugin.py
index f66a7e9..073472d 100644
--- a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/plugin.py
+++ b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/plugin.py
@@ -19,14 +19,14 @@ import os
 from tempest import config
 from tempest.test_discover import plugins
 
-from {{cookiecutter.project}}_tempest_plugin import config as project_config
+from {{cookiecutter.repo_name}}_tempest_plugin import config as project_config
 
 
 class {{cookiecutter.testclass}}(plugins.TempestPlugin):
     def load_tests(self):
         base_path = os.path.split(os.path.dirname(
             os.path.abspath(__file__)))[0]
-        test_dir = "{{cookiecutter.project}}_tempest_plugin/tests"
+        test_dir = "{{cookiecutter.repo_name}}_tempest_plugin/tests"
         full_test_dir = os.path.join(base_path, test_dir)
         return full_test_dir, base_path
 
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/services/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/services/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/services/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/services/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/api/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/api/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/api/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/api/__init__.py
diff --git a/{{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/scenario/__init__.py b/{{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/scenario/__init__.py
similarity index 100%
rename from {{cookiecutter.repo_name}}/{{cookiecutter.project}}_tempest_plugin/tests/scenario/__init__.py
rename to {{cookiecutter.repo_name}}/{{cookiecutter.repo_name}}_tempest_plugin/tests/scenario/__init__.py