diff --git a/lib/spaceship/client.rb b/lib/spaceship/client.rb
index <HASH>..<HASH> 100644
--- a/lib/spaceship/client.rb
+++ b/lib/spaceship/client.rb
@@ -200,7 +200,7 @@ module Spaceship
     end
 
     # Set a new team ID which will be used from now on
-    def current_team_id=(team_id)
+    def team_id=(team_id)
       @current_team_id = team_id
     end
 
diff --git a/spec/client_spec.rb b/spec/client_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/client_spec.rb
+++ b/spec/client_spec.rb
@@ -62,6 +62,12 @@ describe Spaceship::Client do
       it 'returns the default team_id' do
         expect(subject.team_id).to eq('XXXXXXXXXX')
       end
+
+      it "set custom Team ID" do
+        team_id = "ABCDEF"
+        subject.team_id = team_id
+        expect(subject.team_id).to eq(team_id)
+      end
     end
 
     describe "test timeout catching" do
diff --git a/spec/spaceship_spec.rb b/spec/spaceship_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/spaceship_spec.rb
+++ b/spec/spaceship_spec.rb
@@ -18,6 +18,7 @@ describe Spaceship do
       expect(subject.device).to eq(Spaceship::Device)
       expect(subject.provisioning_profile).to eq(Spaceship::ProvisioningProfile)
     end
+    
     it 'passes the client to the models' do
       expect(subject.device.client).to eq(subject.client)
     end
Renamed current_team_id= to team_id= in client