diff --git a/cinder/tests/fake_driver.py b/cinder/tests/fake_driver.py
index 35bda120c1a..6de5abb86cf 100644
--- a/cinder/tests/fake_driver.py
+++ b/cinder/tests/fake_driver.py
@@ -163,7 +163,7 @@ class FakeISERDriver(FakeLoggingVolumeDriver):
 
 class FakeFibreChannelDriver(driver.FibreChannelDriver):
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         return {
             'driver_volume_type': 'fibre_channel',
@@ -171,7 +171,7 @@ class FakeFibreChannelDriver(driver.FibreChannelDriver):
                 'initiator_target_map': {'fake_wwn': ['fake_wwn2']},
             }}
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def no_zone_initialize_connection(self, volume, connector):
         """This shouldn't call the ZM."""
         return {
@@ -180,7 +180,7 @@ class FakeFibreChannelDriver(driver.FibreChannelDriver):
                 'initiator_target_map': {'fake_wwn': ['fake_wwn2']},
             }}
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         return {
             'driver_volume_type': 'fibre_channel',
@@ -188,7 +188,7 @@ class FakeFibreChannelDriver(driver.FibreChannelDriver):
                 'initiator_target_map': {'fake_wwn': ['fake_wwn2']},
             }}
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def no_zone_terminate_connection(self, volume, connector, **kwargs):
         return {
             'driver_volume_type': 'bogus',
diff --git a/cinder/volume/drivers/coprhd/fc.py b/cinder/volume/drivers/coprhd/fc.py
index bd16e018676..031f2517ad5 100644
--- a/cinder/volume/drivers/coprhd/fc.py
+++ b/cinder/volume/drivers/coprhd/fc.py
@@ -118,7 +118,7 @@ class EMCCoprHDFCDriver(driver.FibreChannelDriver):
         """Make sure volume is exported."""
         pass
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Initializes the connection and returns connection info."""
 
@@ -157,7 +157,7 @@ class EMCCoprHDFCDriver(driver.FibreChannelDriver):
             'data': properties,
         }
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Driver entry point to detach a volume from an instance."""
 
diff --git a/cinder/volume/drivers/dell/dell_storagecenter_fc.py b/cinder/volume/drivers/dell/dell_storagecenter_fc.py
index f5fecbfd150..c4748c1d04d 100644
--- a/cinder/volume/drivers/dell/dell_storagecenter_fc.py
+++ b/cinder/volume/drivers/dell/dell_storagecenter_fc.py
@@ -69,7 +69,7 @@ class DellStorageCenterFCDriver(dell_storagecenter_common.DellCommonDriver,
             self.configuration.safe_get('volume_backend_name') or 'Dell-FC'
         self.storage_protocol = 'FC'
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Initializes the connection and returns connection info.
 
@@ -188,7 +188,7 @@ class DellStorageCenterFCDriver(dell_storagecenter_common.DellCommonDriver,
                      'wwns': wwns})
         return None, [], {}
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, force=False, **kwargs):
         # Get our volume name
         volume_name = volume.get('id')
