diff --git a/setup.cfg b/setup.cfg
index 88218b410..c043676b9 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -98,7 +98,7 @@ openstack.tripleoclient.v1 =
     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_execute = tripleoclient.v1.overcloud_execute:RemoteExecute
diff --git a/tripleoclient/v1/overcloud_upgrade.py b/tripleoclient/v1/overcloud_upgrade.py
index 864a1fe7e..8b617263c 100644
--- a/tripleoclient/v1/overcloud_upgrade.py
+++ b/tripleoclient/v1/overcloud_upgrade.py
@@ -276,7 +276,7 @@ class UpgradeRun(command.Command):
                        "playbooks {1} ").format(limit_hosts, playbooks))
 
 
-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
@@ -291,4 +291,4 @@ class UpgradeConvergeOvercloud(UpgradePrepare):
 
     forbidden_params = constants.UPGRADE_CONVERGE_FORBIDDEN_PARAMS
 
-    log = logging.getLogger(__name__ + ".UpgradeConvergeOvercloud")
+    log = logging.getLogger(__name__ + ".UpgradeConverge")