diff --git a/cinder/opts.py b/cinder/opts.py
index dbf69985509..aae7e7c146d 100644
--- a/cinder/opts.py
+++ b/cinder/opts.py
@@ -93,8 +93,8 @@ from cinder.volume.drivers.dell_emc import xtremio as \
     cinder_volume_drivers_dell_emc_xtremio
 from cinder.volume.drivers import drbdmanagedrv as \
     cinder_volume_drivers_drbdmanagedrv
-from cinder.volume.drivers.fujitsu import eternus_dx_common as \
-    cinder_volume_drivers_fujitsu_eternusdxcommon
+from cinder.volume.drivers.fujitsu.eternus_dx import eternus_dx_common as \
+    cinder_volume_drivers_fujitsu_eternus_dx_eternusdxcommon
 from cinder.volume.drivers.fusionstorage import dsware as \
     cinder_volume_drivers_fusionstorage_dsware
 from cinder.volume.drivers.hpe import hpe_3par_common as \
@@ -294,7 +294,7 @@ def list_opts():
                 cinder_volume_drivers_dell_emc_vnx_common.VNX_OPTS,
                 cinder_volume_drivers_dell_emc_xtremio.XTREMIO_OPTS,
                 cinder_volume_drivers_drbdmanagedrv.drbd_opts,
-                cinder_volume_drivers_fujitsu_eternusdxcommon.
+                cinder_volume_drivers_fujitsu_eternus_dx_eternusdxcommon.
                 FJ_ETERNUS_DX_OPT_opts,
                 cinder_volume_drivers_hpe_hpe3parcommon.hpe3par_opts,
                 cinder_volume_drivers_hpe_hpelefthandiscsi.hpelefthand_opts,
diff --git a/cinder/tests/unit/volume/drivers/test_fujitsu.py b/cinder/tests/unit/volume/drivers/test_fujitsu_dx.py
similarity index 99%
rename from cinder/tests/unit/volume/drivers/test_fujitsu.py
rename to cinder/tests/unit/volume/drivers/test_fujitsu_dx.py
index 0471953a29d..858ca45dce2 100644
--- a/cinder/tests/unit/volume/drivers/test_fujitsu.py
+++ b/cinder/tests/unit/volume/drivers/test_fujitsu_dx.py
@@ -25,9 +25,12 @@ from cinder import test
 from cinder.volume import configuration as conf
 
 with mock.patch.dict('sys.modules', pywbem=mock.Mock()):
-    from cinder.volume.drivers.fujitsu import eternus_dx_common as dx_common
-    from cinder.volume.drivers.fujitsu import eternus_dx_fc as dx_fc
-    from cinder.volume.drivers.fujitsu import eternus_dx_iscsi as dx_iscsi
+    from cinder.volume.drivers.fujitsu.eternus_dx \
+        import eternus_dx_common as dx_common
+    from cinder.volume.drivers.fujitsu.eternus_dx \
+        import eternus_dx_fc as dx_fc
+    from cinder.volume.drivers.fujitsu.eternus_dx \
+        import eternus_dx_iscsi as dx_iscsi
 
 CONFIG_FILE_NAME = 'cinder_fujitsu_eternus_dx.xml'
 STORAGE_SYSTEM = '172.16.0.2'
diff --git a/cinder/volume/drivers/fujitsu/eternus_dx/__init__.py b/cinder/volume/drivers/fujitsu/eternus_dx/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/cinder/volume/drivers/fujitsu/eternus_dx_common.py b/cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_common.py
similarity index 100%
rename from cinder/volume/drivers/fujitsu/eternus_dx_common.py
rename to cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_common.py
diff --git a/cinder/volume/drivers/fujitsu/eternus_dx_fc.py b/cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_fc.py
similarity index 99%
rename from cinder/volume/drivers/fujitsu/eternus_dx_fc.py
rename to cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_fc.py
index 9d97c8c2f51..4f8c362d2b5 100644
--- a/cinder/volume/drivers/fujitsu/eternus_dx_fc.py
+++ b/cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_fc.py
@@ -24,7 +24,7 @@ import six
 
 from cinder import interface
 from cinder.volume import driver
-from cinder.volume.drivers.fujitsu import eternus_dx_common
+from cinder.volume.drivers.fujitsu.eternus_dx import eternus_dx_common
 from cinder.zonemanager import utils as fczm_utils
 
 LOG = logging.getLogger(__name__)
