diff --git a/test/integration/webdav/dmsf_webdav_delete_test.rb b/test/integration/webdav/dmsf_webdav_delete_test.rb
index 532423b4..55358999 100644
--- a/test/integration/webdav/dmsf_webdav_delete_test.rb
+++ b/test/integration/webdav/dmsf_webdav_delete_test.rb
@@ -178,8 +178,7 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
       @project1.enable_module! :dmsf # Flag module enabled
       delete "/dmsf/webdav/#{@project1.identifier}/#{@folder6.title}", nil, @jsmith
       assert_response 404
-      p1name = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
-      p1name_uri = URI.encode(p1name, /\W/)
+      p1name_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
       delete "/dmsf/webdav/#{p1name_uri}/#{@folder6.title}", nil, @jsmith
       assert_response :success
       @folder6.reload
@@ -215,16 +214,11 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
       @project1.enable_module! :dmsf
       @role.add_permission! :view_dmsf_folders
       @role.add_permission! :file_delete
-
       delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil, @jsmith
       assert_response 404
-
-      p1name = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
-      p1name_uri = URI.encode(p1name, /\W/)
-
+      p1name_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
       delete "/dmsf/webdav/#{p1name_uri}/#{@file1.name}", nil, @jsmith
       assert_response :success
-
       @file1.reload
       assert @file1.deleted?, "File #{@file1.name} is not expected to exist"
     end
diff --git a/test/integration/webdav/dmsf_webdav_get_test.rb b/test/integration/webdav/dmsf_webdav_get_test.rb
index 79cae62e..5efe4c9c 100644
--- a/test/integration/webdav/dmsf_webdav_get_test.rb
+++ b/test/integration/webdav/dmsf_webdav_get_test.rb
@@ -98,7 +98,7 @@ class DmsfWebdavGetTest < RedmineDmsf::Test::IntegrationTest
     
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      project1_uri = URI.encode(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1), /\W/)
+      project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
       get "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, @admin
       assert_response 404
       get "/dmsf/webdav/#{project1_uri}/test.txt", nil, @admin
diff --git a/test/integration/webdav/dmsf_webdav_head_test.rb b/test/integration/webdav/dmsf_webdav_head_test.rb
index e94cf5f5..d76585d2 100644
--- a/test/integration/webdav/dmsf_webdav_head_test.rb
+++ b/test/integration/webdav/dmsf_webdav_head_test.rb
@@ -35,7 +35,7 @@ class DmsfWebdavHeadTest < RedmineDmsf::Test::IntegrationTest
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
     # Temporarily enable project names
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-    @project1_uri = URI.encode(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1), /\W/)    
+    @project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false    
     DmsfFile.storage_path = File.expand_path '../../../fixtures/files', __FILE__
     User.current = nil    
diff --git a/test/integration/webdav/dmsf_webdav_mkcol_test.rb b/test/integration/webdav/dmsf_webdav_mkcol_test.rb
index ee49d7c6..96a7760c 100644
--- a/test/integration/webdav/dmsf_webdav_mkcol_test.rb
+++ b/test/integration/webdav/dmsf_webdav_mkcol_test.rb
@@ -106,7 +106,7 @@ class DmsfWebdavMkcolTest < RedmineDmsf::Test::IntegrationTest
       assert_response :success
       Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
       if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-        project1_uri = URI.encode(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1), /\W/)
+        project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
         xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/test2", nil, @jsmith
         assert_response 404
         xml_http_request :mkcol, "/dmsf/webdav/#{project1_uri}/test3", nil, @jsmith
diff --git a/test/integration/webdav/dmsf_webdav_move_test.rb b/test/integration/webdav/dmsf_webdav_move_test.rb
index 3918bc7b..a6b0e49f 100644
--- a/test/integration/webdav/dmsf_webdav_move_test.rb
+++ b/test/integration/webdav/dmsf_webdav_move_test.rb
@@ -140,7 +140,7 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     file = DmsfFile.find_by_id 1
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      project1_uri = URI.encode(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1), /\W/)
+      project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
       new_name = "#{file.name}.moved"
       assert_difference 'file.dmsf_file_revisions.count', +1 do
         xml_http_request :move, "/dmsf/webdav/#{project1_uri}/#{file.name}", nil,
@@ -188,7 +188,7 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     folder = DmsfFolder.find_by_id 1
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      project1_uri = URI.encode(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1), /\W/)
+      project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
       assert_kind_of DmsfFile, file
       assert_kind_of DmsfFolder, folder
 
diff --git a/test/integration/webdav/dmsf_webdav_options_test.rb b/test/integration/webdav/dmsf_webdav_options_test.rb
index add44259..ec047e7b 100644
--- a/test/integration/webdav/dmsf_webdav_options_test.rb
+++ b/test/integration/webdav/dmsf_webdav_options_test.rb
@@ -156,7 +156,7 @@ class DmsfWebdavOptionsTest < RedmineDmsf::Test::IntegrationTest
     
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      project1_uri = URI.encode(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1), /\W/)
+      project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
       xml_http_request  :options, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_USER_AGENT => 'Other'})
       assert_response 404
       xml_http_request  :options, "/dmsf/webdav/#{project1_uri}", nil, @admin.merge!({:HTTP_USER_AGENT => 'Other'})
