diff --git a/template/config/clean.sls b/template/config/clean.sls
index db854cbd..5b3ee11d 100644
--- a/template/config/clean.sls
+++ b/template/config/clean.sls
@@ -10,7 +10,7 @@
 include:
   - {{ sls_service_clean }}
 
-template-config-absent:
+template-config-clean-file-absent:
   file.absent:
     - name: {{ template.config }}
     - require:
diff --git a/template/config/file.sls b/template/config/file.sls
index 2776a5cb..be73822d 100644
--- a/template/config/file.sls
+++ b/template/config/file.sls
@@ -10,7 +10,7 @@
 include:
   - {{ sls_package_install }}
 
-template-config:
+template-config-file-file-managed:
   file.managed:
     - name: {{ template.config }}
     - source: {{ files_switch(
diff --git a/template/package/clean.sls b/template/package/clean.sls
index 9b74ab56..8d2660f9 100644
--- a/template/package/clean.sls
+++ b/template/package/clean.sls
@@ -9,7 +9,7 @@
 include:
   - {{ sls_config_clean }}
 
-template-pkg-removed:
+template-package-clean-pkg-removed:
   pkg.removed:
     - name: {{ template.pkg }}
     - require:
diff --git a/template/package/install.sls b/template/package/install.sls
index 47829303..78bdb5ea 100644
--- a/template/package/install.sls
+++ b/template/package/install.sls
@@ -5,6 +5,6 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import template with context %}
 
-template-pkg:
+template-package-install-pkg-installed:
   pkg.installed:
     - name: {{ template.pkg }}
diff --git a/template/service/clean.sls b/template/service/clean.sls
index ae2bcbd1..2074193d 100644
--- a/template/service/clean.sls
+++ b/template/service/clean.sls
@@ -5,7 +5,7 @@
 {%- set tplroot = tpldir.split('/')[0] %}
 {%- from tplroot ~ "/map.jinja" import template with context %}
 
-template-service-dead:
+template-service-clean-service-dead:
   service.dead:
     - name: {{ template.service.name }}
     - enable: False
diff --git a/template/service/running.sls b/template/service/running.sls
index 615347c0..d668f85f 100644
--- a/template/service/running.sls
+++ b/template/service/running.sls
@@ -9,7 +9,7 @@
 include:
   - {{ sls_config_file }}
 
-template-service:
+template-service-running-service-running:
   service.running:
     - name: {{ template.service.name }}
     - enable: True