diff --git a/conf/templates/general/upstart.conf.tpl b/conf/templates/general/upstart.conf
similarity index 100%
rename from conf/templates/general/upstart.conf.tpl
rename to conf/templates/general/upstart.conf
diff --git a/conf/templates/glance/glance-api-paste.ini.tpl b/conf/templates/glance/glance-api-paste.ini
similarity index 100%
rename from conf/templates/glance/glance-api-paste.ini.tpl
rename to conf/templates/glance/glance-api-paste.ini
diff --git a/conf/templates/glance/glance-api.conf.tpl b/conf/templates/glance/glance-api.conf
similarity index 100%
rename from conf/templates/glance/glance-api.conf.tpl
rename to conf/templates/glance/glance-api.conf
diff --git a/conf/templates/glance/glance-registry-paste.ini.tpl b/conf/templates/glance/glance-registry-paste.ini
similarity index 100%
rename from conf/templates/glance/glance-registry-paste.ini.tpl
rename to conf/templates/glance/glance-registry-paste.ini
diff --git a/conf/templates/glance/glance-registry.conf.tpl b/conf/templates/glance/glance-registry.conf
similarity index 100%
rename from conf/templates/glance/glance-registry.conf.tpl
rename to conf/templates/glance/glance-registry.conf
diff --git a/conf/templates/glance/glance-scrubber-paste.ini.tpl b/conf/templates/glance/glance-scrubber-paste.ini
similarity index 100%
rename from conf/templates/glance/glance-scrubber-paste.ini.tpl
rename to conf/templates/glance/glance-scrubber-paste.ini
diff --git a/conf/templates/glance/glance-scrubber.conf.tpl b/conf/templates/glance/glance-scrubber.conf
similarity index 100%
rename from conf/templates/glance/glance-scrubber.conf.tpl
rename to conf/templates/glance/glance-scrubber.conf
diff --git a/conf/templates/horizon/000-default.tpl b/conf/templates/horizon/000-default
similarity index 100%
rename from conf/templates/horizon/000-default.tpl
rename to conf/templates/horizon/000-default
diff --git a/conf/templates/horizon/horizon_settings.py.tpl b/conf/templates/horizon/horizon_settings.py
similarity index 100%
rename from conf/templates/horizon/horizon_settings.py.tpl
rename to conf/templates/horizon/horizon_settings.py
diff --git a/conf/templates/keystone/default_catalog.templates.tpl b/conf/templates/keystone/default_catalog.templates
similarity index 100%
rename from conf/templates/keystone/default_catalog.templates.tpl
rename to conf/templates/keystone/default_catalog.templates
diff --git a/conf/templates/keystone/keystone.conf.tpl b/conf/templates/keystone/keystone.conf
similarity index 100%
rename from conf/templates/keystone/keystone.conf.tpl
rename to conf/templates/keystone/keystone.conf
diff --git a/conf/templates/keystone/keystone_init.sh.tpl b/conf/templates/keystone/keystone_init.sh
similarity index 100%
rename from conf/templates/keystone/keystone_init.sh.tpl
rename to conf/templates/keystone/keystone_init.sh
diff --git a/conf/templates/nova/api-paste.ini.tpl b/conf/templates/nova/api-paste.ini
similarity index 100%
rename from conf/templates/nova/api-paste.ini.tpl
rename to conf/templates/nova/api-paste.ini
diff --git a/conf/templates/nova/nova-clean.sh.tpl b/conf/templates/nova/nova-clean.sh
similarity index 100%
rename from conf/templates/nova/nova-clean.sh.tpl
rename to conf/templates/nova/nova-clean.sh
diff --git a/conf/templates/nova/nova-network-init.sh.tpl b/conf/templates/nova/nova-network-init.sh
similarity index 100%
rename from conf/templates/nova/nova-network-init.sh.tpl
rename to conf/templates/nova/nova-network-init.sh
diff --git a/conf/templates/swift/account-server.conf.tpl b/conf/templates/swift/account-server.conf
similarity index 100%
rename from conf/templates/swift/account-server.conf.tpl
rename to conf/templates/swift/account-server.conf
diff --git a/conf/templates/swift/container-server.conf.tpl b/conf/templates/swift/container-server.conf
similarity index 100%
rename from conf/templates/swift/container-server.conf.tpl
rename to conf/templates/swift/container-server.conf
diff --git a/conf/templates/swift/object-server.conf.tpl b/conf/templates/swift/object-server.conf
similarity index 100%
rename from conf/templates/swift/object-server.conf.tpl
rename to conf/templates/swift/object-server.conf
diff --git a/conf/templates/swift/proxy-server.conf.tpl b/conf/templates/swift/proxy-server.conf
similarity index 100%
rename from conf/templates/swift/proxy-server.conf.tpl
rename to conf/templates/swift/proxy-server.conf
diff --git a/conf/templates/swift/rsyncd.conf.tpl b/conf/templates/swift/rsyncd.conf
similarity index 100%
rename from conf/templates/swift/rsyncd.conf.tpl
rename to conf/templates/swift/rsyncd.conf
diff --git a/conf/templates/swift/rsyslog.conf.tpl b/conf/templates/swift/rsyslog.conf
similarity index 100%
rename from conf/templates/swift/rsyslog.conf.tpl
rename to conf/templates/swift/rsyslog.conf
diff --git a/conf/templates/swift/swift-remakerings.tpl b/conf/templates/swift/swift-remakerings
similarity index 100%
rename from conf/templates/swift/swift-remakerings.tpl
rename to conf/templates/swift/swift-remakerings
diff --git a/conf/templates/swift/swift-startmain.tpl b/conf/templates/swift/swift-startmain
similarity index 100%
rename from conf/templates/swift/swift-startmain.tpl
rename to conf/templates/swift/swift-startmain
diff --git a/conf/templates/swift/swift.conf.tpl b/conf/templates/swift/swift.conf
similarity index 100%
rename from conf/templates/swift/swift.conf.tpl
rename to conf/templates/swift/swift.conf
diff --git a/devstack/utils.py b/devstack/utils.py
index bc648918..24453305 100644
--- a/devstack/utils.py
+++ b/devstack/utils.py
@@ -42,7 +42,6 @@ PARAM_SUB_REGEX = re.compile(r"#.*$|%([\w\d]+?)%", re.MULTILINE)
 EXT_COMPONENT = re.compile(r"^\s*([\w-]+)(?:\((.*)\))?\s*$")
 MONTY_PYTHON_TEXT_RE = re.compile("([a-z0-9A-Z\?!.,'\"]+)")
 LOG = logging.getLogger("devstack.util")
-TEMPLATE_EXT = ".tpl"
 DEF_IP = "127.0.0.1"
 IP_LOOKER = '8.8.8.8'
 DEF_IP_VERSION = settings.IPV4
@@ -72,8 +71,7 @@ COWS['unhappy'] = r'''
 
 
 def load_template(component, template_name):
-    fn = template_name + TEMPLATE_EXT
-    full_pth = sh.joinpths(settings.STACK_TEMPLATE_DIR, component, fn)
+    full_pth = sh.joinpths(settings.STACK_TEMPLATE_DIR, component, template_name)
     contents = sh.load_file(full_pth)
     return (full_pth, contents)