diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 60b56fe..4834828 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,4 +1,4 @@
-oslo_templates formula
+oslo-templates formula
 =====================================
 
 2018.1 (2018-05-18)
diff --git a/README.rst b/README.rst
index 0ccb215..ef39d43 100644
--- a/README.rst
+++ b/README.rst
@@ -3,7 +3,7 @@
 Oslo_templates Formula
 ==================================
 
-Service oslo_templates description
+Service oslo-templates description
 
 
 Sample Metadata
@@ -38,7 +38,7 @@
 the appropriate issue tracker. Use GitHub issue tracker for specific salt
 formula:
 
-    https://github.com/salt-formulas/salt-formula-oslo_templates/issues
+    https://github.com/salt-formulas/salt-formula-oslo-templates/issues
 
 For feature requests, bug reports or blueprints affecting entire ecosystem,
 use Launchpad salt-formulas project:
diff --git a/debian/changelog b/debian/changelog
index 791a511..6495134 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-salt-formula-oslo_templates (2018.1) xenial; urgency=medium
+salt-formula-oslo-templates (2018.1) xenial; urgency=medium
 
   * Initial release
 
diff --git a/debian/control b/debian/control
index b21e975..c63dfeb 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
-Source: salt-formula-oslo_templates
+Source: salt-formula-oslo-templates
 Maintainer: Oleh Hryhorov <ohryhorov@miantis.com>
 Section: admin
 Priority: optional
 Build-Depends: debhelper (>= 9), salt-master, python, python-yaml
 Standards-Version: 3.9.6
 Homepage: https://github.com/salt-formulas
-Vcs-Browser: https://github.com/salt-formulas/salt-formula-oslo_templates
-Vcs-Git: https://github.com/salt-formulas/salt-formula-oslo_templates.git
+Vcs-Browser: https://github.com/salt-formulas/salt-formula-oslo-templates
+Vcs-Git: https://github.com/salt-formulas/salt-formula-oslo-templates.git
 
-Package: salt-formula-oslo_templates
+Package: salt-formula-oslo-templates
 Architecture: all
 Depends: ${misc:Depends}
-Description: oslo_templates salt formula
- Install and configure oslo_templates.
+Description: oslo-templates salt formula
+ Install and configure oslo-templates.
diff --git a/debian/copyright b/debian/copyright
index ffb1bdd..02b1808 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: salt-formula-oslo_templates
+Upstream-Name: salt-formula-oslo-templates
 Upstream-Contact: salt-formulas@freelists.org
-Source: https://github.com/salt-formulas/salt-formula-oslo_templates
+Source: https://github.com/salt-formulas/salt-formula-oslo-templates
 
 Files: *
 Copyright: 2018 OSCore Team