diff --git a/.coveragerc b/.coveragerc
index 868bc9c..f73c985 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -1,6 +1,6 @@
 [run]
 branch = True
-source = blazar_tempest_tests
+source = blazar_tempest_plugin
 
 [report]
 ignore_errors = True
diff --git a/.stestr.conf b/.stestr.conf
index 9efaea9..70c1b82 100644
--- a/.stestr.conf
+++ b/.stestr.conf
@@ -1,3 +1,3 @@
 [DEFAULT]
-test_path=./blazar_tempest_tests/tests
+test_path=./blazar_tempest_plugin/tests
 top_dir=./
diff --git a/doc/source/conf.py b/doc/source/conf.py
index f7c27c6..443cf47 100755
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -37,12 +37,12 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'openstack'
+project = u'blazar-tempest-plugin'
 copyright = u'2017, OpenStack Developers'
 
 # openstackdocstheme options
-repository_name = 'openstack/openstack'
-bug_project = 'blazar_tempest_tests'
+repository_name = 'openstack/blazar-tempest-plugin'
+bug_project = 'blazar'
 bug_tag = ''
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 12777a9..e4a37bb 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -3,9 +3,9 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-====================================================
-Welcome to the documentation of blazar_tempest_tests
-====================================================
+=====================================================
+Welcome to the documentation of blazar-tempest-plugin
+=====================================================
 
 Contents:
 
diff --git a/releasenotes/source/conf.py b/releasenotes/source/conf.py
index b8396ff..dd6cba0 100644
--- a/releasenotes/source/conf.py
+++ b/releasenotes/source/conf.py
@@ -52,12 +52,12 @@ source_suffix = '.rst'
 master_doc = 'index'
 
 # General information about the project.
-project = u'blazar_tempest_tests Release Notes'
+project = u'blazar-tempest-plugin Release Notes'
 copyright = u'2017, OpenStack Developers'
 
 # openstackdocstheme options
-repository_name = 'openstack/openstack'
-bug_project = 'blazar_tempest_tests'
+repository_name = 'openstack/blazar-tempest-plugin'
+bug_project = 'blazar'
 bug_tag = ''
 
 # The version info for the project you're documenting, acts as replacement for
@@ -191,7 +191,7 @@ html_static_path = ['_static']
 # html_file_suffix = None
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'blazar_tempest_testsReleaseNotesdoc'
+htmlhelp_basename = 'blazar-tempest-pluginReleaseNotesdoc'
 
 
 # -- Options for LaTeX output ---------------------------------------------
@@ -211,8 +211,8 @@ latex_elements = {
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('index', 'blazar_tempest_testsReleaseNotes.tex',
-     u'blazar_tempest_tests  Release Notes Documentation',
+    ('index', 'blazar-tempest-pluginReleaseNotes.tex',
+     u'blazar-tempest-plugin  Release Notes Documentation',
      u'OpenStack Foundation', 'manual'),
 ]
 
@@ -242,8 +242,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'blazar_tempest_testsrereleasenotes',
-     u'blazar_tempest_tests  Release Notes Documentation',
+    ('index', 'blazar-tempest-pluginrereleasenotes',
+     u'blazar-tempest-plugin  Release Notes Documentation',
      [u'OpenStack Foundation'], 1)
 ]
 
@@ -257,9 +257,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'blazar_tempest_tests ReleaseNotes',
-     u'blazar_tempest_tests Release Notes Documentation',
-     u'OpenStack Foundation', 'blazar_tempest_testsReleaseNotes',
+    ('index', 'blazar-tempest-plugin ReleaseNotes',
+     u'blazar-tempest-plugin Release Notes Documentation',
+     u'OpenStack Foundation', 'blazar-tempest-pluginReleaseNotes',
      'One line description of project.',
      'Miscellaneous'),
 ]
diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst
index 69a5e2d..e907935 100644
--- a/releasenotes/source/index.rst
+++ b/releasenotes/source/index.rst
@@ -1,5 +1,5 @@
 ============================================
- blazar_tempest_tests Release Notes
+ blazar-tempest-plugin Release Notes
 ============================================
 
 .. toctree::
diff --git a/tox.ini b/tox.ini
index 805b81e..15fd7de 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,7 +27,7 @@ commands = {posargs}
 basepython = python3
 setenv =
     VIRTUAL_ENV={envdir}
-    PYTHON=coverage run --source blazar_tempest_tests --parallel-mode
+    PYTHON=coverage run --source blazar_tempest_plugin --parallel-mode
 commands =
     stestr run {posargs}
     coverage combine