diff --git a/README.md b/README.md
index 45bcd05..399a80a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 # LLDP-SyncD
-SSW sync daemon for LLDP data. 
+SONiC Switch State Service sync daemon for LLDP data. 
 
 See the [SONiC Website](http://azure.github.io/SONiC/) for more information about the SONiC project.
diff --git a/setup.py b/setup.py
index 3a3f1a0..3fb2bcf 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 dependencies = [
-    'sswsdk>=1.3.0',
+    'swsssdk>=1.3.0',
     'enum34>=1.1.6',
 ]
 
@@ -10,7 +10,7 @@
 ]
 
 high_performance_deps = [
-    'sswsdk[high_perf]>=1.1',
+    'swsssdk[high_perf]>=1.1',
 ]
 
 setup(
diff --git a/src/lldp_syncd/__main__.py b/src/lldp_syncd/__main__.py
index ddb55ec..239a917 100644
--- a/src/lldp_syncd/__main__.py
+++ b/src/lldp_syncd/__main__.py
@@ -1,7 +1,7 @@
 import logging.handlers
 import sys
 
-import sswsdk.util
+import swsssdk.util
 
 import lldp_syncd
 import sonic_syncd
@@ -9,7 +9,7 @@
 LOG_FORMAT = "lldp-syncd [%(name)s] %(levelname)s: %(message)s"
 
 # import command line arguments
-args = sswsdk.util.process_options("lldp_syncd")
+args = swsssdk.util.process_options("lldp_syncd")
 
 # configure logging. If debug is specified, logs to stdout at designated level. syslog otherwise.
 log_level = args.get('log_level')
@@ -23,12 +23,12 @@
     lldp_syncd.logger.addHandler(logging.StreamHandler(sys.stdout))
 
 # set the log levels
-sswsdk.logger.setLevel(log_level)
+swsssdk.logger.setLevel(log_level)
 sonic_syncd.logger.setLevel(log_level)
 lldp_syncd.logger.setLevel(log_level)
 
 # inherit logging handlers in submodules
-sswsdk.logger.handlers = lldp_syncd.logger.handlers
+swsssdk.logger.handlers = lldp_syncd.logger.handlers
 sonic_syncd.logger.handlers = lldp_syncd.logger.handlers
 
 #
diff --git a/src/lldp_syncd/daemon.py b/src/lldp_syncd/daemon.py
index 7572312..5e7038a 100644
--- a/src/lldp_syncd/daemon.py
+++ b/src/lldp_syncd/daemon.py
@@ -6,7 +6,7 @@
 from collections import defaultdict
 
 from enum import unique, Enum
-from sswsdk import SonicV2Connector
+from swsssdk import SonicV2Connector
 
 from sonic_syncd import SonicSyncDaemon
 from . import logger
diff --git a/tests/mock_tables/dbconnector.py b/tests/mock_tables/dbconnector.py
index 4ab1de0..051e074 100644
--- a/tests/mock_tables/dbconnector.py
+++ b/tests/mock_tables/dbconnector.py
@@ -3,8 +3,8 @@
 import os
 
 import mockredis
-import sswsdk.interface
-from sswsdk.interface import redis
+import swsssdk.interface
+from swsssdk.interface import redis
 
 
 def _subscribe_keyspace_notification(self, db_name, client):
@@ -18,9 +18,9 @@ def config_set(self, *args):
 INPUT_DIR = os.path.dirname(os.path.abspath(__file__))
 
 
-class SSWSyncClient(mockredis.MockRedis):
+class SwssSyncClient(mockredis.MockRedis):
     def __init__(self, *args, **kwargs):
-        super(SSWSyncClient, self).__init__(strict=True, *args, **kwargs)
+        super(SwssSyncClient, self).__init__(strict=True, *args, **kwargs)
         db = kwargs.pop('db')
         if db == 0:
             with open(INPUT_DIR + '/LLDP_ENTRY_TABLE.json') as f:
@@ -30,6 +30,6 @@ def __init__(self, *args, **kwargs):
                         self.hset(h, k, v)
 
 
-sswsdk.interface.DBInterface._subscribe_keyspace_notification = _subscribe_keyspace_notification
+swsssdk.interface.DBInterface._subscribe_keyspace_notification = _subscribe_keyspace_notification
 mockredis.MockRedis.config_set = config_set
-redis.StrictRedis = SSWSyncClient
\ No newline at end of file
+redis.StrictRedis = SwssSyncClient
diff --git a/tests/test_lldpSyncDaemon.py b/tests/test_lldpSyncDaemon.py
index fb6f9be..a9bde20 100644
--- a/tests/test_lldpSyncDaemon.py
+++ b/tests/test_lldpSyncDaemon.py
@@ -13,7 +13,7 @@
 import lldp_syncd
 import lldp_syncd.conventions
 import lldp_syncd.daemon
-from sswsdk import SonicV2Connector
+from swsssdk import SonicV2Connector
 
 INPUT_DIR = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'subproc_outputs')