diff --git a/conf/glance/glance-api-paste.ini.template b/conf/glance/glance-api-paste.ini.tpl
similarity index 100%
rename from conf/glance/glance-api-paste.ini.template
rename to conf/glance/glance-api-paste.ini.tpl
diff --git a/conf/glance/glance-api.conf.template b/conf/glance/glance-api.conf.tpl
similarity index 100%
rename from conf/glance/glance-api.conf.template
rename to conf/glance/glance-api.conf.tpl
diff --git a/conf/glance/glance-registry-paste.ini.template b/conf/glance/glance-registry-paste.ini.tpl
similarity index 100%
rename from conf/glance/glance-registry-paste.ini.template
rename to conf/glance/glance-registry-paste.ini.tpl
diff --git a/conf/glance/glance-registry.conf.template b/conf/glance/glance-registry.conf.tpl
similarity index 100%
rename from conf/glance/glance-registry.conf.template
rename to conf/glance/glance-registry.conf.tpl
diff --git a/conf/horizon/000-default.template b/conf/horizon/000-default.tpl
similarity index 100%
rename from conf/horizon/000-default.template
rename to conf/horizon/000-default.tpl
diff --git a/conf/horizon/horizon_settings.py.template b/conf/horizon/horizon_settings.py.tpl
similarity index 100%
rename from conf/horizon/horizon_settings.py.template
rename to conf/horizon/horizon_settings.py.tpl
diff --git a/conf/keystone/keystone.conf.template b/conf/keystone/keystone.conf.tpl
similarity index 100%
rename from conf/keystone/keystone.conf.template
rename to conf/keystone/keystone.conf.tpl
diff --git a/conf/keystone/keystone_data.sh.template b/conf/keystone/keystone_data.sh.tpl
similarity index 100%
rename from conf/keystone/keystone_data.sh.template
rename to conf/keystone/keystone_data.sh.tpl
diff --git a/conf/nova/nova-api-paste.ini.template b/conf/nova/nova-api-paste.ini.tpl
similarity index 100%
rename from conf/nova/nova-api-paste.ini.template
rename to conf/nova/nova-api-paste.ini.tpl
diff --git a/conf/swift/account-server.conf.template b/conf/swift/account-server.conf.tpl
similarity index 100%
rename from conf/swift/account-server.conf.template
rename to conf/swift/account-server.conf.tpl
diff --git a/conf/swift/container-server.conf.template b/conf/swift/container-server.conf.tpl
similarity index 100%
rename from conf/swift/container-server.conf.template
rename to conf/swift/container-server.conf.tpl
diff --git a/conf/swift/object-server.conf.template b/conf/swift/object-server.conf.tpl
similarity index 100%
rename from conf/swift/object-server.conf.template
rename to conf/swift/object-server.conf.tpl
diff --git a/conf/swift/proxy-server.conf.template b/conf/swift/proxy-server.conf.tpl
similarity index 100%
rename from conf/swift/proxy-server.conf.template
rename to conf/swift/proxy-server.conf.tpl
diff --git a/conf/swift/rsyncd.conf.template b/conf/swift/rsyncd.conf.tpl
similarity index 100%
rename from conf/swift/rsyncd.conf.template
rename to conf/swift/rsyncd.conf.tpl
diff --git a/conf/swift/swift-remakerings.template b/conf/swift/swift-remakerings.tpl
similarity index 100%
rename from conf/swift/swift-remakerings.template
rename to conf/swift/swift-remakerings.tpl
diff --git a/conf/swift/swift-startmain.template b/conf/swift/swift-startmain.tpl
similarity index 100%
rename from conf/swift/swift-startmain.template
rename to conf/swift/swift-startmain.tpl
diff --git a/conf/swift/swift.conf.template b/conf/swift/swift.conf.tpl
similarity index 100%
rename from conf/swift/swift.conf.template
rename to conf/swift/swift.conf.tpl