diff --git a/sonic-stormond/pytest.ini b/sonic-storagemond/pytest.ini
similarity index 100%
rename from sonic-stormond/pytest.ini
rename to sonic-storagemond/pytest.ini
diff --git a/sonic-stormond/scripts/storagemond b/sonic-storagemond/scripts/storagemond
similarity index 96%
rename from sonic-stormond/scripts/storagemond
rename to sonic-storagemond/scripts/storagemond
index d617e7d90..1f2bfc8a6 100644
--- a/sonic-stormond/scripts/storagemond
+++ b/sonic-storagemond/scripts/storagemond
@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 
 """
-    stormond
-    SSD device monitoring daemon for SONiC
+    storagemond
+    Strage Monitoring device monitoring daemon for SONiC
 """
 
 import os
@@ -24,7 +24,7 @@ from swsscommon import swsscommon
 SIGNALS_TO_NAMES_DICT = dict((getattr(signal, n), n)
                              for n in dir(signal) if n.startswith('SIG') and '_' not in n)
 
-SYSLOG_IDENTIFIER = "stormond"
+SYSLOG_IDENTIFIER = "storagemond"
 
 STORAGE_DEVICE_TABLE_NAME = "STORAGE_INFO"
 
@@ -122,7 +122,7 @@ class DaemonStorage(daemon_base.DaemonBase):
     # Get Static attributes and update the State DB, once
     def get_static_fields(self):
 
-        # Get relevant information about each SSD on the device
+        # Get relevant information about each Storage Device on the switch
         for storage_device in self.storage.devices:
             try:
                 if self.storage.devices[storage_device] is None:
@@ -142,7 +142,7 @@ class DaemonStorage(daemon_base.DaemonBase):
                 self.log_info("Storage Device: {}, Device Model: {}, Serial: {}, FW: {}".format(storage_device, static_kvp_dict["device_model"], static_kvp_dict["serial"], static_kvp_dict["firmware"]))
                 self.read_static_fields[storage_device] = True
 
-                # update SSD Device Status to DB
+                # update Storage Device Status to DB
                 self.update_storage_info_status_db(storage_device, self.static_fields, static_kvp_dict)
                 self.updated_static_fields_statedb[storage_device] = True
 
@@ -171,7 +171,7 @@ class DaemonStorage(daemon_base.DaemonBase):
                     .format(storage_device, dynamic_kvp_dict["health"], dynamic_kvp_dict["temperature"], dynamic_kvp_dict["io_reads"], \
                             dynamic_kvp_dict["io_writes"], dynamic_kvp_dict["reserved_blocks"]))
 
-                # update SSD Device Status to DB
+                # update Storage Device Status to DB
                 self.update_storage_info_status_db(storage_device, self.dynamic_fields, dynamic_kvp_dict)
 
             except Exception as ex:
diff --git a/sonic-stormond/setup.cfg b/sonic-storagemond/setup.cfg
similarity index 100%
rename from sonic-stormond/setup.cfg
rename to sonic-storagemond/setup.cfg
diff --git a/sonic-stormond/setup.py b/sonic-storagemond/setup.py
similarity index 87%
rename from sonic-stormond/setup.py
rename to sonic-storagemond/setup.py
index 9e469375c..a4eb129dc 100644
--- a/sonic-stormond/setup.py
+++ b/sonic-storagemond/setup.py
@@ -3,7 +3,7 @@
 setup(
     name='sonic-stormond',
     version='1.0',
-    description='SSD status daemon for SONiC',
+    description='Storage Device status daemon for SONiC',
     license='Apache 2.0',
     author='SONiC Team',
     author_email='linuxnetdev@microsoft.com',
@@ -11,7 +11,7 @@
     maintainer='Ashwin Srinivasan',
     maintainer_email='assrinivasan@microsoft.com',
     scripts=[
-        'scripts/stormond',
+        'scripts/storagemond',
     ],
     setup_requires=[
         'pytest-runner',
@@ -38,6 +38,6 @@
         'Programming Language :: Python :: 2.7',
         'Topic :: System :: Hardware',
     ],
-    keywords='sonic SONiC ssd Ssd SSD ssdmon',
+    keywords='sonic SONiC ssd Ssd SSD ssdmond storage stormond storagemond',
     test_suite='setup.get_test_suite'
 )
