diff --git a/etc/account-server/1.conf-gluster b/etc/account-server.conf-gluster
similarity index 87%
rename from etc/account-server/1.conf-gluster
rename to etc/account-server.conf-gluster
index da8f317..420f54d 100644
--- a/etc/account-server/1.conf-gluster
+++ b/etc/account-server.conf-gluster
@@ -9,7 +9,7 @@ log_facility = LOG_LOCAL2
 pipeline = account-server
 
 [app:account-server]
-use = egg:gluster_swift_ufo#account
+use = egg:gluster_swift#account
 
 [account-replicator]
 vm_test_mode = yes
diff --git a/etc/container-server/1.conf-gluster b/etc/container-server.conf-gluster
similarity index 88%
rename from etc/container-server/1.conf-gluster
rename to etc/container-server.conf-gluster
index acad621..21477dc 100644
--- a/etc/container-server/1.conf-gluster
+++ b/etc/container-server.conf-gluster
@@ -9,7 +9,7 @@ log_facility = LOG_LOCAL2
 pipeline = container-server
 
 [app:container-server]
-use = egg:gluster_swift_ufo#container
+use = egg:gluster_swift#container
 
 [container-replicator]
 vm_test_mode = yes
diff --git a/etc/object-server/1.conf-gluster b/etc/object-server.conf-gluster
similarity index 96%
rename from etc/object-server/1.conf-gluster
rename to etc/object-server.conf-gluster
index 0d85546..effecd1 100644
--- a/etc/object-server/1.conf-gluster
+++ b/etc/object-server.conf-gluster
@@ -10,7 +10,7 @@ workers = 1
 pipeline = object-server
 
 [app:object-server]
-use = egg:gluster_swift_ufo#object
+use = egg:gluster_swift#object
 user = root
 log_facility = LOG_LOCAL2
 # Timeout clients that don't read or write to the proxy server after 5
diff --git a/etc/proxy-server.conf-gluster b/etc/proxy-server.conf-gluster
index e04efec..331fb02 100644
--- a/etc/proxy-server.conf-gluster
+++ b/etc/proxy-server.conf-gluster
@@ -9,7 +9,7 @@ workers = 1
 pipeline = healthcheck cache tempauth proxy-server
 
 [app:proxy-server]
-use = egg:gluster_swift_ufo#proxy
+use = egg:gluster_swift#proxy
 log_facility = LOG_LOCAL1
 # The API allows for account creation and deletion, but since Gluster/Swift
 # automounts a Gluster volume for a given account, there is no way to create
diff --git a/glusterfs-openstack-swift.spec b/glusterfs-openstack-swift.spec
index f9b8643..f1f09ae 100644
--- a/glusterfs-openstack-swift.spec
+++ b/glusterfs-openstack-swift.spec
@@ -79,9 +79,9 @@ rm -rf %{buildroot}
 %{python_sitelib}/gluster_swift-%{version}-*.egg-info
 %{_bindir}/gluster-swift-gen-builders
 %dir %{_confdir}
-%config %{_confdir}/account-server/1.conf-gluster
-%config %{_confdir}/container-server/1.conf-gluster
-%config %{_confdir}/object-server/1.conf-gluster
+%config %{_confdir}/account-server.conf-gluster
+%config %{_confdir}/container-server.conf-gluster
+%config %{_confdir}/object-server.conf-gluster
 %config %{_confdir}/swift.conf-gluster
 %config %{_confdir}/proxy-server.conf-gluster
 %config %{_confdir}/fs.conf-gluster