diff --git a/packstack/plugins/swift_600.py b/packstack/plugins/swift_600.py
index 6be80c0c8..f07565118 100644
--- a/packstack/plugins/swift_600.py
+++ b/packstack/plugins/swift_600.py
@@ -209,7 +209,7 @@ def parse_devices(config):
                         'device_name': 'device%s' % device_number})
     if not devices:
         devices.append({'device': None, 'zone': 1,
-                        'device_name': 'swift_loopback'})
+                        'device_name': 'swiftloopback'})
     return devices
 
 
diff --git a/packstack/puppet/templates/swift_loopback.pp b/packstack/puppet/templates/swift_loopback.pp
index ad5b57f5e..80abf4e3a 100644
--- a/packstack/puppet/templates/swift_loopback.pp
+++ b/packstack/puppet/templates/swift_loopback.pp
@@ -1,5 +1,5 @@
 
-swift::storage::loopback { 'swift_loopback':
+swift::storage::loopback { 'swiftloopback':
   base_dir     => '/srv/loopback-device',
   mnt_base_dir => '/srv/node',
   require      => Class['swift'],