diff --git a/sonic-stormond/tests/__init__.py b/sonic-storagemond/tests/__init__.py
similarity index 100%
rename from sonic-stormond/tests/__init__.py
rename to sonic-storagemond/tests/__init__.py
diff --git a/sonic-stormond/tests/mock_platform.py b/sonic-storagemond/tests/mock_platform.py
similarity index 100%
rename from sonic-stormond/tests/mock_platform.py
rename to sonic-storagemond/tests/mock_platform.py
diff --git a/sonic-stormond/tests/mocked_libs/sonic_platform/__init__.py b/sonic-storagemond/tests/mocked_libs/sonic_platform/__init__.py
similarity index 100%
rename from sonic-stormond/tests/mocked_libs/sonic_platform/__init__.py
rename to sonic-storagemond/tests/mocked_libs/sonic_platform/__init__.py
diff --git a/sonic-stormond/tests/mocked_libs/sonic_platform/ssd.py b/sonic-storagemond/tests/mocked_libs/sonic_platform/ssd.py
similarity index 100%
rename from sonic-stormond/tests/mocked_libs/sonic_platform/ssd.py
rename to sonic-storagemond/tests/mocked_libs/sonic_platform/ssd.py
diff --git a/sonic-stormond/tests/mocked_libs/sonic_platform_base/__init__.py b/sonic-storagemond/tests/mocked_libs/sonic_platform_base/__init__.py
similarity index 100%
rename from sonic-stormond/tests/mocked_libs/sonic_platform_base/__init__.py
rename to sonic-storagemond/tests/mocked_libs/sonic_platform_base/__init__.py
diff --git a/sonic-stormond/tests/mocked_libs/sonic_platform_base/sonic_ssd/__init__.py b/sonic-storagemond/tests/mocked_libs/sonic_platform_base/sonic_ssd/__init__.py
similarity index 100%
rename from sonic-stormond/tests/mocked_libs/sonic_platform_base/sonic_ssd/__init__.py
rename to sonic-storagemond/tests/mocked_libs/sonic_platform_base/sonic_ssd/__init__.py
diff --git a/sonic-stormond/tests/mocked_libs/sonic_platform_base/sonic_ssd/ssd_base.py b/sonic-storagemond/tests/mocked_libs/sonic_platform_base/sonic_ssd/ssd_base.py
similarity index 100%
rename from sonic-stormond/tests/mocked_libs/sonic_platform_base/sonic_ssd/ssd_base.py
rename to sonic-storagemond/tests/mocked_libs/sonic_platform_base/sonic_ssd/ssd_base.py
diff --git a/sonic-stormond/tests/mocked_libs/sonic_platform_base/sonic_ssd/ssd_generic.py b/sonic-storagemond/tests/mocked_libs/sonic_platform_base/sonic_ssd/ssd_generic.py
similarity index 100%
rename from sonic-stormond/tests/mocked_libs/sonic_platform_base/sonic_ssd/ssd_generic.py
rename to sonic-storagemond/tests/mocked_libs/sonic_platform_base/sonic_ssd/ssd_generic.py
diff --git a/sonic-stormond/tests/mocked_libs/swsscommon/__init__.py b/sonic-storagemond/tests/mocked_libs/swsscommon/__init__.py
similarity index 100%
rename from sonic-stormond/tests/mocked_libs/swsscommon/__init__.py
rename to sonic-storagemond/tests/mocked_libs/swsscommon/__init__.py
diff --git a/sonic-stormond/tests/mocked_libs/swsscommon/swsscommon.py b/sonic-storagemond/tests/mocked_libs/swsscommon/swsscommon.py
similarity index 100%
rename from sonic-stormond/tests/mocked_libs/swsscommon/swsscommon.py
rename to sonic-storagemond/tests/mocked_libs/swsscommon/swsscommon.py
diff --git a/sonic-stormond/tests/test_DaemonStorage.py b/sonic-storagemond/tests/test_DaemonStorage.py
similarity index 100%
rename from sonic-stormond/tests/test_DaemonStorage.py
rename to sonic-storagemond/tests/test_DaemonStorage.py
diff --git a/sonic-stormond/tests/test_StorageDevice.py b/sonic-storagemond/tests/test_StorageDevice.py
similarity index 100%
rename from sonic-stormond/tests/test_StorageDevice.py
rename to sonic-storagemond/tests/test_StorageDevice.py