diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index ab788221..102a6ff3 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -36,9 +36,9 @@ define swift::storage::server(
 
   $bind_port = $name
 
-  rsync::server::module { "${type}${name}":
+  rsync::server::module { "${type}":
     path => $devices,
-    lock_file => "/var/lock/${type}${name}.lock",
+    lock_file => "/var/lock/${type}.lock",
     uid => $owner,
     gid => $group,
     max_connections => $max_connections,
diff --git a/spec/defines/swift_storage_server_spec.rb b/spec/defines/swift_storage_server_spec.rb
index e20a935f..2d0ceb8a 100644
--- a/spec/defines/swift_storage_server_spec.rb
+++ b/spec/defines/swift_storage_server_spec.rb
@@ -92,9 +92,9 @@ describe 'swift::storage::server' do
           req_params
         end
 
-        it { should contain_rsync__server__module("#{t}#{title}").with(
+        it { should contain_rsync__server__module("#{t}").with(
           :path            => '/srv/node',
-          :lock_file       => "/var/lock/#{t}#{title}.lock",
+          :lock_file       => "/var/lock/#{t}.lock",
           :uid             => 'swift',
           :gid             => 'swift',
           :max_connections => 25,