diff --git a/setup.py b/setup.py
index 9ebaa9b..5f28364 100644
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,7 @@
       py_modules=['tap_salesforce'],
       install_requires=[
           'requests==2.20.0',
-          'singer-python==5.3.1',
+          'pipelinewise-singer-python==1.*',
           'xmltodict==0.11.0'
       ],
       entry_points='''
diff --git a/tap_salesforce/__init__.py b/tap_salesforce/__init__.py
index 0eb9c75..46c815c 100644
--- a/tap_salesforce/__init__.py
+++ b/tap_salesforce/__init__.py
@@ -11,7 +11,7 @@
 from tap_salesforce.salesforce.exceptions import (
     TapSalesforceException, TapSalesforceQuotaExceededException)
 
-LOGGER = singer.get_logger()
+LOGGER = singer.get_logger('tap_salesforce')
 
 REQUIRED_CONFIG_KEYS = ['refresh_token',
                         'client_id',
diff --git a/tap_salesforce/salesforce/__init__.py b/tap_salesforce/salesforce/__init__.py
index 71aa304..1adf933 100644
--- a/tap_salesforce/salesforce/__init__.py
+++ b/tap_salesforce/salesforce/__init__.py
@@ -14,7 +14,7 @@
     TapSalesforceException,
     TapSalesforceQuotaExceededException)
 
-LOGGER = singer.get_logger()
+LOGGER = singer.get_logger('tap_salesforce')
 
 # The minimum expiration setting for SF Refresh Tokens is 15 minutes
 REFRESH_TOKEN_EXPIRATION_PERIOD = 900
diff --git a/tap_salesforce/salesforce/bulk.py b/tap_salesforce/salesforce/bulk.py
index 276c8d0..0a81575 100644
--- a/tap_salesforce/salesforce/bulk.py
+++ b/tap_salesforce/salesforce/bulk.py
@@ -18,7 +18,7 @@
 ITER_CHUNK_SIZE = 1024
 DEFAULT_CHUNK_SIZE = 50000
 
-LOGGER = singer.get_logger()
+LOGGER = singer.get_logger('tap_salesforce')
 
 # pylint: disable=inconsistent-return-statements
 def find_parent(stream):
diff --git a/tap_salesforce/salesforce/rest.py b/tap_salesforce/salesforce/rest.py
index 1c69450..1ab744c 100644
--- a/tap_salesforce/salesforce/rest.py
+++ b/tap_salesforce/salesforce/rest.py
@@ -4,7 +4,7 @@
 from requests.exceptions import HTTPError
 from tap_salesforce.salesforce.exceptions import TapSalesforceException
 
-LOGGER = singer.get_logger()
+LOGGER = singer.get_logger('tap_salesforce')
 
 MAX_RETRIES = 4
 
diff --git a/tap_salesforce/sync.py b/tap_salesforce/sync.py
index 5f1a122..628ecbc 100644
--- a/tap_salesforce/sync.py
+++ b/tap_salesforce/sync.py
@@ -5,7 +5,7 @@
 from requests.exceptions import RequestException
 from tap_salesforce.salesforce.bulk import Bulk
 
-LOGGER = singer.get_logger()
+LOGGER = singer.get_logger('tap_salesforce')
 
 BLACKLISTED_FIELDS = set(['attributes'])