diff --git a/spec/controllers/groups/members_controller_spec.rb b/spec/controllers/groups/members_controller_spec.rb
index a245165e8..5e3046f8b 100644
--- a/spec/controllers/groups/members_controller_spec.rb
+++ b/spec/controllers/groups/members_controller_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Groups::MembersController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
     @group = FactoryGirl.create(:group)
     @user = @group.owner
     set_session_for @user
diff --git a/spec/controllers/groups/profile_controller_spec.rb b/spec/controllers/groups/profile_controller_spec.rb
index 73605fa66..21c62b7df 100644
--- a/spec/controllers/groups/profile_controller_spec.rb
+++ b/spec/controllers/groups/profile_controller_spec.rb
@@ -69,7 +69,7 @@ end
 
 describe Groups::ProfileController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
     @group = FactoryGirl.create(:group)
     @another_user  = FactoryGirl.create(:user)
     @create_params = {:group => {:description => 'grp1', :uname => 'un_grp1'}}
diff --git a/spec/controllers/platforms/platforms_controller_spec.rb b/spec/controllers/platforms/platforms_controller_spec.rb
index 5ec928b1c..242315f10 100644
--- a/spec/controllers/platforms/platforms_controller_spec.rb
+++ b/spec/controllers/platforms/platforms_controller_spec.rb
@@ -35,7 +35,7 @@ end
 
 describe Platforms::PlatformsController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @platform = FactoryGirl.create(:platform)
     @personal_platform = FactoryGirl.create(:platform, :platform_type => 'personal')
diff --git a/spec/controllers/platforms/product_build_lists_controller_spec.rb b/spec/controllers/platforms/product_build_lists_controller_spec.rb
index c79828492..a08fc67d6 100644
--- a/spec/controllers/platforms/product_build_lists_controller_spec.rb
+++ b/spec/controllers/platforms/product_build_lists_controller_spec.rb
@@ -26,7 +26,7 @@ end
 
 describe Platforms::ProductBuildListsController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
   end
 
   context 'crud' do
diff --git a/spec/controllers/platforms/products_controller_spec.rb b/spec/controllers/platforms/products_controller_spec.rb
index 7490675e9..e90d48cbc 100644
--- a/spec/controllers/platforms/products_controller_spec.rb
+++ b/spec/controllers/platforms/products_controller_spec.rb
@@ -24,7 +24,7 @@ end
 
 describe Platforms::ProductsController do
 	before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @another_user = FactoryGirl.create(:user)
     @platform = FactoryGirl.create(:platform)
diff --git a/spec/controllers/platforms/repositories_controller_spec.rb b/spec/controllers/platforms/repositories_controller_spec.rb
index 5fec835cc..35120683d 100644
--- a/spec/controllers/platforms/repositories_controller_spec.rb
+++ b/spec/controllers/platforms/repositories_controller_spec.rb
@@ -67,7 +67,7 @@ end
 
 describe Platforms::RepositoriesController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @platform = FactoryGirl.create(:platform)
     @repository = FactoryGirl.create(:repository, :platform =>  @platform)
diff --git a/spec/controllers/projects/build_lists_controller_spec.rb b/spec/controllers/projects/build_lists_controller_spec.rb
index bdaf51cc0..7f8c8e331 100644
--- a/spec/controllers/projects/build_lists_controller_spec.rb
+++ b/spec/controllers/projects/build_lists_controller_spec.rb
@@ -64,7 +64,7 @@ describe Projects::BuildListsController do
     end
   end
 
-  before { stub_rsync_methods }
+  before { stub_symlink_methods }
 
   context 'crud' do
     before(:each) do
diff --git a/spec/controllers/projects/collaborators_controller_spec.rb b/spec/controllers/projects/collaborators_controller_spec.rb
index f40f0b3c8..5c8d320c2 100644
--- a/spec/controllers/projects/collaborators_controller_spec.rb
+++ b/spec/controllers/projects/collaborators_controller_spec.rb
@@ -64,7 +64,7 @@ end
 
 describe Projects::CollaboratorsController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
     @project = FactoryGirl.create(:project)
     @another_user = FactoryGirl.create(:user)
     @member_user = FactoryGirl.create(:user)
