diff --git a/lib/ibm_cloud_sdk_core/authenticators/cp4d_authenticator.rb b/lib/ibm_cloud_sdk_core/authenticators/cp4d_authenticator.rb
index 09ca7e1..f7b6ac9 100644
--- a/lib/ibm_cloud_sdk_core/authenticators/cp4d_authenticator.rb
+++ b/lib/ibm_cloud_sdk_core/authenticators/cp4d_authenticator.rb
@@ -34,7 +34,7 @@ def initialize(vars)
 
     # Adds the Authorization header, if possible
     def authenticate(headers)
-      headers["Authorization"] = "Bearer #{@token_manager.access_token}"
+      headers["Authorization"] = "Bearer #{@token_manager.token}"
     end
 
     # Checks if all the inputs needed are present
diff --git a/lib/ibm_cloud_sdk_core/authenticators/iam_authenticator.rb b/lib/ibm_cloud_sdk_core/authenticators/iam_authenticator.rb
index 2e5d12d..d6fbf0a 100644
--- a/lib/ibm_cloud_sdk_core/authenticators/iam_authenticator.rb
+++ b/lib/ibm_cloud_sdk_core/authenticators/iam_authenticator.rb
@@ -35,7 +35,7 @@ def initialize(vars)
     end
 
     def authenticate(headers)
-      headers["Authorization"] = "Bearer #{@token_manager.access_token}"
+      headers["Authorization"] = "Bearer #{@token_manager.token}"
     end
 
     def validate
diff --git a/test/unit/test_iam_token_manager.rb b/test/unit/test_iam_token_manager.rb
index 650e7b8..34a84ec 100644
--- a/test/unit/test_iam_token_manager.rb
+++ b/test/unit/test_iam_token_manager.rb
@@ -16,8 +16,8 @@ def test_request_token
       "iss": "sss",
       "aud": "sss",
       "uid": "sss",
-      "iat": Time.now.to_i + 3600,
-      "exp": Time.now.to_i
+      "iat": Time.now.to_i,
+      "exp": Time.now.to_i + 3600
     }
     token = JWT.encode token_layout, "secret", "HS256"
     response = {
@@ -108,8 +108,8 @@ def test_get_token
       "iss" => "sss",
       "aud" => "sss",
       "uid" => "sss",
-      "iat" => 3600,
-      "exp" => Time.now.to_i
+      "iat" => Time.now.to_i,
+      "exp" => Time.now.to_i + 3600
     }
 
     access_token = JWT.encode(access_token_layout, "secret", "HS256", "kid": "230498151c214b788dd97f22b85410a5")