diff --git a/setup.cfg b/setup.cfg
index c4bc96ab9..e46c980c1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -97,7 +97,7 @@ openstack.tripleoclient.v2 =
     overcloud_update_converge= tripleoclient.v1.overcloud_update:UpdateConverge
     overcloud_upgrade_prepare = tripleoclient.v1.overcloud_upgrade:UpgradePrepare
     overcloud_upgrade_run = tripleoclient.v1.overcloud_upgrade:UpgradeRun
-    overcloud_upgrade_converge = tripleoclient.v1.overcloud_upgrade:UpgradeConvergeOvercloud
+    overcloud_upgrade_converge = tripleoclient.v1.overcloud_upgrade:UpgradeConverge
     overcloud_external-update_run = tripleoclient.v1.overcloud_external_update:ExternalUpdateRun
     overcloud_external-upgrade_run = tripleoclient.v1.overcloud_external_upgrade:ExternalUpgradeRun
     overcloud_generate_fencing = tripleoclient.v1.overcloud_parameters:GenerateFencingParameters
diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py
index dd713bfcb..8ea431559 100644
--- a/tripleoclient/v1/overcloud_upgrade.py
+++ b/tripleoclient/v1/overcloud_upgrade.py
@@ -262,7 +262,7 @@ class UpgradeRun(command.Command):
         self.log.info("Completed Overcloud Major Upgrade Run.")
 
 
-class UpgradeConvergeOvercloud(UpgradePrepare):
+class UpgradeConverge(UpgradePrepare):
     """Major upgrade converge - reset Heat resources in the stored plan
 
        This is the last step for completion of a overcloud major
@@ -277,4 +277,4 @@ class UpgradeConvergeOvercloud(UpgradePrepare):
 
     forbidden_params = constants.UPGRADE_CONVERGE_FORBIDDEN_PARAMS
 
-    log = logging.getLogger(__name__ + ".UpgradeConvergeOvercloud")
+    log = logging.getLogger(__name__ + ".UpgradeConverge")