diff --git a/spec/controllers/projects/comments_controller_for_commit_spec.rb b/spec/controllers/projects/comments_controller_for_commit_spec.rb
index 9cc131c3e..3ddce850e 100644
--- a/spec/controllers/projects/comments_controller_for_commit_spec.rb
+++ b/spec/controllers/projects/comments_controller_for_commit_spec.rb
@@ -76,7 +76,7 @@ end
 
 describe Projects::CommentsController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
     @project = FactoryGirl.create(:project)
     %x(cp -Rf #{Rails.root}/spec/tests.git/* #{@project.git_repository.path}) # maybe FIXME ?
     @commit = @project.git_repository.commits.first
diff --git a/spec/controllers/projects/comments_controller_spec.rb b/spec/controllers/projects/comments_controller_spec.rb
index 41d6009b4..c04b09c58 100644
--- a/spec/controllers/projects/comments_controller_spec.rb
+++ b/spec/controllers/projects/comments_controller_spec.rb
@@ -72,7 +72,7 @@ end
 
 describe Projects::CommentsController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @project = FactoryGirl.create(:project)
     @issue = FactoryGirl.create(:issue, :project_id => @project.id, :user => FactoryGirl.create(:user))
diff --git a/spec/controllers/projects/git/git_trees_controller_spec.rb b/spec/controllers/projects/git/git_trees_controller_spec.rb
index 16a10a40b..6d6f7effb 100644
--- a/spec/controllers/projects/git/git_trees_controller_spec.rb
+++ b/spec/controllers/projects/git/git_trees_controller_spec.rb
@@ -8,7 +8,7 @@ describe Projects::Git::TreesController do
   end
 
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @project = FactoryGirl.create(:project)
     @another_user = FactoryGirl.create(:user)
diff --git a/spec/controllers/projects/issues_controller_spec.rb b/spec/controllers/projects/issues_controller_spec.rb
index fe1028f67..4bb6f59b1 100644
--- a/spec/controllers/projects/issues_controller_spec.rb
+++ b/spec/controllers/projects/issues_controller_spec.rb
@@ -73,7 +73,7 @@ end
 
 describe Projects::IssuesController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @project = FactoryGirl.create(:project)
     @issue_user = FactoryGirl.create(:user)
diff --git a/spec/controllers/projects/projects_controller_spec.rb b/spec/controllers/projects/projects_controller_spec.rb
index 4893709f2..eace34aa2 100644
--- a/spec/controllers/projects/projects_controller_spec.rb
+++ b/spec/controllers/projects/projects_controller_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 describe Projects::ProjectsController do
 
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @project = FactoryGirl.create(:project)
     @another_user = FactoryGirl.create(:user)
diff --git a/spec/controllers/projects/subscribes_controller_spec.rb b/spec/controllers/projects/subscribes_controller_spec.rb
index ea6c9b5af..8d37bb90d 100644
--- a/spec/controllers/projects/subscribes_controller_spec.rb
+++ b/spec/controllers/projects/subscribes_controller_spec.rb
@@ -49,7 +49,7 @@ end
 
 describe Projects::SubscribesController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @project = FactoryGirl.create(:project)
     @issue = FactoryGirl.create(:issue, :project_id => @project.id)
diff --git a/spec/controllers/search_controller_spec.rb b/spec/controllers/search_controller_spec.rb
index 74b266789..f04c5e494 100644
--- a/spec/controllers/search_controller_spec.rb
+++ b/spec/controllers/search_controller_spec.rb
@@ -16,7 +16,7 @@ shared_examples_for 'not able search' do
 end
 
 describe SearchController do
-  before { stub_rsync_methods }
+  before { stub_symlink_methods }
 
   context 'as guest' do
     if APP_CONFIG['anonymous_access']
diff --git a/spec/controllers/users/profile_controller_spec.rb b/spec/controllers/users/profile_controller_spec.rb
index 6c370e44f..0451de6a8 100644
--- a/spec/controllers/users/profile_controller_spec.rb
+++ b/spec/controllers/users/profile_controller_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Users::ProfileController do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
 
     @simple_user = FactoryGirl.create(:user)
     @other_user = FactoryGirl.create(:user)
diff --git a/spec/factories/arches.rb b/spec/factories/arches.rb
index e72251a9d..eb210cbd0 100644
--- a/spec/factories/arches.rb
+++ b/spec/factories/arches.rb
@@ -1,6 +1,6 @@
 # -*- encoding : utf-8 -*-
 FactoryGirl.define do
   factory :arch do
-    name { FactoryGirl.generate(:string) }
+    name { FactoryGirl.generate(:unixname) }
   end
 end
diff --git a/spec/mailers/user_mailer_spec.rb b/spec/mailers/user_mailer_spec.rb
index b02165f4c..7c350c58e 100644
--- a/spec/mailers/user_mailer_spec.rb
+++ b/spec/mailers/user_mailer_spec.rb
@@ -6,7 +6,7 @@ describe UserMailer do
 
   context 'On Issue create' do
     before(:each) do
-      stub_rsync_methods
+      stub_symlink_methods
 
       @project = FactoryGirl.create(:project)
       @issue_user = FactoryGirl.create(:user)
@@ -44,7 +44,7 @@ describe UserMailer do
 
   context 'On Issue assign' do
     before(:each) do
-      stub_rsync_methods
+      stub_symlink_methods
 
       @project = FactoryGirl.create(:project)
       @issue_user = FactoryGirl.create(:user)
@@ -80,7 +80,7 @@ describe UserMailer do
 
   context 'On Comment create' do
     before(:each) do
-      stub_rsync_methods
+      stub_symlink_methods
 
       @project = FactoryGirl.create(:project)
       @issue_user = FactoryGirl.create(:user)
diff --git a/spec/models/cancan_spec.rb b/spec/models/cancan_spec.rb
index 652d77834..c496fbbf9 100644
--- a/spec/models/cancan_spec.rb
+++ b/spec/models/cancan_spec.rb
@@ -25,7 +25,7 @@ describe CanCan do
   let(:register_request) { FactoryGirl.create(:register_request) }
 
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
   end
 
 	context 'Site admin' do
diff --git a/spec/models/comment_for_commit_spec.rb b/spec/models/comment_for_commit_spec.rb
index c8bcc0afd..e4ad33f74 100644
--- a/spec/models/comment_for_commit_spec.rb
+++ b/spec/models/comment_for_commit_spec.rb
@@ -23,7 +23,7 @@ def set_comments_data_for_commit
 end
 
 describe Comment do
-  before { stub_rsync_methods }
+  before { stub_symlink_methods }
   context 'for global admin user' do
     before(:each) do
       @user = FactoryGirl.create(:admin)
diff --git a/spec/models/comment_spec.rb b/spec/models/comment_spec.rb
index 16caf891b..afc99e0bc 100644
--- a/spec/models/comment_spec.rb
+++ b/spec/models/comment_spec.rb
@@ -15,7 +15,7 @@ def set_commentable_data
 end
 
 describe Comment do
-  before { stub_rsync_methods }
+  before { stub_symlink_methods }
   context 'for global admin user' do
     before(:each) do
       @user = FactoryGirl.create(:admin)
diff --git a/spec/models/group_spec.rb b/spec/models/group_spec.rb
index e45a47994..36209c472 100644
--- a/spec/models/group_spec.rb
+++ b/spec/models/group_spec.rb
@@ -4,7 +4,7 @@ require "cancan/matchers"
 
 describe Group do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
     @group = FactoryGirl.create(:group)
     @ability = Ability.new(User.new)
   end
diff --git a/spec/models/platform_spec.rb b/spec/models/platform_spec.rb
index d8487ee1a..8e4486144 100644
--- a/spec/models/platform_spec.rb
+++ b/spec/models/platform_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Platform do
   before(:all) do
-    stub_rsync_methods
+    stub_symlink_methods
     Platform.delete_all
     User.delete_all
     FileUtils.rm_rf(APP_CONFIG['root_path'])
diff --git a/spec/models/product_build_list_spec.rb b/spec/models/product_build_list_spec.rb
index 9394cf8af..76587112f 100644
--- a/spec/models/product_build_list_spec.rb
+++ b/spec/models/product_build_list_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe ProductBuildList do
   before(:all) do
-    stub_rsync_methods
+    stub_symlink_methods
   end
 
   it { should belong_to(:product) }
diff --git a/spec/models/product_spec.rb b/spec/models/product_spec.rb
index d8638a23d..d8068fae6 100644
--- a/spec/models/product_spec.rb
+++ b/spec/models/product_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Product do
   before(:all) do
-    stub_rsync_methods
+    stub_symlink_methods
     Platform.delete_all
     User.delete_all
     Product.delete_all
diff --git a/spec/models/project_to_repository_spec.rb b/spec/models/project_to_repository_spec.rb
index d79c0fe02..8bde7bb95 100644
--- a/spec/models/project_to_repository_spec.rb
+++ b/spec/models/project_to_repository_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe ProjectToRepository do
   before(:each) do
-    stub_rsync_methods
+    stub_symlink_methods
     @platform = FactoryGirl.create(:platform)
     @first_repo = FactoryGirl.create(:repository, :platform_id => @platform.id)
     @second_repo = FactoryGirl.create(:repository, :platform_id => @platform.id)
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 57322ebdb..559507b2d 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -5,7 +5,7 @@ describe Repository do
 
   context 'when create with same owner that platform' do
     before (:each) do
-      stub_rsync_methods
+      stub_symlink_methods
       @platform = FactoryGirl.create(:platform)
       @params = {:name => 'tst_platform', :description => 'test platform'}
     end
@@ -17,7 +17,7 @@ describe Repository do
   end
   
   before(:all) do
-    stub_rsync_methods
+    stub_symlink_methods
     Platform.delete_all
     User.delete_all
     Repository.delete_all
diff --git a/spec/models/subscribe_spec.rb b/spec/models/subscribe_spec.rb
index be111a6a8..a74be8a0d 100644
--- a/spec/models/subscribe_spec.rb
+++ b/spec/models/subscribe_spec.rb
@@ -12,7 +12,7 @@ def set_testable_data
 end
 
 describe Subscribe do
-  before { stub_rsync_methods }
+  before { stub_symlink_methods }
   context 'for global admin user' do
     before(:each) do
       @user = FactoryGirl.create(:admin)
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index c4282c3f2..7eab2ddcd 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -33,7 +33,7 @@ def set_session_for(user=nil)
   sign_in current_user
 end
 
-def stub_rsync_methods
+def stub_symlink_methods
   any_instance_of(Platform, :symlink_directory => true)
   any_instance_of(Platform, :remove_symlink_directory => true)
 end