diff --git a/cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py b/cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_iscsi.py
similarity index 99%
rename from cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py
rename to cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_iscsi.py
index 5624341422f..e13c7b710ce 100644
--- a/cinder/volume/drivers/fujitsu/eternus_dx_iscsi.py
+++ b/cinder/volume/drivers/fujitsu/eternus_dx/eternus_dx_iscsi.py
@@ -23,7 +23,7 @@ import six
 
 from cinder import interface
 from cinder.volume import driver
-from cinder.volume.drivers.fujitsu import eternus_dx_common
+from cinder.volume.drivers.fujitsu.eternus_dx import eternus_dx_common
 from oslo_log import log as logging
 
 LOG = logging.getLogger(__name__)
diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py
index 091e49f4442..5dd666e48b7 100644
--- a/cinder/volume/manager.py
+++ b/cinder/volume/manager.py
@@ -177,6 +177,10 @@ MAPPING = {
     'cinder.volume.drivers.dell_emc.powermax.iscsi.PowerMaxISCSIDriver',
     'cinder.volume.drivers.dell_emc.vmax.fc.VMAXFCDriver':
     'cinder.volume.drivers.dell_emc.powermax.fc.PowerMaxFCDriver',
+    'cinder.volume.drivers.fujitsu.eternus_dx_fc.FJDXFCDriver':
+    'cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_fc.FJDXFCDriver',
+    'cinder.volume.drivers.fujitsu.eternus_dx_iscsi.FJDXISCSIDriver':
+    'cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_iscsi.FJDXISCSIDriver'
 }
 
 
diff --git a/doc/source/configuration/block-storage/drivers/fujitsu-eternus-dx-driver.rst b/doc/source/configuration/block-storage/drivers/fujitsu-eternus-dx-driver.rst
index db1e6a46839..dbc4b733af2 100644
--- a/doc/source/configuration/block-storage/drivers/fujitsu-eternus-dx-driver.rst
+++ b/doc/source/configuration/block-storage/drivers/fujitsu-eternus-dx-driver.rst
@@ -101,14 +101,14 @@ Configuration
 
    .. code-block:: ini
 
-      volume_driver = cinder.volume.drivers.fujitsu.eternus_dx_fc.FJDXFCDriver
+      volume_driver = cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_fc.FJDXFCDriver
       cinder_eternus_config_file = /etc/cinder/eternus_dx.xml
 
    iSCSI entries:
 
    .. code-block:: ini
 
-      volume_driver = cinder.volume.drivers.fujitsu.eternus_dx_iscsi.FJDXISCSIDriver
+      volume_driver = cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_iscsi.FJDXISCSIDriver
       cinder_eternus_config_file = /etc/cinder/eternus_dx.xml
 
    If there is no description about ``cinder_eternus_config_file``,
@@ -200,12 +200,12 @@ Configuration example
       enabled_backends = DXFC, DXISCSI
 
       [DXFC]
-      volume_driver = cinder.volume.drivers.fujitsu.eternus_dx_fc.FJDXFCDriver
+      volume_driver = cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_fc.FJDXFCDriver
       cinder_eternus_config_file = /etc/cinder/fc.xml
       volume_backend_name = FC
 
       [DXISCSI]
-      volume_driver = cinder.volume.drivers.fujitsu.eternus_dx_iscsi.FJDXISCSIDriver
+      volume_driver = cinder.volume.drivers.fujitsu.eternus_dx.eternus_dx_iscsi.FJDXISCSIDriver
       cinder_eternus_config_file = /etc/cinder/iscsi.xml
       volume_backend_name = ISCSI
 
diff --git a/releasenotes/notes/fujitsu-eternus-dx-update-4755ec446030d263.yaml b/releasenotes/notes/fujitsu-eternus-dx-update-4755ec446030d263.yaml
new file mode 100644
index 00000000000..f5ef4f41926
--- /dev/null
+++ b/releasenotes/notes/fujitsu-eternus-dx-update-4755ec446030d263.yaml
@@ -0,0 +1,8 @@
+---
+upgrade:
+  - The Fujitsu DX driver names have been updated to distinguish
+    them from other Fujitsu storage. The module path
+    ``cinder.volume.drivers.fujitsu`` should now be updated to
+    ``cinder.volume.drivers.fujitsu.eternus_dx`` in ``cinder.conf``.
+    Support for the previous driver naming will continue to work,
+    but will be removed in a future release.