diff --git a/cinder/volume/drivers/dell_emc/unity/driver.py b/cinder/volume/drivers/dell_emc/unity/driver.py
index 3fcf7ab4e99..fd91ca9ba0b 100644
--- a/cinder/volume/drivers/dell_emc/unity/driver.py
+++ b/cinder/volume/drivers/dell_emc/unity/driver.py
@@ -117,7 +117,7 @@ class UnityDriver(driver.TransferVD,
         """Make sure volume is exported."""
         pass
 
-    @zm_utils.AddFCZone
+    @zm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Initializes the connection and returns connection info.
 
@@ -165,7 +165,7 @@ class UnityDriver(driver.TransferVD,
                   {'conn_info': conn_info})
         return conn_info
 
-    @zm_utils.RemoveFCZone
+    @zm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Disallow connection from connector."""
         LOG.debug("Entering terminate_connection"
diff --git a/cinder/volume/drivers/dell_emc/vnx/driver.py b/cinder/volume/drivers/dell_emc/vnx/driver.py
index 55c3a4af7cc..3b697152244 100644
--- a/cinder/volume/drivers/dell_emc/vnx/driver.py
+++ b/cinder/volume/drivers/dell_emc/vnx/driver.py
@@ -152,7 +152,7 @@ class VNXDriver(driver.TransferVD,
         """Make sure volume is exported."""
         pass
 
-    @zm_utils.AddFCZone
+    @zm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Initializes the connection and returns connection info.
 
@@ -200,7 +200,7 @@ class VNXDriver(driver.TransferVD,
                   {'conn_info': conn_info})
         return conn_info
 
-    @zm_utils.RemoveFCZone
+    @zm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Disallow connection from connector."""
         LOG.debug("Entering terminate_connection"
diff --git a/cinder/volume/drivers/dell_emc/xtremio.py b/cinder/volume/drivers/dell_emc/xtremio.py
index 60dc38285e8..c60095c2845 100644
--- a/cinder/volume/drivers/dell_emc/xtremio.py
+++ b/cinder/volume/drivers/dell_emc/xtremio.py
@@ -987,7 +987,7 @@ class XtremIOFCDriver(XtremIOVolumeDriver,
         seq = range(len(uniq_luns) + 1)
         return min(set(seq) - uniq_luns)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         wwpns = self._get_initiator_names(connector)
         ig_name = self._get_ig_name(connector)
@@ -1028,7 +1028,7 @@ class XtremIOFCDriver(XtremIOVolumeDriver,
                     'target_wwn': self.get_targets(),
                     'initiator_target_map': i_t_map}}
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         (super(XtremIOFCDriver, self)
          .terminate_connection(volume, connector, **kwargs))
diff --git a/cinder/volume/drivers/dothill/dothill_fc.py b/cinder/volume/drivers/dothill/dothill_fc.py
index 81ca1168a9f..04bd300963f 100644
--- a/cinder/volume/drivers/dothill/dothill_fc.py
+++ b/cinder/volume/drivers/dothill/dothill_fc.py
@@ -82,7 +82,7 @@ class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver):
     def delete_volume(self, volume):
         self.common.delete_volume(volume)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         self.common.client_login()
         try:
@@ -101,7 +101,7 @@ class DotHillFCDriver(cinder.volume.driver.FibreChannelDriver):
         finally:
             self.common.client_logout()
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         self.common.unmap_volume(volume, connector, 'wwpns')
         info = {'driver_volume_type': 'fibre_channel', 'data': {}}
diff --git a/cinder/volume/drivers/emc/emc_vmax_fc.py b/cinder/volume/drivers/emc/emc_vmax_fc.py
index e58f396d74b..b6633657720 100644
--- a/cinder/volume/drivers/emc/emc_vmax_fc.py
+++ b/cinder/volume/drivers/emc/emc_vmax_fc.py
@@ -155,7 +155,7 @@ class EMCVMAXFCDriver(driver.FibreChannelDriver):
         """Make sure volume is exported."""
         pass
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Initializes the connection and returns connection info.
 
@@ -217,7 +217,7 @@ class EMCVMAXFCDriver(driver.FibreChannelDriver):
 
         return data
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Disallow connection from connector.
 
diff --git a/cinder/volume/drivers/falconstor/fc.py b/cinder/volume/drivers/falconstor/fc.py
index e79cb32c99d..3b2a6b5ae4e 100644
--- a/cinder/volume/drivers/falconstor/fc.py
+++ b/cinder/volume/drivers/falconstor/fc.py
@@ -75,7 +75,7 @@ class FSSFCDriver(fss_common.FalconstorBaseDriver,
                           'information.'))
             raise exception.InvalidConnectorException(missing='wwpns')
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         fss_hosts = []
         fss_hosts.append(self.configuration.san_ip)
