diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 0a5bda5..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=172.16.48.254
-port=29418
-project=salt-formulas/oslo-templates.git
diff --git a/.kitchen.docker.yml b/.kitchen.docker.yml
index 8294107..7807bd0 100644
--- a/.kitchen.docker.yml
+++ b/.kitchen.docker.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: docker
-  hostname: oslo-templates.ci.local
+  hostname: oslo_templates.ci.local
   #socket: tcp://127.0.0.1:2376
   use_sudo: false
 
@@ -13,17 +13,17 @@
   salt_bootstrap_url: https://bootstrap.saltstack.com
   salt_version: latest
   require_chef: false
-  formula: oslo-templates
+  formula: oslo_templates
   log_level: info
   state_top:
     base:
       "*":
-        - oslo-templates
+        - oslo_templates
   pillars:
     top.sls:
       base:
         "*":
-          - oslo-templates
+          - oslo_templates
   grains:
     noservices: True
 
@@ -44,6 +44,6 @@
   - name: default
   #  provisioner:
   #    pillars-from-files:
-  #      oslo-templates.sls: tests/pillar/default.sls
+  #      oslo_templates.sls: tests/pillar/default.sls
 
 # vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.kitchen.vagrant.yml b/.kitchen.vagrant.yml
index 5cafc94..f4544d8 100644
--- a/.kitchen.vagrant.yml
+++ b/.kitchen.vagrant.yml
@@ -1,7 +1,7 @@
 ---
 driver:
   name: vagrant
-  vm_hostname: oslo-templates.ci.local
+  vm_hostname: oslo_templates.ci.local
   use_sudo: false
   customize:
     memory: 512
@@ -13,17 +13,17 @@
   salt_bootstrap_url: https://bootstrap.saltstack.com
   salt_version: latest
   require_chef: false
-  formula: oslo-templates
+  formula: oslo_templates
   log_level: info
   state_top:
     base:
       "*":
-        - oslo-templates
+        - oslo_templates
   pillars:
     top.sls:
       base:
         "*":
-          - oslo-templates
+          - oslo_templates
   grains:
     noservices: True
 
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4834828..60b56fe 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 6a3d446..0ccb215 100644
--- a/README.rst
+++ b/README.rst
@@ -1,19 +1,19 @@
 
 ==================================
-Oslo-templates Formula
+Oslo_templates Formula
 ==================================
 
-Service oslo-templates description
+Service oslo_templates description
 
 
 Sample Metadata
 ===============
 
-Single oslo-templates service
+Single oslo_templates service
 
 .. code-block:: yaml
 
-    oslo-templates:
+    oslo_templates:
       template:
         enabled: true
 
@@ -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 83c3742..791a511 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-salt-formula-oslo-templates (2018.1) xenial; urgency=medium
+salt-formula-oslo_templates (2018.1) xenial; urgency=medium
 
   * Initial release
 
- -- OSCORE devops@mirantis.com  Fri, 18 May 2018 01:58:41 BST
+ -- Oleh Hryhorov ohryhorov@miantis.com  Fri, 18 May 2018 03:16:55 BST
diff --git a/debian/control b/debian/control
index 894a559..b21e975 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,15 @@
-Source: salt-formula-oslo-templates
-Maintainer: OSCORE <devops@mirantis.com>
+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 02b1808..ffb1bdd 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
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7b2077e..70ff525 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -35,7 +35,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'salt-formula-oslo-templates'
+project = u'salt-formula-oslo_templates'
 copyright = u'2016, OSCore Team'
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
diff --git a/metadata.yml b/metadata.yml
index 5ff98fa..657ec4f 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
-name: "oslo-templates"
+name: "oslo_templates"
 version: "2018.1"
-source: "https://github.com/salt-formulas/salt-formula-oslo-templates"
+source: "https://github.com/salt-formulas/salt-formula-oslo_templates"
diff --git a/metadata/service/support.yml b/metadata/service/support.yml
index 0c11644..2a632c3 100644
--- a/metadata/service/support.yml
+++ b/metadata/service/support.yml
@@ -1,5 +1,5 @@
 parameters:
-  oslo-templates:
+  oslo_templates:
     _support:
       collectd:
         enabled: false
diff --git a/metadata/service/template/cluster.yml b/metadata/service/template/cluster.yml
index 29db484..243ee57 100644
--- a/metadata/service/template/cluster.yml
+++ b/metadata/service/template/cluster.yml
@@ -1,9 +1,9 @@
 applications:
-- oslo-templates
+- oslo_templates
 classes:
-- service.oslo-templates.support
+- service.oslo_templates.support
 parameters:
-  oslo-templates:
+  oslo_templates:
     template:
       enabled: true
       bind:
diff --git a/metadata/service/template/single.yml b/metadata/service/template/single.yml
index 29db484..243ee57 100644
--- a/metadata/service/template/single.yml
+++ b/metadata/service/template/single.yml
@@ -1,9 +1,9 @@
 applications:
-- oslo-templates
+- oslo_templates
 classes:
-- service.oslo-templates.support
+- service.oslo_templates.support
 parameters:
