diff --git a/modules/salesforce_soap/composer.json b/modules/salesforce_soap/composer.json
index cb0d63fb2c854aa141085202bde71ba4497ba8fc..859c77f43d22a187405e69e7f90da315cf5e92b6 100644
--- a/modules/salesforce_soap/composer.json
+++ b/modules/salesforce_soap/composer.json
@@ -25,7 +25,7 @@
     "source": "http://cgit.drupalcode.org/salesforce"
   },
   "require": {
-    "messageagency/force.com-toolkit-for-php": "^1.0.0",
+    "messageagency/force.com-toolkit-for-php": "^1.0.1",
     "ext-soap": "*"
   }
 }
diff --git a/modules/salesforce_soap/src/Soap/SoapClient.php b/modules/salesforce_soap/src/Soap/SoapClient.php
index 669878fd916e88f566fe4680fedbda9c26d91a9a..9262c60b23655f5f1610154290ed8568615bce15 100644
--- a/modules/salesforce_soap/src/Soap/SoapClient.php
+++ b/modules/salesforce_soap/src/Soap/SoapClient.php
@@ -70,7 +70,7 @@ class SoapClient extends SforcePartnerClient implements SoapClientInterface {
     }
     $this->createConnection($this->wsdl);
     $this->setSessionHeader($token->getAccessToken());
-    $this->setEndPoint($this->authMan->getProvider()->getApiEndpoint('partner'));
+    $this->setEndpoint($this->authMan->getProvider()->getApiEndpoint('partner'));
     $this->isConnected = TRUE;
   }
 
diff --git a/src/Rest/RestClient.php b/src/Rest/RestClient.php
index e21a68ff92a87ceb411b8da13691b0f87f06679c..5b3b2826d239fc16c8a3ac7a0c3547b51402414e 100644
--- a/src/Rest/RestClient.php
+++ b/src/Rest/RestClient.php
@@ -178,7 +178,7 @@ class RestClient implements RestClientInterface {
       $url = $this->authProvider->getInstanceUrl() . $path;
     }
     else {
-      $url = $this->authProvider->getApiEndPoint() . $path;
+      $url = $this->authProvider->getApiEndpoint() . $path;
     }
 
     try {
@@ -463,7 +463,7 @@ class RestClient implements RestClientInterface {
         'records' => [],
       ]);
     }
-    $version_path = parse_url($this->authProvider->getApiEndPoint(), PHP_URL_PATH);
+    $version_path = parse_url($this->authProvider->getApiEndpoint(), PHP_URL_PATH);
     $next_records_url = str_replace($version_path, '', $results->nextRecordsUrl());
     return new SelectQueryResult($this->apiCall($next_records_url));
   }
diff --git a/tests/src/Unit/RestClientTest.php b/tests/src/Unit/RestClientTest.php
index f0fe263192164178f1af369f983f26169be51c9c..1033cd0d24182b5c5070753bb7faf994d508a4a1 100644
--- a/tests/src/Unit/RestClientTest.php
+++ b/tests/src/Unit/RestClientTest.php
@@ -65,7 +65,7 @@ class RestClientTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
     $this->authProvider->expects($this->any())
-      ->method('getApiEndPoint')
+      ->method('getApiEndpoint')
       ->willReturn('https://example.com');
     $this->authConfig =
       $this->getMockBuilder(SalesforceAuthConfig::CLASS)