diff --git a/docs/docsite/rst/porting_guides/porting_guide_2.7.rst b/docs/docsite/rst/porting_guides/porting_guide_2.7.rst
index a6001f322c..05dde1a591 100644
--- a/docs/docsite/rst/porting_guides/porting_guide_2.7.rst
+++ b/docs/docsite/rst/porting_guides/porting_guide_2.7.rst
@@ -170,6 +170,11 @@ The following modules will be removed in Ansible 2.11. Please update your playbo
 * ``na_cdot_user`` use :ref:`na_ontap_user <na_ontap_user_module>` instead.
 * ``na_cdot_user_role`` use :ref:`na_ontap_user_role <na_ontap_user_role_module>` instead.
 * ``na_cdot_volume`` use :ref:`na_ontap_volume <na_ontap_volume_module>` instead.
+* ``sf_account_manager`` use :ref:`na_elementsw_account<na_elementsw_account_module>` instead.
+* ``sf_check_connections`` use :ref:`na_elementsw_check_connections<na_elementsw_check_connections_module>` instead.
+* ``sf_snapshot_schedule_manager`` use :ref:`na_elementsw_snapshot_schedule<na_elementsw_snapshot_schedule_module>` instead.
+* ``sf_volume_access_group_manager`` use :ref:`na_elementsw_access_group<na_elementsw_access_group_module>` instead.
+* ``sf_volume_manager`` use :ref:`na_elementsw_volume<na_elementsw_volume_module>` instead.
 
 Noteworthy module changes
 -------------------------
diff --git a/lib/ansible/modules/storage/netapp/sf_account_manager.py b/lib/ansible/modules/storage/netapp/_sf_account_manager.py
similarity index 98%
rename from lib/ansible/modules/storage/netapp/sf_account_manager.py
rename to lib/ansible/modules/storage/netapp/_sf_account_manager.py
index 5d75ea5528..b512dffd04 100644
--- a/lib/ansible/modules/storage/netapp/sf_account_manager.py
+++ b/lib/ansible/modules/storage/netapp/_sf_account_manager.py
@@ -8,14 +8,17 @@ __metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
+                    'status': ['deprecated'],
                     'supported_by': 'community'}
 
 
 DOCUMENTATION = '''
 
 module: sf_account_manager
-
+deprecated:
+  removed_in: "2.11"
+  why: This Module has been replaced
+  alternative: please use M(na_elementsw_account)
 short_description: Manage SolidFire accounts
 extends_documentation_fragment:
     - netapp.solidfire
diff --git a/lib/ansible/modules/storage/netapp/sf_check_connections.py b/lib/ansible/modules/storage/netapp/_sf_check_connections.py
similarity index 96%
rename from lib/ansible/modules/storage/netapp/sf_check_connections.py
rename to lib/ansible/modules/storage/netapp/_sf_check_connections.py
index 093bf38276..b3a17fe45a 100644
--- a/lib/ansible/modules/storage/netapp/sf_check_connections.py
+++ b/lib/ansible/modules/storage/netapp/_sf_check_connections.py
@@ -8,14 +8,17 @@ __metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
+                    'status': ['deprecated'],
                     'supported_by': 'community'}
 
 
 DOCUMENTATION = '''
 
 module: sf_check_connections
-
+deprecated:
+  removed_in: "2.11"
+  why: This Module has been replaced
+  alternative: please use M(na_elementsw_check_connections)
 short_description: Check connectivity to MVIP and SVIP.
 extends_documentation_fragment:
     - netapp.solidfire