@@ -99,7 +99,7 @@ class FSSFCDriver(fss_common.FalconstorBaseDriver,
         init_targ_map = dict.fromkeys(initiator_wwns, self.gateway_fc_wwns)
         return init_targ_map
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         host_id = self.proxy.fc_terminate_connection(volume, connector)
         fc_info = {"driver_volume_type": "fibre_channel", "data": {}}
diff --git a/cinder/volume/drivers/fujitsu/eternus_dx_fc.py b/cinder/volume/drivers/fujitsu/eternus_dx_fc.py
index 722d892aec8..265dd8239d5 100644
--- a/cinder/volume/drivers/fujitsu/eternus_dx_fc.py
+++ b/cinder/volume/drivers/fujitsu/eternus_dx_fc.py
@@ -142,7 +142,7 @@ class FJDXFCDriver(driver.FibreChannelDriver):
         """Driver entry point to remove an export for a volume."""
         return
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Allow connection to connector and return connection info."""
         LOG.debug('initialize_connection, volume id: %(vid)s, '
@@ -161,7 +161,7 @@ class FJDXFCDriver(driver.FibreChannelDriver):
                   'info: %s, exit method.', info)
         return info
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Disallow connection from connector."""
         LOG.debug('terminate_connection, volume id: %(vid)s, '
diff --git a/cinder/volume/drivers/hitachi/hbsd_fc.py b/cinder/volume/drivers/hitachi/hbsd_fc.py
index b4d07b6fca4..d6a3e5417e0 100644
--- a/cinder/volume/drivers/hitachi/hbsd_fc.py
+++ b/cinder/volume/drivers/hitachi/hbsd_fc.py
@@ -409,7 +409,7 @@ class HBSDFCDriver(cinder.volume.driver.FibreChannelDriver):
 
         return hostgroups
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         self.do_setup_status.wait()
         ldev = self.common.get_ldev(volume)
@@ -437,7 +437,7 @@ class HBSDFCDriver(cinder.volume.driver.FibreChannelDriver):
         self._delete_lun(hostgroups, ldev)
         LOG.debug("*** _terminate_ ***")
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         self.do_setup_status.wait()
         ldev = self.common.get_ldev(volume)
diff --git a/cinder/volume/drivers/hitachi/vsp_horcm_fc.py b/cinder/volume/drivers/hitachi/vsp_horcm_fc.py
index fb9e6443661..3de32122508 100644
--- a/cinder/volume/drivers/hitachi/vsp_horcm_fc.py
+++ b/cinder/volume/drivers/hitachi/vsp_horcm_fc.py
@@ -163,7 +163,7 @@ class VSPHORCMFC(horcm.VSPHORCM):
 
         return nr_not_found
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Initialize connection between the server and the volume."""
         conn_info = super(VSPHORCMFC, self).initialize_connection(
@@ -172,7 +172,7 @@ class VSPHORCMFC(horcm.VSPHORCM):
             utils.update_conn_info(conn_info, connector, self._lookup_service)
         return conn_info
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector):
         """Terminate connection between the server and the volume."""
         conn_info = super(VSPHORCMFC, self).terminate_connection(
diff --git a/cinder/volume/drivers/hpe/hpe_3par_fc.py b/cinder/volume/drivers/hpe/hpe_3par_fc.py
index c53b0c1e9a9..d3738a702b8 100644
--- a/cinder/volume/drivers/hpe/hpe_3par_fc.py
+++ b/cinder/volume/drivers/hpe/hpe_3par_fc.py
@@ -243,7 +243,7 @@ class HPE3PARFCDriver(driver.TransferVD,
             self._logout(common)
 
     @utils.trace
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Assigns the volume to a server.
 
@@ -366,7 +366,7 @@ class HPE3PARFCDriver(driver.TransferVD,
             self._logout(common)
 
     @utils.trace
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Driver entry point to unattach a volume from an instance."""
         common = self._login()
diff --git a/cinder/volume/drivers/hpe/hpe_xp_fc.py b/cinder/volume/drivers/hpe/hpe_xp_fc.py
index c8f5495b1d6..a9d974a63f0 100644
--- a/cinder/volume/drivers/hpe/hpe_xp_fc.py
+++ b/cinder/volume/drivers/hpe/hpe_xp_fc.py
@@ -162,13 +162,13 @@ class HPEXPFCDriver(driver.FibreChannelDriver):
         pass
 
     @utils.trace
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Attach the volume to an instance."""
         return self.common.initialize_connection(volume, connector)
 
     @utils.trace
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Detach a volume from an instance."""
         return self.common.terminate_connection(volume, connector, **kwargs)
diff --git a/cinder/volume/drivers/huawei/huawei_driver.py b/cinder/volume/drivers/huawei/huawei_driver.py
index 7248b59f23d..2d4a1fc6f80 100644
--- a/cinder/volume/drivers/huawei/huawei_driver.py
+++ b/cinder/volume/drivers/huawei/huawei_driver.py
@@ -2111,7 +2111,7 @@ class HuaweiFCDriver(HuaweiBaseDriver, driver.FibreChannelDriver):
         return data
 
     @utils.synchronized('huawei', external=True)
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         lun_id, lun_type = self.get_lun_id_and_type(volume)
         wwns = connector['wwpns']
@@ -2252,7 +2252,7 @@ class HuaweiFCDriver(HuaweiBaseDriver, driver.FibreChannelDriver):
         return same_host_id
 
     @utils.synchronized('huawei', external=True)
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Delete map between a volume and a host."""
         lun_id, lun_type = self.get_lun_id_and_type(volume)
diff --git a/cinder/volume/drivers/ibm/flashsystem_fc.py b/cinder/volume/drivers/ibm/flashsystem_fc.py
index c0038035a44..fc8a4550774 100644
--- a/cinder/volume/drivers/ibm/flashsystem_fc.py
+++ b/cinder/volume/drivers/ibm/flashsystem_fc.py
@@ -258,7 +258,7 @@ class FlashSystemFCDriver(fscommon.FlashSystemDriver):
 
         return {'driver_volume_type': type_str, 'data': properties}
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     @utils.synchronized('flashsystem-init-conn', external=True)
     def initialize_connection(self, volume, connector):
         """Perform work so that an FC connection can be made.
@@ -317,7 +317,7 @@ class FlashSystemFCDriver(fscommon.FlashSystemDriver):
 
         return properties
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     @utils.synchronized('flashsystem-term-conn', external=True)
     def terminate_connection(self, volume, connector, **kwargs):
         """Cleanup after connection has been terminated.
diff --git a/cinder/volume/drivers/ibm/ibm_storage.py b/cinder/volume/drivers/ibm/ibm_storage.py
index ceb8f52f10c..1a6e278db06 100644
--- a/cinder/volume/drivers/ibm/ibm_storage.py
+++ b/cinder/volume/drivers/ibm/ibm_storage.py
@@ -137,13 +137,13 @@ class IBMStorageDriver(san.SanDriver,
 
         return self.proxy.remove_export(context, volume)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Map the created volume."""
 
         return self.proxy.initialize_connection(volume, connector)
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Terminate a connection to a volume."""
 
diff --git a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_fc.py b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_fc.py
index 95e6befa0a6..60bd839541d 100644
--- a/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_fc.py
+++ b/cinder/volume/drivers/ibm/storwize_svc/storwize_svc_fc.py
@@ -109,7 +109,7 @@ class StorwizeSVCFCDriver(storwize_common.StorwizeSVCCommonDriver):
             raise exception.InvalidConnectorException(
                 missing='wwpns')
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Perform necessary work to make a FC connection."""
         @utils.synchronized('storwize-host' + self._state['system_id'] +
@@ -233,7 +233,7 @@ class StorwizeSVCFCDriver(storwize_common.StorwizeSVCCommonDriver):
 
         return i_t_map
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Cleanup after an FC connection has been terminated."""
         # If a fake connector is generated by nova when the host
diff --git a/cinder/volume/drivers/infinidat.py b/cinder/volume/drivers/infinidat.py
index fb41d300435..b2f1811a4a8 100644
--- a/cinder/volume/drivers/infinidat.py
+++ b/cinder/volume/drivers/infinidat.py
@@ -199,7 +199,7 @@ class InfiniboxVolumeDriver(san.SanDriver,
                    and port['state'] == 'OK'):
                     yield self._cleanup_wwpn(port['wwpn'])
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Map an InfiniBox volume to the host"""
         volume_name = self._make_volume_name(volume)
@@ -220,7 +220,7 @@ class InfiniboxVolumeDriver(san.SanDriver,
                               target_lun=lun,
                               initiator_target_map=init_target_map))
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Unmap an InfiniBox volume from the host"""
         volume_id = self._get_infinidat_volume_id(volume)
diff --git a/cinder/volume/drivers/infortrend/infortrend_fc_cli.py b/cinder/volume/drivers/infortrend/infortrend_fc_cli.py
index 2dfa320f805..cae0fa2e412 100644
--- a/cinder/volume/drivers/infortrend/infortrend_fc_cli.py
+++ b/cinder/volume/drivers/infortrend/infortrend_fc_cli.py
@@ -145,7 +145,7 @@ class InfortrendCLIFCDriver(driver.FibreChannelDriver):
         """Removes an export for a volume."""
         pass
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Initializes the connection and returns connection information.
 
@@ -193,7 +193,7 @@ class InfortrendCLIFCDriver(driver.FibreChannelDriver):
                 'initiator': connector['initiator']})
         return self.common.initialize_connection(volume, connector)
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Disallow connection from connector."""
         LOG.debug('terminate_connection volume id=%(volume_id)s', {
diff --git a/cinder/volume/drivers/kaminario/kaminario_fc.py b/cinder/volume/drivers/kaminario/kaminario_fc.py
index e845ddcc1a0..5665362d5b9 100644
--- a/cinder/volume/drivers/kaminario/kaminario_fc.py
+++ b/cinder/volume/drivers/kaminario/kaminario_fc.py
@@ -51,7 +51,7 @@ class KaminarioFCDriver(common.KaminarioCinderDriver):
         self._protocol = 'FC'
         self.lookup_service = fczm_utils.create_lookup_service()
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     @kaminario_logger
     @coordination.synchronized('{self.k2_lock_name}')
     def initialize_connection(self, volume, connector):
@@ -84,7 +84,7 @@ class KaminarioFCDriver(common.KaminarioCinderDriver):
                          "target_wwn": target_wwpns,
                          "initiator_target_map": init_target_map}}
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     @kaminario_logger
     @coordination.synchronized('{self.k2_lock_name}')
     def terminate_connection(self, volume, connector, **kwargs):
diff --git a/cinder/volume/drivers/nec/volume.py b/cinder/volume/drivers/nec/volume.py
index 7da180f8b77..a115cd697bf 100644
--- a/cinder/volume/drivers/nec/volume.py
+++ b/cinder/volume/drivers/nec/volume.py
@@ -67,10 +67,10 @@ class MStorageFCDriver(volume_helper.MStorageDSVDriver,
     def get_volume_stats(self, refresh=False):
         return self.fc_get_volume_stats(refresh)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         return self.fc_initialize_connection(volume, connector)
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         return self.fc_terminate_connection(volume, connector)
diff --git a/cinder/volume/drivers/netapp/dataontap/fc_7mode.py b/cinder/volume/drivers/netapp/dataontap/fc_7mode.py
index bbd5dd92eda..419ab265ee2 100644
--- a/cinder/volume/drivers/netapp/dataontap/fc_7mode.py
+++ b/cinder/volume/drivers/netapp/dataontap/fc_7mode.py
@@ -98,11 +98,11 @@ class NetApp7modeFibreChannelDriver(driver.BaseVD,
     def unmanage(self, volume):
         return self.library.unmanage(volume)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         return self.library.initialize_connection_fc(volume, connector)
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         return self.library.terminate_connection_fc(volume, connector,
                                                     **kwargs)
diff --git a/cinder/volume/drivers/netapp/dataontap/fc_cmode.py b/cinder/volume/drivers/netapp/dataontap/fc_cmode.py
index 14341bc7daa..0aa48bf8b14 100644
--- a/cinder/volume/drivers/netapp/dataontap/fc_cmode.py
+++ b/cinder/volume/drivers/netapp/dataontap/fc_cmode.py
@@ -98,11 +98,11 @@ class NetAppCmodeFibreChannelDriver(driver.BaseVD,
     def unmanage(self, volume):
         return self.library.unmanage(volume)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         return self.library.initialize_connection_fc(volume, connector)
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         return self.library.terminate_connection_fc(volume, connector,
                                                     **kwargs)
diff --git a/cinder/volume/drivers/netapp/eseries/fc_driver.py b/cinder/volume/drivers/netapp/eseries/fc_driver.py
index ce354224096..3804c5f961e 100644
--- a/cinder/volume/drivers/netapp/eseries/fc_driver.py
+++ b/cinder/volume/drivers/netapp/eseries/fc_driver.py
@@ -92,11 +92,11 @@ class NetAppEseriesFibreChannelDriver(driver.BaseVD,
     def unmanage(self, volume):
         return self.library.unmanage(volume)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector, **kwargs):
         return self.library.initialize_connection_fc(volume, connector)
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         return self.library.terminate_connection_fc(volume, connector,
                                                     **kwargs)
diff --git a/cinder/volume/drivers/nimble.py b/cinder/volume/drivers/nimble.py
index 97e7084d65a..2d27381228f 100644
--- a/cinder/volume/drivers/nimble.py
+++ b/cinder/volume/drivers/nimble.py
@@ -836,7 +836,7 @@ class NimbleFCDriver(NimbleBaseVolumeDriver, driver.FibreChannelDriver):
 
         return init_targ_map
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Driver entry point to attach a volume to an instance."""
         LOG.info(_LI('Entering initialize_connection volume=%(vol)s'
@@ -878,7 +878,7 @@ class NimbleFCDriver(NimbleBaseVolumeDriver, driver.FibreChannelDriver):
 
         return data
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Driver entry point to unattach a volume from an instance."""
         LOG.info(_LI('Entering terminate_connection volume=%(vol)s'
diff --git a/cinder/volume/drivers/prophetstor/dpl_fc.py b/cinder/volume/drivers/prophetstor/dpl_fc.py
index b9776585cd9..742f0a443a6 100644
--- a/cinder/volume/drivers/prophetstor/dpl_fc.py
+++ b/cinder/volume/drivers/prophetstor/dpl_fc.py
@@ -218,7 +218,7 @@ class DPLFCDriver(dplcommon.DPLCOMMONDriver,
 
         return init_targ_map
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Allow connection to connector and return connection info."""
         """
@@ -339,7 +339,7 @@ class DPLFCDriver(dplcommon.DPLCOMMONDriver,
         return {'driver_volume_type': 'fibre_channel',
                 'data': properties}
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Disallow connection from connector."""
         """
diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py
index 385e560dd29..634fc655c6a 100644
--- a/cinder/volume/drivers/pure.py
+++ b/cinder/volume/drivers/pure.py
@@ -1774,7 +1774,7 @@ class PureFCDriver(PureBaseVolumeDriver, driver.FibreChannelDriver):
         ports = array.list_ports()
         return [port["wwn"] for port in ports if port["wwn"]]
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     @pure_driver_debug_trace
     def initialize_connection(self, volume, connector):
         """Allow connection to connector and return connection info."""
@@ -1851,7 +1851,7 @@ class PureFCDriver(PureBaseVolumeDriver, driver.FibreChannelDriver):
 
         return init_targ_map
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     @pure_driver_debug_trace
     def terminate_connection(self, volume, connector, **kwargs):
         """Terminate connection."""
diff --git a/cinder/volume/drivers/tegile.py b/cinder/volume/drivers/tegile.py
index b8a125bd8f8..51294f68cd4 100644
--- a/cinder/volume/drivers/tegile.py
+++ b/cinder/volume/drivers/tegile.py
@@ -598,7 +598,7 @@ class TegileFCDriver(TegileIntelliFlashVolumeDriver,
     def do_setup(self, context):
         super(TegileFCDriver, self).do_setup(context)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     @debugger
     def initialize_connection(self, volume, connector):
         """Initializes the connection and returns connection info."""
@@ -631,7 +631,7 @@ class TegileFCDriver(TegileIntelliFlashVolumeDriver,
 
         return connection_data
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     @debugger
     def terminate_connection(self, volume, connector, force=False, **kwargs):
 
diff --git a/cinder/volume/drivers/violin/v7000_fcp.py b/cinder/volume/drivers/violin/v7000_fcp.py
index 7a8fa3a0f7b..38fe59bb449 100644
--- a/cinder/volume/drivers/violin/v7000_fcp.py
+++ b/cinder/volume/drivers/violin/v7000_fcp.py
@@ -135,7 +135,7 @@ class V7000FCPDriver(driver.FibreChannelDriver):
         """Removes an export for a logical volume."""
         pass
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         """Allow connection to connector and return connection info."""
 
@@ -164,7 +164,7 @@ class V7000FCPDriver(driver.FibreChannelDriver):
 
         return {'driver_volume_type': 'fibre_channel', 'data': properties}
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         """Terminates the connection (target<-->initiator)."""
 
diff --git a/cinder/volume/drivers/xio.py b/cinder/volume/drivers/xio.py
index 2c10a1ddf15..1200e8068b3 100644
--- a/cinder/volume/drivers/xio.py
+++ b/cinder/volume/drivers/xio.py
@@ -1571,7 +1571,7 @@ class XIOISEFCDriver(driver.FibreChannelDriver):
     def unmanage(self, volume):
         return self.driver.unmanage(volume)
 
-    @fczm_utils.AddFCZone
+    @fczm_utils.add_fc_zone
     def initialize_connection(self, volume, connector):
         hostname = ''
         if 'host' in connector:
@@ -1589,7 +1589,7 @@ class XIOISEFCDriver(driver.FibreChannelDriver):
         return {'driver_volume_type': 'fibre_channel',
                 'data': data}
 
-    @fczm_utils.RemoveFCZone
+    @fczm_utils.remove_fc_zone
     def terminate_connection(self, volume, connector, **kwargs):
         # now we are ready to tell ISE to delete presentations
         hostname = self.driver.ise_unpresent(volume, connector['wwpns'])
diff --git a/cinder/zonemanager/utils.py b/cinder/zonemanager/utils.py
index 239f9ff5116..6e6b4d9825d 100644
--- a/cinder/zonemanager/utils.py
+++ b/cinder/zonemanager/utils.py
@@ -74,7 +74,7 @@ def get_formatted_wwn(wwn_str):
                          for i in range(0, len(wwn_str), 2)])).lower()
 
 
-def AddFCZone(initialize_connection):
+def add_fc_zone(initialize_connection):
     """Decorator to add a FC Zone."""
 
     def decorator(self, *args, **kwargs):
@@ -89,7 +89,7 @@ def AddFCZone(initialize_connection):
             if 'initiator_target_map' in conn_info['data']:
                 zm = create_zone_manager()
                 if zm:
-                    LOG.debug("AddFCZone connection info: %(conninfo)s.",
+                    LOG.debug("add_fc_zone connection info: %(conninfo)s.",
                               {'conninfo': conn_info})
                     zm.add_connection(conn_info)
 
@@ -98,7 +98,7 @@ def AddFCZone(initialize_connection):
     return decorator
 
 
-def RemoveFCZone(terminate_connection):
+def remove_fc_zone(terminate_connection):
     """Decorator for FC drivers to remove zone."""
 
     def decorator(self, *args, **kwargs):
@@ -113,7 +113,7 @@ def RemoveFCZone(terminate_connection):
             if 'initiator_target_map' in conn_info['data']:
                 zm = create_zone_manager()
                 if zm:
-                    LOG.debug("RemoveFCZone connection info: %(conninfo)s.",
+                    LOG.debug("remove_fc_zone connection info: %(conninfo)s.",
                               {'conninfo': conn_info})
                     zm.delete_connection(conn_info)