diff --git a/test/integration/webdav/dmsf_webdav_propfind_test.rb b/test/integration/webdav/dmsf_webdav_propfind_test.rb
index ea6b4655..393a3c00 100644
--- a/test/integration/webdav/dmsf_webdav_propfind_test.rb
+++ b/test/integration/webdav/dmsf_webdav_propfind_test.rb
@@ -46,8 +46,7 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
     
     # Temporarily enable project names to generate names for project1
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-    @project1_name = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
-    @project1_uri = URI.encode(@project1_name, /\W/)
+    @project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
     RedmineDmsf::Webdav::Cache.init_nullcache
   end
@@ -127,7 +126,7 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
       assert_no_match "<D:displayname>#{@project1.identifier}</D:displayname>", response.body
       # but the project name should match
       assert_match "<D:href>http://www.example.com:80/dmsf/webdav/#{@project1_uri}/</D:href>", response.body
-      assert_match "<D:displayname>#{@project1_name}</D:displayname>", response.body
+      assert_match "<D:displayname>#{@project1_uri}</D:displayname>", response.body
     end
   end
   
@@ -175,7 +174,7 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
       assert_no_match "<D:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/</D:href>", response.body
       assert_no_match "<D:displayname>#{@project1.identifier}</D:displayname>", response.body
       assert_match "<D:href>http://www.example.com:80/dmsf/webdav/#{@project1_uri}/</D:href>", response.body
-      assert_match "<D:displayname>#{@project1_name}</D:displayname>", response.body
+      assert_match "<D:displayname>#{@project1_uri}</D:displayname>", response.body
     end
   end
   
@@ -220,7 +219,7 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
       assert_no_match "<D:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/</D:href>", response.body
       assert_no_match "<D:displayname>#{@project1.identifier}</D:displayname>", response.body
       assert_match "<D:href>http://www.example.com:80/dmsf/webdav/#{@project1_uri}/</D:href>", response.body
-      assert_match "<D:displayname>#{@project1_name}</D:displayname>", response.body
+      assert_match "<D:displayname>#{@project1_uri}</D:displayname>", response.body
 
       # Folders
       assert_no_match "<D:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/#{@folder1.title}/</D:href>", response.body
@@ -263,13 +262,12 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
 
       # but the project name should match
       assert_match "<D:href>http://www.example.com:80/dmsf/webdav/#{@project1_uri}/</D:href>", response.body
-      assert_match "<D:displayname>#{@project1_name}</D:displayname>", response.body
+      assert_match "<D:displayname>#{@project1_uri}</D:displayname>", response.body
 
       # Rename project1
       @project1.name = 'Online Cookbook'
       @project1.save!
-      project1_new_name = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
-      project1_new_uri = URI.encode(project1_new_name, /\W/)
+      project1_new_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
 
       # PROPSTATS for / is already cached, but a new PROPSTATS should be cached for project1
       assert_difference 'RedmineDmsf::Webdav::Cache.cache.instance_variable_get(:@data).count', +1 do
@@ -287,11 +285,11 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
 
       # old project name should not match
       assert_no_match "<D:href>http://www.example.com:80/dmsf/webdav/#{@project1_uri}/</D:href>", response.body
-      assert_no_match "<D:displayname>#{@project1_name}</D:displayname>", response.body
+      assert_no_match "<D:displayname>#{@project1_uri}</D:displayname>", response.body
 
       # but new project name should match
       assert_match "<D:href>http://www.example.com:80/dmsf/webdav/#{project1_new_uri}/</D:href>", response.body
-      assert_match "<D:displayname>#{project1_new_name}</D:displayname>", response.body
+      assert_match "<D:displayname>#{project1_new_uri}</D:displayname>", response.body
     end
   end
   
diff --git a/test/integration/webdav/dmsf_webdav_put_test.rb b/test/integration/webdav/dmsf_webdav_put_test.rb
index 246bfc83..909740bd 100644
--- a/test/integration/webdav/dmsf_webdav_put_test.rb
+++ b/test/integration/webdav/dmsf_webdav_put_test.rb
@@ -102,7 +102,7 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
       assert file, 'Check for files existance'
       Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
       if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-        project1_uri = URI.encode(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1), /\W/)
+        project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
         put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @admin.merge!({:content_type => :text})
         assert_response 409
         put "/dmsf/webdav/#{project1_uri}/test-1234.txt", '1234', @admin.merge!({:content_type => :text})
@@ -157,7 +157,7 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
       assert file, 'File test-1234 was not found in projects dmsf folder.'
       Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
       if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-        project1_uri = URI.encode(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1), /\W/)
+        project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
         put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
         assert_response 409
         put "/dmsf/webdav/#{project1_uri}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})