diff --git a/lib/ansible/modules/storage/netapp/sf_snapshot_schedule_manager.py b/lib/ansible/modules/storage/netapp/_sf_snapshot_schedule_manager.py
similarity index 98%
rename from lib/ansible/modules/storage/netapp/sf_snapshot_schedule_manager.py
rename to lib/ansible/modules/storage/netapp/_sf_snapshot_schedule_manager.py
index a73eeaae5c..9e7a309696 100644
--- a/lib/ansible/modules/storage/netapp/sf_snapshot_schedule_manager.py
+++ b/lib/ansible/modules/storage/netapp/_sf_snapshot_schedule_manager.py
@@ -7,14 +7,17 @@ __metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
+                    'status': ['deprecated'],
                     'supported_by': 'community'}
 
 
 DOCUMENTATION = '''
 
 module: sf_snapshot_schedule_manager
-
+deprecated:
+  removed_in: "2.11"
+  why: This Module has been replaced
+  alternative: please use M(na_elementsw_snapshot_schedule)
 short_description: Manage SolidFire snapshot schedules
 extends_documentation_fragment:
     - netapp.solidfire
diff --git a/lib/ansible/modules/storage/netapp/sf_volume_access_group_manager.py b/lib/ansible/modules/storage/netapp/_sf_volume_access_group_manager.py
similarity index 98%
rename from lib/ansible/modules/storage/netapp/sf_volume_access_group_manager.py
rename to lib/ansible/modules/storage/netapp/_sf_volume_access_group_manager.py
index 4f4da5edfd..a12d893371 100644
--- a/lib/ansible/modules/storage/netapp/sf_volume_access_group_manager.py
+++ b/lib/ansible/modules/storage/netapp/_sf_volume_access_group_manager.py
@@ -8,14 +8,17 @@ __metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
+                    'status': ['deprecated'],
                     'supported_by': 'community'}
 
 
 DOCUMENTATION = '''
 
 module: sf_volume_access_group_manager
-
+deprecated:
+  removed_in: "2.11"
+  why: This Module has been replaced
+  alternative: please use M(na_elementsw_access_group)
 short_description: Manage SolidFire Volume Access Groups
 extends_documentation_fragment:
     - netapp.solidfire
diff --git a/lib/ansible/modules/storage/netapp/sf_volume_manager.py b/lib/ansible/modules/storage/netapp/_sf_volume_manager.py
similarity index 98%
rename from lib/ansible/modules/storage/netapp/sf_volume_manager.py
rename to lib/ansible/modules/storage/netapp/_sf_volume_manager.py
index 14f4567c12..306c1f9794 100644
--- a/lib/ansible/modules/storage/netapp/sf_volume_manager.py
+++ b/lib/ansible/modules/storage/netapp/_sf_volume_manager.py
@@ -8,14 +8,17 @@ __metaclass__ = type
 
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
+                    'status': ['deprecated'],
                     'supported_by': 'community'}
 
 
 DOCUMENTATION = '''
 
 module: sf_volume_manager
-
+deprecated:
+  removed_in: "2.11"
+  why: This Module has been replaced
+  alternative: please use M(na_elementsw_volume)
 short_description: Manage SolidFire volumes
 extends_documentation_fragment:
     - netapp.solidfire
diff --git a/test/sanity/validate-modules/ignore.txt b/test/sanity/validate-modules/ignore.txt
index d129a92d11..176c9c05e6 100644
--- a/test/sanity/validate-modules/ignore.txt
+++ b/test/sanity/validate-modules/ignore.txt
@@ -1090,9 +1090,9 @@ lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py E323
 lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py E324
 lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py E325
 lib/ansible/modules/storage/netapp/netapp_e_volume_copy.py E326
-lib/ansible/modules/storage/netapp/sf_snapshot_schedule_manager.py E325
-lib/ansible/modules/storage/netapp/sf_volume_manager.py E322
-lib/ansible/modules/storage/netapp/sf_volume_manager.py E325
+lib/ansible/modules/storage/netapp/_sf_snapshot_schedule_manager.py E325
+lib/ansible/modules/storage/netapp/_sf_volume_manager.py E322
+lib/ansible/modules/storage/netapp/_sf_volume_manager.py E325
 lib/ansible/modules/storage/purestorage/purefb_fs.py E324
 lib/ansible/modules/storage/zfs/zfs.py E322
 lib/ansible/modules/storage/zfs/zfs.py E323