-  oslo-templates:
+  oslo_templates:
     template:
       enabled: true
       bind:
diff --git a/oslo-templates/init.sls b/oslo-templates/init.sls
deleted file mode 100644
index 2c97144..0000000
--- a/oslo-templates/init.sls
+++ /dev/null
@@ -1,6 +0,0 @@
-{%- if pillar.oslo is defined %}
-include:
-{%- if pillar.oslo is defined %}
-- oslo-templates.template
-{%- endif %}
-{%- endif %}
diff --git a/oslo-templates/meta/sensu.yml b/oslo-templates/meta/sensu.yml
deleted file mode 100644
index 2911994..0000000
--- a/oslo-templates/meta/sensu.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Sample check
-check:
-  local_oslo-templates_proc:
-    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C oslo-templates -u oslo-templates -c 1:1"
-    interval: 60
-    occurrences: 1
-    subscribers:
-    - local-oslo-templates-template
diff --git a/oslo_templates/files/oslo_templates.conf b/oslo_templates/files/oslo_templates.conf
new file mode 100644
index 0000000..44e3449
--- /dev/null
+++ b/oslo_templates/files/oslo_templates.conf
@@ -0,0 +1 @@
+# Service config file
\ No newline at end of file
diff --git a/oslo_templates/init.sls b/oslo_templates/init.sls
new file mode 100644
index 0000000..98318cb
--- /dev/null
+++ b/oslo_templates/init.sls
@@ -0,0 +1,6 @@
+{%- if pillar.oslo_templates is defined %}
+include:
+{%- if pillar.oslo_templates.template is defined %}
+- oslo_templates.template
+{%- endif %}
+{%- endif %}
diff --git a/oslo-templates/map.jinja b/oslo_templates/map.jinja
similarity index 65%
rename from oslo-templates/map.jinja
rename to oslo_templates/map.jinja
index 66bdc25..fa9ad0b 100644
--- a/oslo-templates/map.jinja
+++ b/oslo_templates/map.jinja
@@ -3,8 +3,8 @@
 
 Debian:
   pkgs:
-  - oslo-templates
+  - oslo_templates
 
 {%- endload %}
 
-{%- set template = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('oslo:template')) %}
+{%- set template = salt['grains.filter_by'](base_defaults, merge=salt['pillar.get']('oslo_templates:template')) %}
diff --git a/oslo_templates/meta/sensu.yml b/oslo_templates/meta/sensu.yml
new file mode 100644
index 0000000..f71ea76
--- /dev/null
+++ b/oslo_templates/meta/sensu.yml
@@ -0,0 +1,8 @@
+# Sample check
+check:
+  local_oslo_templates_proc:
+    command: "PATH=$PATH:/usr/lib64/nagios/plugins:/usr/lib/nagios/plugins check_procs -C oslo_templates -u oslo_templates -c 1:1"
+    interval: 60
+    occurrences: 1
+    subscribers:
+    - local-oslo_templates-template
diff --git a/oslo-templates/meta/sphinx.yml b/oslo_templates/meta/sphinx.yml
similarity index 70%
rename from oslo-templates/meta/sphinx.yml
rename to oslo_templates/meta/sphinx.yml
index a3b4624..319983d 100644
--- a/oslo-templates/meta/sphinx.yml
+++ b/oslo_templates/meta/sphinx.yml
@@ -1,7 +1,7 @@
-{%- from "oslo-templates/map.jinja" import template with context %}
+{%- from "oslo_templates/map.jinja" import template with context %}
 # Fill in documentation details
 doc:
-  name: oslo-templates
+  name: oslo_templates
   description: Some service info
   role:
     template:
diff --git a/oslo-templates/schemas/template.yaml b/oslo_templates/schemas/template.yaml
similarity index 64%
rename from oslo-templates/schemas/template.yaml
rename to oslo_templates/schemas/template.yaml
index 498f099..1e12b12 100644
--- a/oslo-templates/schemas/template.yaml
+++ b/oslo_templates/schemas/template.yaml
@@ -1,9 +1,9 @@
 %YAML 1.1
 ---
 "$schema": "http://json-schema.org/draft-06/schema#"
-title: oslo-templates daemon role
+title: oslo_templates daemon role
 description: |
-  Oslo-templates daemon, server role
+  Oslo_templates daemon, server role
 type: object
 additionalProperties: false
 
@@ -13,5 +13,5 @@
 properties:
   enabled:
     description: |
-      Enables oslo-templates daemon service
+      Enables oslo_templates daemon service
     type: boolean
diff --git a/oslo-templates/template.sls b/oslo_templates/template.sls
similarity index 100%
rename from oslo-templates/template.sls
rename to oslo_templates/template.sls
diff --git a/tests/pillar/template_single.sls b/tests/pillar/template_single.sls
index 421477e..2c1deb3 100644
--- a/tests/pillar/template_single.sls
+++ b/tests/pillar/template_single.sls
@@ -1,5 +1,3 @@
-oslo-templates:
+oslo_templates:
   template:
     enabled: true
-oslo:
-  enabled: true