You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/01/03 11:12:01 UTC

[cloudstack] branch main updated: Cleanup APIs getCommandName (#7022)

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new a9b49f3ae90 Cleanup APIs getCommandName (#7022)
a9b49f3ae90 is described below

commit a9b49f3ae906da3e310d4a1d96d62f77a547b88d
Author: Eduardo Zanetta <du...@gmail.com>
AuthorDate: Tue Jan 3 08:11:52 2023 -0300

    Cleanup APIs getCommandName (#7022)
    
    Co-authored-by: Eduardo Zanetta <ed...@scclouds.com.br>
---
 .../java/org/apache/cloudstack/api/BaseCmd.java    |  38 ++--
 .../command/admin/account/CreateAccountCmd.java    |   6 -
 .../command/admin/account/DeleteAccountCmd.java    |  10 -
 .../command/admin/account/DisableAccountCmd.java   |   6 -
 .../command/admin/account/EnableAccountCmd.java    |   6 -
 .../api/command/admin/account/LockAccountCmd.java  |   6 -
 .../command/admin/account/UpdateAccountCmd.java    |   6 -
 .../api/command/admin/acl/CreateRoleCmd.java       |   9 +-
 .../command/admin/acl/CreateRolePermissionCmd.java |   9 +-
 .../api/command/admin/acl/DeleteRoleCmd.java       |   8 +-
 .../command/admin/acl/DeleteRolePermissionCmd.java |   8 +-
 .../api/command/admin/acl/ImportRoleCmd.java       |   9 +-
 .../command/admin/acl/ListRolePermissionsCmd.java  |   8 +-
 .../api/command/admin/acl/ListRolesCmd.java        |   8 +-
 .../api/command/admin/acl/UpdateRoleCmd.java       |   8 +-
 .../command/admin/acl/UpdateRolePermissionCmd.java |  10 +-
 .../admin/acl/project/CreateProjectRoleCmd.java    |   8 +-
 .../project/CreateProjectRolePermissionCmd.java    |   8 +-
 .../admin/acl/project/DeleteProjectRoleCmd.java    |   8 +-
 .../project/DeleteProjectRolePermissionCmd.java    |   8 +-
 .../acl/project/ListProjectRolePermissionsCmd.java |   8 +-
 .../admin/acl/project/ListProjectRolesCmd.java     |   8 +-
 .../admin/acl/project/UpdateProjectRoleCmd.java    |   8 +-
 .../project/UpdateProjectRolePermissionCmd.java    |   8 +-
 .../api/command/admin/alert/GenerateAlertCmd.java  |   8 +-
 .../command/admin/annotation/AddAnnotationCmd.java |   8 +-
 .../admin/annotation/ListAnnotationsCmd.java       |  11 +-
 .../admin/annotation/RemoveAnnotationCmd.java      |   8 +-
 .../annotation/UpdateAnnotationVisibilityCmd.java  |   8 +-
 .../command/admin/autoscale/DeleteCounterCmd.java  |   6 -
 .../admin/backup/DeleteBackupOfferingCmd.java      |   8 +-
 .../admin/backup/ImportBackupOfferingCmd.java      |   8 +-
 .../backup/ListBackupProviderOfferingsCmd.java     |   7 +-
 .../admin/backup/ListBackupProvidersCmd.java       |   8 +-
 .../admin/backup/UpdateBackupOfferingCmd.java      |   8 +-
 .../api/command/admin/ca/IssueCertificateCmd.java  |   8 +-
 .../api/command/admin/ca/ListCAProvidersCmd.java   |   8 +-
 .../api/command/admin/ca/ListCaCertificateCmd.java |   8 +-
 .../command/admin/ca/ProvisionCertificateCmd.java  |   9 +-
 .../api/command/admin/ca/RevokeCertificateCmd.java |   8 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |   6 -
 .../command/admin/cluster/DeleteClusterCmd.java    |   6 -
 .../api/command/admin/cluster/ListClustersCmd.java |   6 -
 .../command/admin/cluster/UpdateClusterCmd.java    |   6 -
 .../api/command/admin/config/ListCfgsByCmd.java    |   6 -
 .../admin/config/ListDeploymentPlannersCmd.java    |   6 -
 .../config/ListHypervisorCapabilitiesCmd.java      |   6 -
 .../api/command/admin/config/ResetCfgCmd.java      |   6 -
 .../api/command/admin/config/UpdateCfgCmd.java     |   6 -
 .../config/UpdateHypervisorCapabilitiesCmd.java    |   6 -
 .../admin/diagnostics/GetDiagnosticsDataCmd.java   |   8 +-
 .../admin/diagnostics/RunDiagnosticsCmd.java       |  11 +-
 .../ListTemplateDirectDownloadCertificatesCmd.java |   9 +-
 ...visionTemplateDirectDownloadCertificateCmd.java |   8 +-
 ...RevokeTemplateDirectDownloadCertificateCmd.java |  10 +-
 ...UploadTemplateDirectDownloadCertificateCmd.java | 240 ++++++++++-----------
 .../api/command/admin/domain/CreateDomainCmd.java  |   6 -
 .../api/command/admin/domain/DeleteDomainCmd.java  |   6 -
 .../admin/domain/ListDomainChildrenCmd.java        |   6 -
 .../api/command/admin/domain/UpdateDomainCmd.java  |   6 -
 .../api/command/admin/guest/AddGuestOsCmd.java     |   6 -
 .../command/admin/guest/AddGuestOsMappingCmd.java  |   6 -
 .../command/admin/guest/ListGuestOsMappingCmd.java |   8 +-
 .../api/command/admin/guest/RemoveGuestOsCmd.java  |   6 -
 .../admin/guest/RemoveGuestOsMappingCmd.java       |   6 -
 .../api/command/admin/guest/UpdateGuestOsCmd.java  |   6 -
 .../admin/guest/UpdateGuestOsMappingCmd.java       |   6 -
 .../command/admin/ha/ConfigureHAForHostCmd.java    |   9 +-
 .../command/admin/ha/DisableHAForClusterCmd.java   |   8 +-
 .../api/command/admin/ha/DisableHAForHostCmd.java  |   9 +-
 .../api/command/admin/ha/DisableHAForZoneCmd.java  |   8 +-
 .../command/admin/ha/EnableHAForClusterCmd.java    |   8 +-
 .../api/command/admin/ha/EnableHAForHostCmd.java   |   9 +-
 .../api/command/admin/ha/EnableHAForZoneCmd.java   |   8 +-
 .../command/admin/ha/ListHostHAProvidersCmd.java   |   8 +-
 .../command/admin/ha/ListHostHAResourcesCmd.java   |   8 +-
 .../api/command/admin/host/AddHostCmd.java         |   6 -
 .../command/admin/host/AddSecondaryStorageCmd.java |   6 -
 .../admin/host/CancelHostAsDegradedCmd.java        |   5 -
 .../command/admin/host/CancelMaintenanceCmd.java   |   6 -
 .../admin/host/DeclareHostAsDegradedCmd.java       |   5 -
 .../api/command/admin/host/DeleteHostCmd.java      |   6 -
 .../admin/host/FindHostsForMigrationCmd.java       |   6 -
 .../api/command/admin/host/ListHostTagsCmd.java    |   8 +-
 .../api/command/admin/host/ListHostsCmd.java       |   6 -
 .../admin/host/PrepareForMaintenanceCmd.java       |   6 -
 .../api/command/admin/host/ReconnectHostCmd.java   |   6 -
 .../admin/host/ReleaseHostReservationCmd.java      |   6 -
 .../api/command/admin/host/UpdateHostCmd.java      |   6 -
 .../command/admin/host/UpdateHostPasswordCmd.java  |   6 -
 .../ConfigureInternalLoadBalancerElementCmd.java   |   6 -
 .../CreateInternalLoadBalancerElementCmd.java      |   6 -
 .../ListInternalLoadBalancerElementsCmd.java       |   6 -
 .../api/command/admin/management/ListMgmtsCmd.java |   9 +-
 .../command/admin/network/AddNetworkDeviceCmd.java |   6 -
 .../network/AddNetworkServiceProviderCmd.java      |   6 -
 .../network/CreateGuestNetworkIpv6PrefixCmd.java   |   8 +-
 .../network/CreateManagementNetworkIpRangeCmd.java |   8 +-
 .../admin/network/CreateNetworkOfferingCmd.java    |  10 -
 .../admin/network/CreatePhysicalNetworkCmd.java    |   6 -
 .../network/CreateStorageNetworkIpRangeCmd.java    |   6 -
 .../admin/network/DedicateGuestVlanRangeCmd.java   |   6 -
 .../network/DeleteGuestNetworkIpv6PrefixCmd.java   |   8 +-
 .../network/DeleteManagementNetworkIpRangeCmd.java |  10 +-
 .../admin/network/DeleteNetworkDeviceCmd.java      |   6 -
 .../admin/network/DeleteNetworkOfferingCmd.java    |   6 -
 .../network/DeleteNetworkServiceProviderCmd.java   |   6 -
 .../admin/network/DeletePhysicalNetworkCmd.java    |   6 -
 .../network/DeleteStorageNetworkIpRangeCmd.java    |   6 -
 .../network/ListDedicatedGuestVlanRangesCmd.java   |   6 -
 .../network/ListGuestNetworkIpv6PrefixesCmd.java   |   8 +-
 .../command/admin/network/ListGuestVlansCmd.java   |   8 +-
 .../network/ListNetworkIsolationMethodsCmd.java    |   6 -
 .../network/ListNetworkServiceProvidersCmd.java    |   6 -
 .../admin/network/ListPhysicalNetworksCmd.java     |   6 -
 .../network/ListStorageNetworkIpRangeCmd.java      |   5 -
 .../network/ListSupportedNetworkServicesCmd.java   |   6 -
 .../command/admin/network/MigrateNetworkCmd.java   |   9 +-
 .../api/command/admin/network/MigrateVPCCmd.java   |   9 +-
 .../network/ReleaseDedicatedGuestVlanRangeCmd.java |   6 -
 .../admin/network/UpdateNetworkOfferingCmd.java    |   6 -
 .../network/UpdateNetworkServiceProviderCmd.java   |   6 -
 .../admin/network/UpdatePhysicalNetworkCmd.java    |   6 -
 .../UpdatePodManagementNetworkIpRangeCmd.java      |   8 +-
 .../network/UpdateStorageNetworkIpRangeCmd.java    |   6 -
 .../admin/offering/CreateDiskOfferingCmd.java      |   6 -
 .../admin/offering/CreateServiceOfferingCmd.java   |   6 -
 .../admin/offering/DeleteDiskOfferingCmd.java      |   6 -
 .../admin/offering/DeleteServiceOfferingCmd.java   |   6 -
 .../admin/offering/UpdateDiskOfferingCmd.java      |   6 -
 .../admin/offering/UpdateServiceOfferingCmd.java   |   6 -
 .../ChangeOutOfBandManagementPasswordCmd.java      |   9 +-
 .../ConfigureOutOfBandManagementCmd.java           |   8 +-
 .../DisableOutOfBandManagementForClusterCmd.java   |   8 +-
 .../DisableOutOfBandManagementForHostCmd.java      |   8 +-
 .../DisableOutOfBandManagementForZoneCmd.java      |   8 +-
 .../EnableOutOfBandManagementForClusterCmd.java    |   8 +-
 .../EnableOutOfBandManagementForHostCmd.java       |   8 +-
 .../EnableOutOfBandManagementForZoneCmd.java       |   8 +-
 .../IssueOutOfBandManagementPowerActionCmd.java    |   9 +-
 .../api/command/admin/pod/CreatePodCmd.java        |   8 -
 .../api/command/admin/pod/DeletePodCmd.java        |   6 -
 .../api/command/admin/pod/ListPodsByCmd.java       |   6 -
 .../api/command/admin/pod/UpdatePodCmd.java        |   6 -
 .../api/command/admin/region/AddRegionCmd.java     |   6 -
 .../admin/region/CreatePortableIpRangeCmd.java     |   6 -
 .../api/command/admin/region/RemoveRegionCmd.java  |   6 -
 .../api/command/admin/region/UpdateRegionCmd.java  |   6 -
 .../command/admin/resource/ArchiveAlertsCmd.java   |   6 -
 .../command/admin/resource/DeleteAlertsCmd.java    |   6 -
 .../api/command/admin/resource/ListAlertsCmd.java  |   6 -
 .../command/admin/resource/ListCapacityCmd.java    |   6 -
 .../admin/resource/StartRollingMaintenanceCmd.java |  11 +-
 .../admin/resource/UploadCustomCertificateCmd.java |   6 -
 .../admin/resource/icon/DeleteResourceIconCmd.java |   6 -
 .../admin/resource/icon/ListResourceIconCmd.java   |   6 -
 .../admin/resource/icon/UploadResourceIconCmd.java |   6 -
 .../admin/router/ConfigureOvsElementCmd.java       |   6 -
 .../router/ConfigureVirtualRouterElementCmd.java   |   6 -
 .../router/CreateVirtualRouterElementCmd.java      |   6 -
 .../api/command/admin/router/DestroyRouterCmd.java |   6 -
 .../router/GetRouterHealthCheckResultsCmd.java     |   8 +-
 .../command/admin/router/ListOvsElementsCmd.java   |   6 -
 .../api/command/admin/router/ListRoutersCmd.java   |   6 -
 .../admin/router/ListVirtualRouterElementsCmd.java |   6 -
 .../api/command/admin/router/RebootRouterCmd.java  |   6 -
 .../api/command/admin/router/StartRouterCmd.java   |   6 -
 .../api/command/admin/router/StopRouterCmd.java    |   6 -
 .../api/command/admin/router/UpgradeRouterCmd.java |   6 -
 .../admin/router/UpgradeRouterTemplateCmd.java     |   6 -
 .../command/admin/storage/AddImageStoreCmd.java    |   6 -
 .../storage/CreateSecondaryStagingStoreCmd.java    |   6 -
 .../admin/storage/CreateStoragePoolCmd.java        |   6 -
 .../command/admin/storage/DeleteImageStoreCmd.java |   6 -
 .../api/command/admin/storage/DeletePoolCmd.java   |   6 -
 .../storage/DeleteSecondaryStagingStoreCmd.java    |   6 -
 .../storage/FindStoragePoolsForMigrationCmd.java   |   6 -
 .../command/admin/storage/ListImageStoresCmd.java  |   6 -
 .../command/admin/storage/ListStoragePoolsCmd.java |   6 -
 .../admin/storage/ListStorageProvidersCmd.java     |   6 -
 .../command/admin/storage/ListStorageTagsCmd.java  |   6 -
 .../storage/MigrateSecondaryStorageDataCmd.java    |  10 +-
 .../command/admin/storage/SyncStoragePoolCmd.java  |   8 +-
 .../storage/UpdateCloudToUseObjectStoreCmd.java    |   6 -
 .../storage/UpdateStorageCapabilitiesCmd.java      |   9 +-
 .../admin/storage/UpdateStoragePoolCmd.java        |   6 -
 .../api/command/admin/swift/AddSwiftCmd.java       |   6 -
 .../api/command/admin/swift/ListSwiftsCmd.java     |   6 -
 .../command/admin/systemvm/DestroySystemVmCmd.java |   6 -
 .../command/admin/systemvm/ListSystemVMsCmd.java   |   6 -
 .../command/admin/systemvm/MigrateSystemVMCmd.java |   6 -
 .../command/admin/systemvm/PatchSystemVMCmd.java   |   9 +-
 .../command/admin/systemvm/RebootSystemVmCmd.java  |   6 -
 .../command/admin/systemvm/StartSystemVMCmd.java   |   6 -
 .../command/admin/systemvm/StopSystemVmCmd.java    |   6 -
 .../command/admin/systemvm/UpgradeSystemVMCmd.java |   6 -
 .../command/admin/template/PrepareTemplateCmd.java |   6 -
 .../command/admin/usage/AddTrafficMonitorCmd.java  |   6 -
 .../api/command/admin/usage/AddTrafficTypeCmd.java |   6 -
 .../admin/usage/DeleteTrafficMonitorCmd.java       |   6 -
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |   6 -
 .../admin/usage/GenerateUsageRecordsCmd.java       |   6 -
 .../admin/usage/ListTrafficMonitorsCmd.java        |   6 -
 .../usage/ListTrafficTypeImplementorsCmd.java      |   5 -
 .../command/admin/usage/ListTrafficTypesCmd.java   |   6 -
 .../command/admin/usage/ListUsageRecordsCmd.java   |   9 +-
 .../api/command/admin/usage/ListUsageTypesCmd.java |   6 -
 .../admin/usage/RemoveRawUsageRecordsCmd.java      |   6 -
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |   6 -
 .../api/command/admin/user/CreateUserCmd.java      |   6 -
 .../api/command/admin/user/DeleteUserCmd.java      |   6 -
 .../api/command/admin/user/DisableUserCmd.java     |   6 -
 .../api/command/admin/user/EnableUserCmd.java      |   6 -
 .../api/command/admin/user/GetUserCmd.java         |   6 -
 .../api/command/admin/user/GetUserKeysCmd.java     |  11 +-
 .../api/command/admin/user/ListUsersCmd.java       |   6 -
 .../api/command/admin/user/LockUserCmd.java        |   6 -
 .../api/command/admin/user/MoveUserCmd.java        |   6 -
 .../api/command/admin/user/RegisterCmd.java        |   6 -
 .../api/command/admin/user/UpdateUserCmd.java      |   6 -
 .../command/admin/vlan/CreateVlanIpRangeCmd.java   |   6 -
 .../admin/vlan/DedicatePublicIpRangeCmd.java       |   6 -
 .../command/admin/vlan/DeleteVlanIpRangeCmd.java   |   6 -
 .../command/admin/vlan/ListVlanIpRangesCmd.java    |   6 -
 .../admin/vlan/ReleasePublicIpRangeCmd.java        |   6 -
 .../command/admin/vlan/UpdateVlanIpRangeCmd.java   |  10 +-
 .../api/command/admin/vm/AssignVMCmd.java          |   6 -
 .../api/command/admin/vm/ExpungeVMCmd.java         |   6 -
 .../api/command/admin/vm/GetVMUserDataCmd.java     |   5 -
 .../admin/vm/ImportUnmanagedInstanceCmd.java       |   8 +-
 .../admin/vm/ListUnmanagedInstancesCmd.java        |   9 +-
 .../api/command/admin/vm/MigrateVMCmd.java         |   6 -
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |   6 -
 .../api/command/admin/vm/RecoverVMCmd.java         |   6 -
 .../command/admin/vm/UnmanageVMInstanceCmd.java    |  10 +-
 .../admin/vpc/CreatePrivateGatewayByAdminCmd.java  |   2 +-
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |   6 -
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |   6 -
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |   6 -
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |   6 -
 .../api/command/admin/zone/CreateZoneCmd.java      |   6 -
 .../api/command/admin/zone/DeleteZoneCmd.java      |   6 -
 .../admin/zone/MarkDefaultZoneForAccountCmd.java   |   6 -
 .../api/command/admin/zone/UpdateZoneCmd.java      |   6 -
 .../user/account/AddAccountToProjectCmd.java       |   6 -
 .../command/user/account/AddUserToProjectCmd.java  |   8 +-
 .../user/account/DeleteAccountFromProjectCmd.java  |   6 -
 .../user/account/DeleteUserFromProjectCmd.java     |   8 +-
 .../user/account/ListProjectAccountsCmd.java       |   6 -
 .../user/address/DisassociateIPAddrCmd.java        |   6 -
 .../api/command/user/address/ReleaseIPAddrCmd.java |   6 -
 .../api/command/user/address/ReserveIPAddrCmd.java |   6 -
 .../api/command/user/address/UpdateIPAddrCmd.java  |   8 +-
 .../user/affinitygroup/CreateAffinityGroupCmd.java |   6 -
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |   6 -
 .../affinitygroup/ListAffinityGroupTypesCmd.java   |   6 -
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |   6 -
 .../user/autoscale/DeleteAutoScalePolicyCmd.java   |   6 -
 .../user/autoscale/DeleteAutoScaleVmGroupCmd.java  |   6 -
 .../autoscale/DeleteAutoScaleVmProfileCmd.java     |   6 -
 .../command/user/autoscale/DeleteConditionCmd.java |   6 -
 .../user/autoscale/ListAutoScalePoliciesCmd.java   |   6 -
 .../user/autoscale/ListAutoScaleVmGroupsCmd.java   |   6 -
 .../user/autoscale/ListAutoScaleVmProfilesCmd.java |   6 -
 .../command/user/autoscale/ListConditionsCmd.java  |   6 -
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |   6 -
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |   6 -
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |   6 -
 .../command/user/autoscale/UpdateConditionCmd.java |   9 +-
 .../AssignVirtualMachineToBackupOfferingCmd.java   |  11 +-
 .../api/command/user/backup/CreateBackupCmd.java   |   9 +-
 .../user/backup/CreateBackupScheduleCmd.java       |   8 +-
 .../api/command/user/backup/DeleteBackupCmd.java   |   9 +-
 .../user/backup/DeleteBackupScheduleCmd.java       |   8 +-
 .../user/backup/ListBackupOfferingsCmd.java        |   7 +-
 .../command/user/backup/ListBackupScheduleCmd.java |  10 +-
 .../api/command/user/backup/ListBackupsCmd.java    |   9 +-
 .../RemoveVirtualMachineFromBackupOfferingCmd.java |  11 +-
 .../api/command/user/backup/RestoreBackupCmd.java  |   9 +-
 .../RestoreVolumeFromBackupAndAttachToVMCmd.java   |   9 +-
 .../user/backup/UpdateBackupScheduleCmd.java       |   3 +-
 .../command/user/config/ListCapabilitiesCmd.java   |   6 -
 .../consoleproxy/CreateConsoleEndpointCmd.java     |   8 +-
 .../api/command/user/event/ArchiveEventsCmd.java   |   6 -
 .../api/command/user/event/DeleteEventsCmd.java    |   6 -
 .../api/command/user/event/ListEventTypesCmd.java  |   6 -
 .../api/command/user/event/ListEventsCmd.java      |   6 -
 .../user/firewall/CreateEgressFirewallRuleCmd.java |   6 -
 .../user/firewall/CreateFirewallRuleCmd.java       |   6 -
 .../user/firewall/CreatePortForwardingRuleCmd.java |   6 -
 .../user/firewall/DeleteEgressFirewallRuleCmd.java |   6 -
 .../user/firewall/DeleteFirewallRuleCmd.java       |   6 -
 .../user/firewall/DeletePortForwardingRuleCmd.java |   6 -
 .../user/firewall/ListEgressFirewallRulesCmd.java  |   6 -
 .../user/firewall/ListFirewallRulesCmd.java        |   6 -
 .../user/firewall/ListPortForwardingRulesCmd.java  |   6 -
 .../user/firewall/UpdateEgressFirewallRuleCmd.java |   6 -
 .../user/firewall/UpdateFirewallRuleCmd.java       |   8 +-
 .../user/firewall/UpdatePortForwardingRuleCmd.java |   6 -
 .../user/guest/ListGuestOsCategoriesCmd.java       |   6 -
 .../api/command/user/guest/ListGuestOsCmd.java     |   6 -
 .../user/ipv6/CreateIpv6FirewallRuleCmd.java       |   8 +-
 .../user/ipv6/DeleteIpv6FirewallRuleCmd.java       |   8 +-
 .../user/ipv6/ListIpv6FirewallRulesCmd.java        |   8 +-
 .../user/ipv6/UpdateIpv6FirewallRuleCmd.java       |   8 +-
 .../api/command/user/iso/DeleteIsoCmd.java         |  10 -
 .../api/command/user/iso/ExtractIsoCmd.java        |  10 -
 .../api/command/user/job/ListAsyncJobsCmd.java     |   6 -
 .../command/user/job/QueryAsyncJobResultCmd.java   |   6 -
 .../loadbalancer/AssignCertToLoadBalancerCmd.java  |   6 -
 .../loadbalancer/AssignToLoadBalancerRuleCmd.java  |   6 -
 .../CreateApplicationLoadBalancerCmd.java          |   6 -
 .../loadbalancer/CreateLBHealthCheckPolicyCmd.java |   6 -
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |   6 -
 .../DeleteApplicationLoadBalancerCmd.java          |   6 -
 .../loadbalancer/DeleteLBHealthCheckPolicyCmd.java |   6 -
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |   6 -
 .../user/loadbalancer/DeleteSslCertCmd.java        |   8 +-
 .../ListApplicationLoadBalancersCmd.java           |   6 -
 .../loadbalancer/ListLBHealthCheckPoliciesCmd.java |   6 -
 .../loadbalancer/ListLBStickinessPoliciesCmd.java  |   6 -
 .../loadbalancer/ListLoadBalancerRulesCmd.java     |   6 -
 .../command/user/loadbalancer/ListSslCertsCmd.java |   6 -
 .../RemoveCertFromLoadBalancerCmd.java             |   6 -
 .../RemoveFromLoadBalancerRuleCmd.java             |   6 -
 .../UpdateApplicationLoadBalancerCmd.java          |   6 -
 .../loadbalancer/UpdateLBHealthCheckPolicyCmd.java |   6 -
 .../loadbalancer/UpdateLBStickinessPolicyCmd.java  |   6 -
 .../loadbalancer/UpdateLoadBalancerRuleCmd.java    |   6 -
 .../user/loadbalancer/UploadSslCertCmd.java        |   6 -
 .../user/nat/CreateIpForwardingRuleCmd.java        |   6 -
 .../user/nat/DeleteIpForwardingRuleCmd.java        |   6 -
 .../api/command/user/nat/DisableStaticNatCmd.java  |   6 -
 .../api/command/user/nat/EnableStaticNatCmd.java   |   6 -
 .../command/user/nat/ListIpForwardingRulesCmd.java |   6 -
 .../command/user/network/CreateNetworkACLCmd.java  |   6 -
 .../user/network/CreateNetworkACLListCmd.java      |   6 -
 .../user/network/CreateNetworkPermissionsCmd.java  |   8 +-
 .../command/user/network/DeleteNetworkACLCmd.java  |   6 -
 .../user/network/DeleteNetworkACLListCmd.java      |   6 -
 .../api/command/user/network/DeleteNetworkCmd.java |   6 -
 .../user/network/ListNetworkACLListsCmd.java       |   6 -
 .../command/user/network/ListNetworkACLsCmd.java   |   6 -
 .../user/network/ListNetworkOfferingsCmd.java      |   6 -
 .../user/network/ListNetworkPermissionsCmd.java    |   8 +-
 .../user/network/RemoveNetworkPermissionsCmd.java  |   8 +-
 .../user/network/ReplaceNetworkACLListCmd.java     |   6 -
 .../user/network/ResetNetworkPermissionsCmd.java   |   8 +-
 .../command/user/network/RestartNetworkCmd.java    |   6 -
 .../user/network/UpdateNetworkACLListCmd.java      |   6 -
 .../user/offering/ListDiskOfferingsCmd.java        |   6 -
 .../user/offering/ListServiceOfferingsCmd.java     |   6 -
 .../api/command/user/project/CreateProjectCmd.java |   6 -
 .../api/command/user/project/DeleteProjectCmd.java |   6 -
 .../user/project/DeleteProjectInvitationCmd.java   |   6 -
 .../user/project/ListProjectInvitationsCmd.java    |   6 -
 .../api/command/user/project/ListProjectsCmd.java  |   6 -
 .../command/user/project/SuspendProjectCmd.java    |   6 -
 .../api/command/user/project/UpdateProjectCmd.java |   6 -
 .../user/project/UpdateProjectInvitationCmd.java   |   6 -
 .../api/command/user/region/ListRegionsCmd.java    |   6 -
 .../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java |   6 -
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |   6 -
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |   6 -
 .../ha/gslb/ListGlobalLoadBalancerRuleCmd.java     |   6 -
 .../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java   |   6 -
 .../user/resource/GetCloudIdentifierCmd.java       |   6 -
 .../user/resource/ListDetailOptionsCmd.java        |   8 +-
 .../command/user/resource/ListHypervisorsCmd.java  |   6 -
 .../user/resource/ListResourceLimitsCmd.java       |   6 -
 .../user/resource/UpdateResourceCountCmd.java      |   6 -
 .../user/resource/UpdateResourceLimitCmd.java      |   6 -
 .../AuthorizeSecurityGroupEgressCmd.java           |   6 -
 .../AuthorizeSecurityGroupIngressCmd.java          |   6 -
 .../user/securitygroup/CreateSecurityGroupCmd.java |   6 -
 .../user/securitygroup/DeleteSecurityGroupCmd.java |   6 -
 .../user/securitygroup/ListSecurityGroupsCmd.java  |   6 -
 .../RevokeSecurityGroupEgressCmd.java              |   6 -
 .../RevokeSecurityGroupIngressCmd.java             |   6 -
 .../user/securitygroup/UpdateSecurityGroupCmd.java |   9 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |   6 -
 .../snapshot/CreateSnapshotFromVMSnapshotCmd.java  |   6 -
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |   6 -
 .../command/user/snapshot/DeleteSnapshotCmd.java   |   6 -
 .../user/snapshot/DeleteSnapshotPoliciesCmd.java   |   6 -
 .../user/snapshot/ListSnapshotPoliciesCmd.java     |   6 -
 .../command/user/snapshot/ListSnapshotsCmd.java    |   6 -
 .../command/user/snapshot/RevertSnapshotCmd.java   |   6 -
 .../user/snapshot/UpdateSnapshotPolicyCmd.java     |   8 +-
 .../api/command/user/ssh/CreateSSHKeyPairCmd.java  |   5 -
 .../api/command/user/ssh/DeleteSSHKeyPairCmd.java  |   6 -
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |   6 -
 .../command/user/ssh/RegisterSSHKeyPairCmd.java    |   6 -
 .../api/command/user/tag/CreateTagsCmd.java        |   6 -
 .../api/command/user/tag/DeleteTagsCmd.java        |   6 -
 .../api/command/user/tag/ListTagsCmd.java          |   6 -
 .../command/user/template/DeleteTemplateCmd.java   |  10 -
 .../command/user/template/ExtractTemplateCmd.java  |  10 -
 .../command/user/userdata/DeleteUserDataCmd.java   |   6 -
 .../user/userdata/LinkUserDataToTemplateCmd.java   |   6 -
 .../api/command/user/userdata/ListUserDataCmd.java |   6 -
 .../command/user/userdata/RegisterUserDataCmd.java |   5 -
 .../api/command/user/vm/GetVMPasswordCmd.java      |   5 -
 .../api/command/user/vm/ListNicsCmd.java           |   6 -
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |   6 -
 .../api/command/user/vm/UpdateVmNicIpCmd.java      |   6 -
 .../api/command/user/vmgroup/CreateVMGroupCmd.java |   6 -
 .../api/command/user/vmgroup/DeleteVMGroupCmd.java |   6 -
 .../api/command/user/vmgroup/ListVMGroupsCmd.java  |   6 -
 .../api/command/user/vmgroup/UpdateVMGroupCmd.java |   6 -
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |   6 -
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |   6 -
 .../command/user/vmsnapshot/ListVMSnapshotCmd.java |   6 -
 .../command/user/volume/AddResourceDetailCmd.java  |   6 -
 .../user/volume/ChangeOfferingForVolumeCmd.java    |   8 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |   6 -
 .../api/command/user/volume/ExtractVolumeCmd.java  |  10 -
 .../user/volume/ListResourceDetailsCmd.java        |   6 -
 .../user/volume/RemoveResourceDetailCmd.java       |   6 -
 .../api/command/user/vpc/CreateStaticRouteCmd.java |   6 -
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |   6 -
 .../api/command/user/vpc/DeleteVPCCmd.java         |   6 -
 .../command/user/vpc/ListPrivateGatewaysCmd.java   |   6 -
 .../api/command/user/vpc/ListStaticRoutesCmd.java  |   6 -
 .../api/command/user/vpc/ListVPCOfferingsCmd.java  |   6 -
 .../api/command/user/vpc/RestartVPCCmd.java        |   6 -
 .../api/command/user/vpn/AddVpnUserCmd.java        |   6 -
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |   6 -
 .../command/user/vpn/CreateVpnConnectionCmd.java   |   6 -
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |   6 -
 .../api/command/user/vpn/CreateVpnGatewayCmd.java  |   6 -
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |   6 -
 .../command/user/vpn/DeleteVpnConnectionCmd.java   |   6 -
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |   6 -
 .../api/command/user/vpn/DeleteVpnGatewayCmd.java  |   6 -
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |   6 -
 .../command/user/vpn/ListVpnConnectionsCmd.java    |   6 -
 .../user/vpn/ListVpnCustomerGatewaysCmd.java       |   6 -
 .../api/command/user/vpn/ListVpnGatewaysCmd.java   |   6 -
 .../api/command/user/vpn/ListVpnUsersCmd.java      |   6 -
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |   6 -
 .../command/user/vpn/ResetVpnConnectionCmd.java    |   6 -
 .../command/user/vpn/UpdateRemoteAccessVpnCmd.java |   8 +-
 .../command/user/vpn/UpdateVpnConnectionCmd.java   |   6 -
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |   6 -
 .../api/command/user/vpn/UpdateVpnGatewayCmd.java  |   6 -
 .../api/command/test/AddHostCmdTest.java           |   3 +-
 .../command/test/AddSecondaryStorageCmdTest.java   |   3 +-
 .../api/command/user/discovery/ListApisCmd.java    |   6 -
 .../command/admin/ratelimit/ResetApiLimitCmd.java  |   6 -
 .../api/command/user/ratelimit/GetApiLimitCmd.java |   6 -
 .../admin/solidfire/GetPathForVolumeCmd.java       |   6 -
 .../admin/solidfire/GetSolidFireAccountIdCmd.java  |   6 -
 .../GetSolidFireVolumeAccessGroupIdsCmd.java       |   8 +-
 .../admin/solidfire/GetSolidFireVolumeSizeCmd.java |   8 +-
 .../solidfire/GetVolumeSnapshotDetailsCmd.java     |   8 +-
 .../admin/solidfire/GetVolumeiScsiNameCmd.java     |   8 +-
 .../api/command/admin/sioc/UpdateSiocInfoCmd.java  |   8 +-
 .../cloudstack/api/command/QuotaBalanceCmd.java    |   6 -
 .../cloudstack/api/command/QuotaCreditsCmd.java    |   6 -
 .../api/command/QuotaEmailTemplateListCmd.java     |   5 -
 .../api/command/QuotaEmailTemplateUpdateCmd.java   |   6 -
 .../cloudstack/api/command/QuotaEnabledCmd.java    |   6 -
 .../cloudstack/api/command/QuotaStatementCmd.java  |   6 -
 .../cloudstack/api/command/QuotaSummaryCmd.java    |   6 -
 .../api/command/QuotaTariffCreateCmd.java          |   8 +-
 .../api/command/QuotaTariffDeleteCmd.java          |   8 +-
 .../cloudstack/api/command/QuotaTariffListCmd.java |   6 -
 .../api/command/QuotaTariffUpdateCmd.java          |   6 -
 .../cloudstack/api/command/QuotaUpdateCmd.java     |   6 -
 .../api/commands/DedicateClusterCmd.java           |   6 -
 .../cloudstack/api/commands/DedicateHostCmd.java   |   6 -
 .../cloudstack/api/commands/DedicatePodCmd.java    |   6 -
 .../cloudstack/api/commands/DedicateZoneCmd.java   |   6 -
 .../api/commands/ListDedicatedClustersCmd.java     |   6 -
 .../api/commands/ListDedicatedHostsCmd.java        |   6 -
 .../api/commands/ListDedicatedPodsCmd.java         |   6 -
 .../api/commands/ListDedicatedZonesCmd.java        |   6 -
 .../api/commands/ReleaseDedicatedClusterCmd.java   |   6 -
 .../api/commands/ReleaseDedicatedHostCmd.java      |   6 -
 .../api/commands/ReleaseDedicatedPodCmd.java       |   6 -
 .../api/commands/ReleaseDedicatedZoneCmd.java      |   6 -
 .../apache/cloudstack/api/AddBaremetalDhcpCmd.java |   6 -
 .../apache/cloudstack/api/AddBaremetalRctCmd.java  | 166 +++++++-------
 .../cloudstack/api/DeleteBaremetalRctCmd.java      | 164 +++++++-------
 .../cloudstack/api/ListBaremetalDhcpCmd.java       |   6 -
 .../cloudstack/api/ListBaremetalPxeServersCmd.java |   5 -
 .../apache/cloudstack/api/ListBaremetalRctCmd.java |   6 -
 .../api/AssociateUcsProfileToBladeCmd.java         |   5 -
 .../cloud/api/commands/DeleteCiscoNexusVSMCmd.java |   6 -
 .../api/commands/DisableCiscoNexusVSMCmd.java      |   6 -
 .../cloud/api/commands/EnableCiscoNexusVSMCmd.java |   6 -
 .../api/command/admin/zone/AddVmwareDcCmd.java     |   6 -
 .../zone/ImportVsphereStoragePoliciesCmd.java      |   8 +-
 .../api/command/admin/zone/ListVmwareDcsCmd.java   |   6 -
 .../admin/zone/ListVsphereStoragePoliciesCmd.java  |   8 +-
 ...ListVsphereStoragePolicyCompatiblePoolsCmd.java |   8 +-
 .../api/command/admin/zone/RemoveVmwareDcCmd.java  |   6 -
 .../api/command/admin/zone/UpdateVmwareDcCmd.java  |  10 +-
 .../cloudian/api/CloudianIsEnabledCmd.java         |  10 +-
 .../cloudian/api/CloudianSsoLoginCmd.java          |  10 +-
 .../version/AddKubernetesSupportedVersionCmd.java  |   8 +-
 .../DeleteKubernetesSupportedVersionCmd.java       |   8 +-
 .../UpdateKubernetesSupportedVersionCmd.java       |   8 +-
 .../cluster/CreateKubernetesClusterCmd.java        |   8 +-
 .../cluster/DeleteKubernetesClusterCmd.java        |   8 +-
 .../cluster/GetKubernetesClusterConfigCmd.java     |   8 +-
 .../cluster/ListKubernetesClustersCmd.java         |   8 +-
 .../cluster/ScaleKubernetesClusterCmd.java         |   8 +-
 .../cluster/StartKubernetesClusterCmd.java         |   8 +-
 .../cluster/StopKubernetesClusterCmd.java          |   8 +-
 .../cluster/UpgradeKubernetesClusterCmd.java       |   8 +-
 .../ListKubernetesSupportedVersionsCmd.java        |   8 +-
 .../cloudstack/api/ListClustersMetricsCmd.java     |   8 +-
 .../apache/cloudstack/api/ListDbMetricsCmd.java    |   8 +-
 .../apache/cloudstack/api/ListHostsMetricsCmd.java |   8 +-
 .../cloudstack/api/ListInfrastructureCmd.java      |   8 +-
 .../apache/cloudstack/api/ListMgmtsMetricsCmd.java |   8 +-
 .../cloudstack/api/ListStoragePoolsMetricsCmd.java |   8 +-
 .../cloudstack/api/ListUsageServerMetricsCmd.java  |   8 +-
 .../cloudstack/api/ListVMsMetricsCmdByAdmin.java   |   2 +-
 .../cloudstack/api/ListVMsUsageHistoryCmd.java     |  10 +-
 .../cloudstack/api/ListVolumesMetricsCmd.java      |   8 +-
 .../apache/cloudstack/api/ListZonesMetricsCmd.java |   8 +-
 .../api/commands/AddBigSwitchBcfDeviceCmd.java     |   6 -
 .../api/commands/DeleteBigSwitchBcfDeviceCmd.java  |   6 -
 .../cloud/api/commands/AddBrocadeVcsDeviceCmd.java |   6 -
 .../api/commands/DeleteBrocadeVcsDeviceCmd.java    |   6 -
 .../cloudstack/api/AddGloboDnsHostCmd.java         |   6 -
 .../api/command/CreateServiceInstanceCmd.java      |   6 -
 .../cloud/api/commands/AddExternalFirewallCmd.java |   6 -
 .../com/cloud/api/commands/AddSrxFirewallCmd.java  |   6 -
 .../api/commands/ConfigureSrxFirewallCmd.java      |   6 -
 .../api/commands/DeleteExternalFirewallCmd.java    |   6 -
 .../cloud/api/commands/DeleteSrxFirewallCmd.java   |   6 -
 .../api/commands/ListExternalFirewallsCmd.java     |   6 -
 .../api/commands/ListSrxFirewallNetworksCmd.java   |   5 -
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |   6 -
 .../ConfigureNetscalerLoadBalancerCmd.java         |   6 -
 .../commands/DeleteNetscalerLoadBalancerCmd.java   |   6 -
 .../ListNetscalerLoadBalancerNetworksCmd.java      |   5 -
 .../RegisterNetscalerControlCenterCmd.java         |  12 +-
 .../cloud/api/commands/AddNiciraNvpDeviceCmd.java  |   6 -
 .../api/commands/DeleteNiciraNvpDeviceCmd.java     |   6 -
 .../cloud/api/commands/AddPaloAltoFirewallCmd.java |   6 -
 .../api/commands/ConfigurePaloAltoFirewallCmd.java |   6 -
 .../api/commands/DeletePaloAltoFirewallCmd.java    |   6 -
 .../commands/ListPaloAltoFirewallNetworksCmd.java  |   5 -
 .../cloudstack/api/command/LDAPConfigCmd.java      |   6 -
 .../cloudstack/api/command/LDAPRemoveCmd.java      |   6 -
 .../api/command/LinkAccountToLdapCmd.java          |  10 +-
 .../api/command/LinkDomainToLdapCmd.java           |   6 -
 .../api/command/LinkAccountToLdapCmdTest.java      |   3 +-
 .../api/command/AuthorizeSAMLSSOCmd.java           |   8 +-
 .../api/command/ListAndSwitchSAMLAccountCmd.java   |   8 +-
 .../apache/cloudstack/api/command/ListIdpsCmd.java |   9 +-
 server/src/main/java/com/cloud/api/ApiServlet.java |   3 +-
 .../api/auth/DefaultLoginAPIAuthenticatorCmd.java  |   8 +-
 .../api/auth/DefaultLogoutAPIAuthenticatorCmd.java |   9 +-
 .../com/cloud/storage/upload/UploadListener.java   |   7 +-
 560 files changed, 481 insertions(+), 3831 deletions(-)

diff --git a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
index c2ff5a844f1..23354454e32 100644
--- a/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/BaseCmd.java
@@ -247,30 +247,36 @@ public abstract class BaseCmd {
         this.responseType = responseType;
     }
 
-    /**
-     * For some reason this method does not return the actual command name, but more a name that
-     * is used to create the response. So you can expect for a XCmd a value like xcmdresponse. Anyways
-     * this methods is used in too many places so for now instead of changing it we just create another
-     * method {@link BaseCmd#getActualCommandName()} that returns the value from {@link APICommand#name()}
-     *
-     * @return
-     */
-    public abstract String getCommandName();
-
-
     /**
      * Gets the CommandName based on the class annotations: the value from {@link APICommand#name()}
      *
      * @return the value from {@link APICommand#name()}
      */
-    public String getActualCommandName() {
+    public static String getCommandNameByClass(Class<?> clazz) {
         String cmdName = null;
-        if (this.getClass().getAnnotation(APICommand.class) != null) {
-            cmdName = this.getClass().getAnnotation(APICommand.class).name();
+        APICommand apiClassAnnotation = clazz.getAnnotation(APICommand.class);
+
+        if (apiClassAnnotation != null && apiClassAnnotation.name() != null) {
+            cmdName = apiClassAnnotation.name();
         } else {
-            cmdName = this.getClass().getName();
+            cmdName = clazz.getName();
         }
-       return cmdName;
+        return cmdName;
+    }
+
+    public String getActualCommandName() {
+        return getCommandNameByClass(this.getClass());
+    }
+
+    public String getCommandName() {
+        return getResponseNameByClass(this.getClass());
+    }
+
+    /**
+     * Retrieves the name defined in {@link APICommand#name()}, in lower case, with the prefix {@link BaseCmd#RESPONSE_SUFFIX}
+     */
+    public static String getResponseNameByClass(Class<?> clazz) {
+        return getCommandNameByClass(clazz).toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
     }
 
     /**
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
index 7d1150597f6..945bb956c3e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java
@@ -45,7 +45,6 @@ import com.cloud.user.UserAccount;
 public class CreateAccountCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName());
 
-    private static final String s_name = "createaccountresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -172,11 +171,6 @@ public class CreateAccountCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
index 22eec04c57b..9a0ea4e9ec0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DeleteAccountCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteAccountCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteAccountCmd.class.getName());
-    private static final String s_name = "deleteaccountresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -64,15 +63,6 @@ public class DeleteAccountCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    public static String getStaticName() {
-        return s_name;
-    }
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();// Let's give the caller here for event logging.
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
index f71484c2dea..91b0673e186 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/DisableAccountCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
 public class DisableAccountCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DisableAccountCmd.class.getName());
-    private static final String s_name = "disableaccountresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -89,11 +88,6 @@ public class DisableAccountCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_ACCOUNT_DISABLE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
index e9dc9f611d8..cc37dc23713 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/EnableAccountCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
     requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
 public class EnableAccountCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(EnableAccountCmd.class.getName());
-    private static final String s_name = "enableaccountresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -78,11 +77,6 @@ public class EnableAccountCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = _entityMgr.findById(Account.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
index d02902d9800..a430914a25a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/LockAccountCmd.java
@@ -37,7 +37,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 public class LockAccountCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(LockAccountCmd.class.getName());
 
-    private static final String s_name = "lockaccountresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -69,11 +68,6 @@ public class LockAccountCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         final Account account = _accountService.getActiveAccountByName(getAccountName(), getDomainId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
index 0dd7a37bb91..36d299bcfc8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/account/UpdateAccountCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
 public class UpdateAccountCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateAccountCmd.class.getName());
-    private static final String s_name = "updateaccountresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -116,11 +115,6 @@ public class UpdateAccountCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = _entityMgr.findById(Account.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java
index 73c5ca2d759..2b8800319f6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRoleCmd.java
@@ -23,7 +23,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.RoleResponse;
@@ -31,12 +30,11 @@ import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.user.Account;
 
-@APICommand(name = CreateRoleCmd.APINAME, description = "Creates a role", responseObject = RoleResponse.class,
+@APICommand(name = "createRole", description = "Creates a role", responseObject = RoleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0",
         authorized = {RoleType.Admin})
 public class CreateRoleCmd extends RoleCmd {
-    public static final String APINAME = "createRole";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -66,11 +64,6 @@ public class CreateRoleCmd extends RoleCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java
index d7d6ef125df..232c4760e1e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/CreateRolePermissionCmd.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiArgValidator;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.RolePermissionResponse;
@@ -33,12 +32,11 @@ import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.user.Account;
 
-@APICommand(name = CreateRolePermissionCmd.APINAME, description = "Adds an API permission to a role", responseObject = RolePermissionResponse.class,
+@APICommand(name = "createRolePermission", description = "Adds an API permission to a role", responseObject = RolePermissionResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0",
         authorized = {RoleType.Admin})
 public class CreateRolePermissionCmd extends BaseRolePermissionCmd {
-    public static final String APINAME = "createRolePermission";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -60,11 +58,6 @@ public class CreateRolePermissionCmd extends BaseRolePermissionCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java
index 89f82500da8..fd2d11aeda0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRoleCmd.java
@@ -33,12 +33,11 @@ import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.user.Account;
 
-@APICommand(name = DeleteRoleCmd.APINAME, description = "Deletes a role", responseObject = SuccessResponse.class,
+@APICommand(name = "deleteRole", description = "Deletes a role", responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0",
         authorized = {RoleType.Admin})
 public class DeleteRoleCmd extends BaseCmd {
-    public static final String APINAME = "deleteRole";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -60,11 +59,6 @@ public class DeleteRoleCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java
index 9c7dc7c9861..bedaca9e23a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/DeleteRolePermissionCmd.java
@@ -31,12 +31,11 @@ import org.apache.cloudstack.api.response.RolePermissionResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.context.CallContext;
 
-@APICommand(name = DeleteRolePermissionCmd.APINAME, description = "Deletes a role permission", responseObject = SuccessResponse.class,
+@APICommand(name = "deleteRolePermission", description = "Deletes a role permission", responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0",
         authorized = {RoleType.Admin})
 public class DeleteRolePermissionCmd extends BaseCmd {
-    public static final String APINAME = "deleteRolePermission";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -58,11 +57,6 @@ public class DeleteRolePermissionCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java
index b51cb42e1df..4f3e9d15af7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ImportRoleCmd.java
@@ -33,7 +33,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.ApiServerService;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.RoleResponse;
@@ -43,12 +42,11 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.user.Account;
 
-@APICommand(name = ImportRoleCmd.APINAME, description = "Imports a role based on provided map of rule permissions", responseObject = RoleResponse.class,
+@APICommand(name = "importRole", description = "Imports a role based on provided map of rule permissions", responseObject = RoleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.15.0",
         authorized = {RoleType.Admin})
 public class ImportRoleCmd extends RoleCmd {
-    public static final String APINAME = "importRole";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -120,11 +118,6 @@ public class ImportRoleCmd extends RoleCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java
index f20abf40146..ce002f1455e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolePermissionsCmd.java
@@ -37,12 +37,11 @@ import java.util.ArrayList;
 import java.util.List;
 
 
-@APICommand(name = ListRolePermissionsCmd.APINAME, description = "Lists role permissions", responseObject = RolePermissionResponse.class,
+@APICommand(name = "listRolePermissions", description = "Lists role permissions", responseObject = RolePermissionResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0",
         authorized = {RoleType.Admin})
 public class ListRolePermissionsCmd extends BaseCmd {
-    public static final String APINAME = "listRolePermissions";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -64,11 +63,6 @@ public class ListRolePermissionsCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java
index 9a23618911d..dfe401596f4 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/ListRolesCmd.java
@@ -34,10 +34,9 @@ import org.apache.commons.lang3.StringUtils;
 import com.cloud.user.Account;
 import com.cloud.utils.Pair;
 
-@APICommand(name = ListRolesCmd.APINAME, description = "Lists dynamic roles in CloudStack", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {
+@APICommand(name = "listRoles", description = "Lists dynamic roles in CloudStack", responseObject = RoleResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.9.0", authorized = {
         RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin })
 public class ListRolesCmd extends BaseListCmd {
-    public static final String APINAME = "listRoles";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -75,11 +74,6 @@ public class ListRolesCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseListCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java
index 7b7b4e44294..227aaf54f7f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRoleCmd.java
@@ -32,12 +32,11 @@ import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.user.Account;
 
-@APICommand(name = UpdateRoleCmd.APINAME, description = "Updates a role", responseObject = RoleResponse.class,
+@APICommand(name = "updateRole", description = "Updates a role", responseObject = RoleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0",
         authorized = {RoleType.Admin})
 public class UpdateRoleCmd extends RoleCmd {
-    public static final String APINAME = "updateRole";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -69,11 +68,6 @@ public class UpdateRoleCmd extends RoleCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java
index 9faf1b93a7b..3f926092ec3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/UpdateRolePermissionCmd.java
@@ -38,12 +38,11 @@ import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.user.Account;
 
-@APICommand(name = UpdateRolePermissionCmd.APINAME, description = "Updates a role permission order", responseObject = SuccessResponse.class,
+@APICommand(name = "updateRolePermission", description = "Updates a role permission order", responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0",
         authorized = {RoleType.Admin})
 public class UpdateRolePermissionCmd extends BaseCmd {
-    public static final String APINAME = "updateRolePermission";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -96,11 +95,6 @@ public class UpdateRolePermissionCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
@@ -142,4 +136,4 @@ public class UpdateRolePermissionCmd extends BaseCmd {
         response.setSuccess(result);
         setResponseObject(response);
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java
index d3adbc88fd5..c03e6112ea7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRoleCmd.java
@@ -30,11 +30,10 @@ import org.apache.cloudstack.context.CallContext;
 
 import com.cloud.user.Account;
 
-@APICommand(name = CreateProjectRoleCmd.APINAME, description = "Creates a Project role", responseObject = ProjectRoleResponse.class,
+@APICommand(name = "createProjectRole", description = "Creates a Project role", responseObject = ProjectRoleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}, since = "4.15.0")
 public class CreateProjectRoleCmd extends ProjectRoleCmd {
-    public static final String APINAME = "createProjectRole";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -66,11 +65,6 @@ public class CreateProjectRoleCmd extends ProjectRoleCmd {
         setupProjectRoleResponse(projectRole);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java
index 7b04764b6a0..9b6c2e633fc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/CreateProjectRolePermissionCmd.java
@@ -32,11 +32,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse;
 import org.apache.cloudstack.api.response.ProjectRoleResponse;
 import org.apache.cloudstack.context.CallContext;
 
-@APICommand(name = CreateProjectRolePermissionCmd.APINAME, description = "Adds API permissions to a project role", responseObject = ProjectRolePermissionResponse.class,
+@APICommand(name = "createProjectRolePermission", description = "Adds API permissions to a project role", responseObject = ProjectRolePermissionResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {
         RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0")
 public class CreateProjectRolePermissionCmd extends BaseRolePermissionCmd {
-    public static final String APINAME = "createProjectRolePermission";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -80,11 +79,6 @@ public class CreateProjectRolePermissionCmd extends BaseRolePermissionCmd {
         setupResponse(projectRolePermission, projectRole);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java
index c1a4d391251..4bb460c63f7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRoleCmd.java
@@ -31,11 +31,10 @@ import org.apache.cloudstack.api.response.ProjectRoleResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.context.CallContext;
 
-@APICommand(name = DeleteProjectRoleCmd.APINAME, description = "Delete Project roles in CloudStack", responseObject = SuccessResponse.class,
+@APICommand(name = "deleteProjectRole", description = "Delete Project roles in CloudStack", responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.15.0", authorized = {
         RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class DeleteProjectRoleCmd extends BaseCmd {
-    public static final String APINAME = "deleteProjectRole" ;
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -76,11 +75,6 @@ public class DeleteProjectRoleCmd extends BaseCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java
index 17e74824102..8b83253c869 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/DeleteProjectRolePermissionCmd.java
@@ -31,11 +31,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.context.CallContext;
 
-@APICommand(name = DeleteProjectRolePermissionCmd.APINAME, description = "Deletes a project role permission in the project", responseObject = SuccessResponse.class,
+@APICommand(name = "deleteProjectRolePermission", description = "Deletes a project role permission in the project", responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {
         RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0")
 public class DeleteProjectRolePermissionCmd extends BaseCmd {
-    public static final String APINAME = "deleteProjectRolePermission";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -77,11 +76,6 @@ public class DeleteProjectRolePermissionCmd extends BaseCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java
index 55ec8a68eb3..b0cd08c8e47 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolePermissionsCmd.java
@@ -34,11 +34,10 @@ import org.apache.cloudstack.api.response.ProjectRolePermissionResponse;
 import org.apache.cloudstack.api.response.ProjectRoleResponse;
 import org.apache.cloudstack.context.CallContext;
 
-@APICommand(name = ListProjectRolePermissionsCmd.APINAME, description = "Lists a project's project role permissions", responseObject = ProjectRolePermissionResponse.class,
+@APICommand(name = "listProjectRolePermissions", description = "Lists a project's project role permissions", responseObject = ProjectRolePermissionResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {
         RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0")
 public class ListProjectRolePermissionsCmd extends BaseCmd {
-    public static final String APINAME = "listProjectRolePermissions";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -99,11 +98,6 @@ public class ListProjectRolePermissionsCmd extends BaseCmd {
        return rolePermissionResponse;
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java
index 68ee8714d7f..e876dbc9b58 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/ListProjectRolesCmd.java
@@ -33,11 +33,10 @@ import org.apache.cloudstack.api.response.ProjectRoleResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.lang3.StringUtils;
 
-@APICommand(name = ListProjectRolesCmd.APINAME, description = "Lists Project roles in CloudStack", responseObject = ProjectRoleResponse.class,
+@APICommand(name = "listProjectRoles", description = "Lists Project roles in CloudStack", responseObject = ProjectRoleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.15.0", authorized = {
         RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class ListProjectRolesCmd extends BaseListCmd {
-    public static final String APINAME = "listProjectRoles";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -104,11 +103,6 @@ public class ListProjectRolesCmd extends BaseListCmd {
         return response;
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java
index 41f68645e9b..202daa3d49c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRoleCmd.java
@@ -28,11 +28,10 @@ import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ProjectRoleResponse;
 
-@APICommand(name = UpdateProjectRoleCmd.APINAME, description = "Creates a Project role", responseObject = ProjectRoleResponse.class,
+@APICommand(name = "updateProjectRole", description = "Creates a Project role", responseObject = ProjectRoleResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User}, since = "4.15.0")
 public class UpdateProjectRoleCmd extends ProjectRoleCmd {
-    public static final String APINAME = "updateProjectRole";
 
     /////////////////////////////////////////////////////
     //////////////// API Parameters /////////////////////
@@ -73,11 +72,6 @@ public class UpdateProjectRoleCmd extends ProjectRoleCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return 0;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java
index 6f02962d683..d27235e5aae 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/acl/project/UpdateProjectRolePermissionCmd.java
@@ -38,11 +38,10 @@ import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.lang3.EnumUtils;
 
-@APICommand(name = UpdateProjectRolePermissionCmd.APINAME, description = "Updates a project role permission and/or order", responseObject = SuccessResponse.class,
+@APICommand(name = "updateProjectRolePermission", description = "Updates a project role permission and/or order", responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {
         RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}, since = "4.15.0")
 public class UpdateProjectRolePermissionCmd extends BaseCmd {
-    public static final String APINAME = "updateProjectRolePermission";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -151,11 +150,6 @@ public class UpdateProjectRolePermissionCmd extends BaseCmd {
         return projRoleService.updateProjectRolePermission(projectId, projectRole, rolePermissionsOrder);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
index 58920d7dd74..9446272df6e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/alert/GenerateAlertCmd.java
@@ -37,7 +37,6 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
 
     public static final Logger s_logger = Logger.getLogger(GenerateAlertCmd.class.getName());
 
-    private static final String s_name = "generatealertresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -61,11 +60,6 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
     // ///////////////////////////////////////////////////
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public Short getType() {
         return type;
     }
@@ -118,4 +112,4 @@ public class GenerateAlertCmd extends BaseAsyncCmd {
     public long getEntityOwnerId() {
         return 0;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
index eff25d929e5..00e0adcfb0d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
@@ -33,11 +33,10 @@ import org.apache.cloudstack.api.response.AnnotationResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.lang3.BooleanUtils;
 
-@APICommand(name = AddAnnotationCmd.APINAME, description = "add an annotation.", responseObject = AnnotationResponse.class,
+@APICommand(name = "addAnnotation", description = "add an annotation.", responseObject = AnnotationResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin})
 public class AddAnnotationCmd extends BaseCmd {
 
-    public static final String APINAME = "addAnnotation";
 
     @Parameter(name = ApiConstants.ANNOTATION, type = CommandType.STRING, description = "the annotation text")
     private String annotation;
@@ -85,11 +84,6 @@ public class AddAnnotationCmd extends BaseCmd {
         this.setResponseObject(annotationResponse);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
index 97d24ed9384..3df4536786f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
@@ -25,7 +25,6 @@ import com.google.common.base.Preconditions;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
@@ -33,11 +32,10 @@ import org.apache.cloudstack.api.response.AnnotationResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.commons.lang3.StringUtils;
 
-@APICommand(name = ListAnnotationsCmd.APINAME, description = "Lists annotations.", responseObject = AnnotationResponse.class,
+@APICommand(name = "listAnnotations", description = "Lists annotations.", responseObject = AnnotationResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin})
 public class ListAnnotationsCmd extends BaseListCmd {
 
-    public static final String APINAME = "listAnnotations";
 
     @Parameter(name = ApiConstants.ID, type = CommandType.STRING, description = "the id of the annotation")
     private String uuid;
@@ -94,9 +92,4 @@ public class ListAnnotationsCmd extends BaseListCmd {
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
         response.setObjectName("annotations");
-    }
-
-    @Override public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-}
+    }}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
index 581ce45f252..693ad09bfa9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
@@ -30,11 +30,10 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AnnotationResponse;
 import org.apache.cloudstack.context.CallContext;
 
-@APICommand(name = RemoveAnnotationCmd.APINAME, description = "remove an annotation.", responseObject = AnnotationResponse.class,
+@APICommand(name = "removeAnnotation", description = "remove an annotation.", responseObject = AnnotationResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.11", authorized = {RoleType.Admin})
 public class RemoveAnnotationCmd extends BaseCmd {
 
-    public static final String APINAME = "removeAnnotation";
 
     @Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true, description = "the id of the annotation")
     private String uuid;
@@ -52,11 +51,6 @@ public class RemoveAnnotationCmd extends BaseCmd {
         this.setResponseObject(annotationResponse);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java
index d152e10e5d1..b1b7295510c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/annotation/UpdateAnnotationVisibilityCmd.java
@@ -30,13 +30,12 @@ import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.AnnotationResponse;
 import org.apache.cloudstack.context.CallContext;
 
-@APICommand(name = UpdateAnnotationVisibilityCmd.APINAME, description = "update an annotation visibility.",
+@APICommand(name = "updateAnnotationVisibility", description = "update an annotation visibility.",
         responseObject = AnnotationResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.16", authorized = {RoleType.Admin})
 public class UpdateAnnotationVisibilityCmd extends BaseCmd {
 
-    public static final String APINAME = "updateAnnotationVisibility";
 
     @Parameter(name = ApiConstants.ID, type = CommandType.STRING, required = true,
             description = "the id of the annotation")
@@ -62,11 +61,6 @@ public class UpdateAnnotationVisibilityCmd extends BaseCmd {
         this.setResponseObject(annotationResponse);
     }
 
-    @Override
-    public String getCommandName() {
-        return String.format("%s%s", APINAME.toLowerCase(), BaseCmd.RESPONSE_SUFFIX);
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
index 16406b730e1..e1f7859a56b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/autoscale/DeleteCounterCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteCounterCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteCounterCmd.class.getName());
-    private static final String s_name = "deletecounterresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -73,11 +72,6 @@ public class DeleteCounterCmd extends BaseAsyncCmd {
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public Long getId() {
         return id;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java
index a405fd6d4a7..08523712d12 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/DeleteBackupOfferingCmd.java
@@ -37,12 +37,11 @@ import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 
-@APICommand(name = DeleteBackupOfferingCmd.APINAME,
+@APICommand(name = "deleteBackupOffering",
         description = "Deletes a backup offering",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin})
 public class DeleteBackupOfferingCmd extends BaseCmd {
-    public static final String APINAME = "deleteBackupOffering";
 
     @Inject
     private BackupManager backupManager;
@@ -80,11 +79,6 @@ public class DeleteBackupOfferingCmd extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java
index f682f4cddd1..7d3902bc490 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ImportBackupOfferingCmd.java
@@ -41,12 +41,11 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = ImportBackupOfferingCmd.APINAME,
+@APICommand(name = "importBackupOffering",
         description = "Imports a backup offering using a backup provider",
         responseObject = BackupOfferingResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin})
 public class ImportBackupOfferingCmd extends BaseAsyncCmd {
-    public static final String APINAME = "importBackupOffering";
 
     @Inject
     private BackupManager backupManager;
@@ -123,11 +122,6 @@ public class ImportBackupOfferingCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java
index 2e5657d7d79..e60a598913f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProviderOfferingsCmd.java
@@ -38,12 +38,11 @@ import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = ListBackupProviderOfferingsCmd.APINAME,
+@APICommand(name = "listBackupProviderOfferings",
         description = "Lists external backup offerings of the provider",
         responseObject = BackupOfferingResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin})
 public class ListBackupProviderOfferingsCmd extends BaseBackupListCmd {
-    public static final String APINAME = "listBackupProviderOfferings";
 
     @Inject
     private BackupManager backupManager;
@@ -87,8 +86,4 @@ public class ListBackupProviderOfferingsCmd extends BaseBackupListCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
     }
-}
\ No newline at end of file
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
index 2b4b735be2a..17575076444 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/ListBackupProvidersCmd.java
@@ -33,12 +33,11 @@ import org.apache.cloudstack.backup.BackupProvider;
 
 import com.cloud.user.Account;
 
-@APICommand(name = ListBackupProvidersCmd.APINAME,
+@APICommand(name = "listBackupProviders",
         description = "Lists Backup and Recovery providers",
         responseObject = BackupProviderResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin})
 public class ListBackupProvidersCmd extends BaseCmd {
-    public static final String APINAME = "listBackupProviders";
 
     @Inject
     private BackupManager backupManager;
@@ -58,11 +57,6 @@ public class ListBackupProvidersCmd extends BaseCmd {
         return name;
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java
index 2a8ee2b8313..1cd6f4a8328 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java
@@ -40,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16.0")
 public class UpdateBackupOfferingCmd extends BaseCmd {
     private static final Logger LOGGER = Logger.getLogger(UpdateBackupOfferingCmd.class.getName());
-    private static final String APINAME = "updateBackupOffering";
 
     @Inject
     private BackupManager backupManager;
@@ -106,11 +105,6 @@ public class UpdateBackupOfferingCmd extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
@@ -125,4 +119,4 @@ public class UpdateBackupOfferingCmd extends BaseCmd {
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.BackupOffering;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
index f26c97408ce..4c543fdb6a8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
@@ -41,7 +41,7 @@ import org.apache.log4j.Logger;
 
 import com.cloud.event.EventTypes;
 
-@APICommand(name = IssueCertificateCmd.APINAME,
+@APICommand(name = "issueCertificate",
         description = "Issues a client certificate using configured or provided CA plugin",
         responseObject = CertificateResponse.class,
         requestHasSensitiveInfo = true,
@@ -51,7 +51,6 @@ import com.cloud.event.EventTypes;
 public class IssueCertificateCmd extends BaseAsyncCmd {
     private static final Logger LOG = Logger.getLogger(IssueCertificateCmd.class);
 
-    public static final String APINAME = "issueCertificate";
 
     @Inject
     private CAManager caManager;
@@ -140,11 +139,6 @@ public class IssueCertificateCmd extends BaseAsyncCmd {
         setResponseObject(certificateResponse);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
index e1e8e375163..13cf7550c93 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
@@ -34,7 +34,7 @@ import org.apache.cloudstack.framework.ca.CAProvider;
 
 import com.cloud.user.Account;
 
-@APICommand(name = ListCAProvidersCmd.APINAME,
+@APICommand(name = "listCAProviders",
         description = "Lists available certificate authority providers in CloudStack",
         responseObject = CAProviderResponse.class,
         requestHasSensitiveInfo = false,
@@ -42,7 +42,6 @@ import com.cloud.user.Account;
         since = "4.11.0",
         authorized = {RoleType.Admin})
 public class ListCAProvidersCmd extends BaseCmd {
-    public static final String APINAME = "listCAProviders";
 
     @Inject
     private CAManager caManager;
@@ -66,11 +65,6 @@ public class ListCAProvidersCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
index 9f0e0530eba..feb69e167ac 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
@@ -32,7 +32,7 @@ import org.apache.cloudstack.ca.CAManager;
 import com.cloud.user.Account;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = ListCaCertificateCmd.APINAME,
+@APICommand(name = "listCaCertificate",
         description = "Lists the CA public certificate(s) as support by the configured/provided CA plugin",
         responseObject = CertificateResponse.class,
         requestHasSensitiveInfo = false,
@@ -40,7 +40,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
         since = "4.11.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class ListCaCertificateCmd extends BaseCmd {
-    public static final String APINAME = "listCaCertificate";
 
     @Inject
     private CAManager caManager;
@@ -78,11 +77,6 @@ public class ListCaCertificateCmd extends BaseCmd {
         setResponseObject(certificateResponse);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.Type.NORMAL.ordinal();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
index 99f3eae2aea..a39985549ac 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
@@ -25,7 +25,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostResponse;
@@ -36,7 +35,7 @@ import org.apache.cloudstack.context.CallContext;
 import com.cloud.event.EventTypes;
 import com.cloud.host.Host;
 
-@APICommand(name = ProvisionCertificateCmd.APINAME,
+@APICommand(name = "provisionCertificate",
         description = "Issues and propagates client certificate on a connected host/agent using configured CA plugin",
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false,
@@ -44,7 +43,6 @@ import com.cloud.host.Host;
         since = "4.11.0",
         authorized = {RoleType.Admin})
 public class ProvisionCertificateCmd extends BaseAsyncCmd {
-    public static final String APINAME = "provisionCertificate";
 
     @Inject
     private CAManager caManager;
@@ -98,11 +96,6 @@ public class ProvisionCertificateCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
index f3277b5d4e0..381bed65f95 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
@@ -36,7 +36,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.event.EventTypes;
 
-@APICommand(name = RevokeCertificateCmd.APINAME,
+@APICommand(name = "revokeCertificate",
         description = "Revokes certificate using configured CA plugin",
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = true,
@@ -45,7 +45,6 @@ import com.cloud.event.EventTypes;
         authorized = {RoleType.Admin})
 public class RevokeCertificateCmd extends BaseAsyncCmd {
 
-    public static final String APINAME = "revokeCertificate";
 
     @Inject
     private CAManager caManager;
@@ -94,11 +93,6 @@ public class RevokeCertificateCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
index e258d72ca38..df48b2511b6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
 public class AddClusterCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName());
 
-    private static final String s_name = "addclusterresponse";
 
     @Parameter(name = ApiConstants.CLUSTER_NAME, type = CommandType.STRING, required = true, description = "the cluster name")
     private String clusterName;
@@ -181,11 +180,6 @@ public class AddClusterCmd extends BaseCmd {
         return hypervisor;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public String getClusterType() {
         return clusterType;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
index 7493c7c45e5..497cef4c3ec 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/DeleteClusterCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
 public class DeleteClusterCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteClusterCmd.class.getName());
 
-    private static final String s_name = "deleteclusterresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -56,11 +55,6 @@ public class DeleteClusterCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
index d03c6743880..d83330c664a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
@@ -38,7 +38,6 @@ import com.cloud.utils.Pair;
 public class ListClustersCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListClustersCmd.class.getName());
 
-    private static final String s_name = "listclustersresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -119,11 +118,6 @@ public class ListClustersCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     protected Pair<List<ClusterResponse>, Integer> getClusterResponses() {
         Pair<List<? extends Cluster>, Integer> result = _mgr.searchForClusters(this);
         List<ClusterResponse> clusterResponses = new ArrayList<ClusterResponse>();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
index 99c62a17ebc..dd527fb409a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.Account;
 public class UpdateClusterCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddClusterCmd.class.getName());
 
-    private static final String s_name = "updateclusterresponse";
 
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ClusterResponse.class, required = true, description = "the ID of the Cluster")
     private Long id;
@@ -72,11 +71,6 @@ public class UpdateClusterCmd extends BaseCmd {
         return hypervisor;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public String getClusterType() {
         return clusterType;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
index 80ebaf43f64..b47bb6b87d5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java
@@ -42,7 +42,6 @@ import com.cloud.utils.Pair;
 public class ListCfgsByCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListCfgsByCmd.class.getName());
 
-    private static final String s_name = "listconfigurationsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -144,11 +143,6 @@ public class ListCfgsByCmd extends BaseListCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends Configuration>, Integer> result = _mgr.searchForConfigurations(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
index b5a24b9bda8..4f5186a6df6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListDeploymentPlannersCmd.java
@@ -31,7 +31,6 @@ import org.apache.cloudstack.api.response.ListResponse;
 public class ListDeploymentPlannersCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListDeploymentPlannersCmd.class.getName());
 
-    private static final String s_name = "listdeploymentplannersresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -45,11 +44,6 @@ public class ListDeploymentPlannersCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         List<String> planners = _mgr.listDeploymentPlanners();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
index 6d3c2012af7..64f1c19b70c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListHypervisorCapabilitiesCmd.java
@@ -41,7 +41,6 @@ import com.cloud.utils.Pair;
 public class ListHypervisorCapabilitiesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListHypervisorCapabilitiesCmd.class.getName());
 
-    private static final String s_name = "listhypervisorcapabilitiesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -73,11 +72,6 @@ public class ListHypervisorCapabilitiesCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends HypervisorCapabilities>, Integer> hpvCapabilities =
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java
index 28a69cebc1e..ada389e0093 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java
@@ -42,7 +42,6 @@ import com.cloud.utils.Pair;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16.0")
 public class ResetCfgCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(ResetCfgCmd.class.getName());
-    private static final String s_name = "resetconfigurationresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -123,11 +122,6 @@ public class ResetCfgCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
index 0770f3c5a54..abe7e31cfa2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java
@@ -41,7 +41,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateCfgCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateCfgCmd.class.getName());
-    private static final String s_name = "updateconfigurationresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -134,11 +133,6 @@ public class UpdateCfgCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
index 8eb844614f7..02cdf1a0717 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateHypervisorCapabilitiesCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
             responseHasSensitiveInfo = false)
 public class UpdateHypervisorCapabilitiesCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateHypervisorCapabilitiesCmd.class.getName());
-    private static final String s_name = "updatehypervisorcapabilitiesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -100,11 +99,6 @@ public class UpdateHypervisorCapabilitiesCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java
index b414857908e..553ba6b1729 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/GetDiagnosticsDataCmd.java
@@ -43,7 +43,7 @@ import com.cloud.user.Account;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine;
 
-@APICommand(name = GetDiagnosticsDataCmd.APINAME,
+@APICommand(name = "getDiagnosticsData",
         responseObject = GetDiagnosticsDataResponse.class,
         entityType = {VirtualMachine.class},
         responseHasSensitiveInfo = false,
@@ -52,7 +52,6 @@ import com.cloud.vm.VirtualMachine;
         since = "4.14.0.0",
         authorized = {RoleType.Admin})
 public class GetDiagnosticsDataCmd extends BaseAsyncCmd {
-    public static final String APINAME = "getDiagnosticsData";
 
     @Inject
     private DiagnosticsService diagnosticsService;
@@ -90,11 +89,6 @@ public class GetDiagnosticsDataCmd extends BaseAsyncCmd {
     /////////////////// Implementation //////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java
index f4e15d78643..3d3c7410dc5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/diagnostics/RunDiagnosticsCmd.java
@@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.RunDiagnosticsResponse;
@@ -47,7 +46,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 import com.cloud.vm.VirtualMachine;
 
-@APICommand(name = RunDiagnosticsCmd.APINAME, responseObject = RunDiagnosticsResponse.class, entityType = {VirtualMachine.class},
+@APICommand(name = "runDiagnostics", responseObject = RunDiagnosticsResponse.class, entityType = {VirtualMachine.class},
         responseHasSensitiveInfo = false,
         requestHasSensitiveInfo = false,
         description = "Execute network-utility command (ping/arping/tracert) on system VMs remotely",
@@ -55,7 +54,6 @@ import com.cloud.vm.VirtualMachine;
         since = "4.12.0.0")
 public class RunDiagnosticsCmd extends BaseAsyncCmd {
     private static final Logger LOGGER = Logger.getLogger(RunDiagnosticsCmd.class);
-    public static final String APINAME = "runDiagnostics";
 
     @Inject
     private DiagnosticsService diagnosticsService;
@@ -108,11 +106,6 @@ public class RunDiagnosticsCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////////// Implementation //////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
@@ -182,4 +175,4 @@ public class RunDiagnosticsCmd extends BaseAsyncCmd {
             throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
         }
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java
index 21480c1ef53..53b29a37f8f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ListTemplateDirectDownloadCertificatesCmd.java
@@ -24,7 +24,6 @@ import com.cloud.exception.ResourceUnavailableException;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
@@ -42,7 +41,7 @@ import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 
-@APICommand(name = ListTemplateDirectDownloadCertificatesCmd.APINAME,
+@APICommand(name = "listTemplateDirectDownloadCertificates",
         description = "List the uploaded certificates for direct download templates",
         responseObject = DirectDownloadCertificateResponse.class,
         since = "4.17.0",
@@ -65,7 +64,6 @@ public class ListTemplateDirectDownloadCertificatesCmd extends BaseListCmd {
     private Boolean listHosts;
 
     private static final Logger LOG = Logger.getLogger(ListTemplateDirectDownloadCertificatesCmd.class);
-    public static final String APINAME = "listTemplateDirectDownloadCertificates";
 
     public boolean isListHosts() {
         return listHosts != null && listHosts;
@@ -98,11 +96,6 @@ public class ListTemplateDirectDownloadCertificatesCmd extends BaseListCmd {
         createResponse(certificates);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java
index b7574b438d0..88f538547e1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java
@@ -38,14 +38,13 @@ import org.apache.cloudstack.direct.download.DirectDownloadManager;
 
 import javax.inject.Inject;
 
-@APICommand(name = ProvisionTemplateDirectDownloadCertificateCmd.APINAME,
+@APICommand(name = "provisionTemplateDirectDownloadCertificate",
         description = "Provisions a host with a direct download certificate",
         responseObject = DirectDownloadCertificateHostStatusResponse.class,
         since = "4.17.0",
         authorized = {RoleType.Admin})
 public class ProvisionTemplateDirectDownloadCertificateCmd extends BaseCmd {
 
-    public static final String APINAME = "provisionTemplateDirectDownloadCertificate";
 
     @Inject
     DirectDownloadManager directDownloadManager;
@@ -66,11 +65,6 @@ public class ProvisionTemplateDirectDownloadCertificateCmd extends BaseCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java
index 507d73f134e..e44ebd31274 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/RevokeTemplateDirectDownloadCertificateCmd.java
@@ -47,7 +47,7 @@ import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 
-@APICommand(name = RevokeTemplateDirectDownloadCertificateCmd.APINAME,
+@APICommand(name = "revokeTemplateDirectDownloadCertificate",
         description = "Revoke a direct download certificate from hosts in a zone",
         responseObject = DirectDownloadCertificateHostStatusResponse.class,
         since = "4.13",
@@ -58,7 +58,6 @@ public class RevokeTemplateDirectDownloadCertificateCmd extends BaseCmd {
     DirectDownloadManager directDownloadManager;
 
     private static final Logger LOG = Logger.getLogger(RevokeTemplateDirectDownloadCertificateCmd.class);
-    public static final String APINAME = "revokeTemplateDirectDownloadCertificate";
 
     @Parameter(name = ApiConstants.ID, type = CommandType.UUID,
             entityType = DirectDownloadCertificateResponse.class,
@@ -120,13 +119,8 @@ public class RevokeTemplateDirectDownloadCertificateCmd extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java
index e403f11baac..d41cf667907 100755
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java
@@ -1,123 +1,117 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-package org.apache.cloudstack.api.command.admin.direct.download;
-
-import com.cloud.utils.Pair;
-import com.cloud.utils.exception.CloudRuntimeException;
-import org.apache.cloudstack.acl.RoleType;
-import org.apache.cloudstack.api.APICommand;
-import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
-import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.response.DirectDownloadCertificateResponse;
-import org.apache.cloudstack.api.response.HostResponse;
-import org.apache.cloudstack.api.response.DirectDownloadCertificateHostStatusResponse;
-import org.apache.cloudstack.api.response.ZoneResponse;
-import org.apache.cloudstack.context.CallContext;
-import org.apache.cloudstack.direct.download.DirectDownloadCertificate;
-import org.apache.cloudstack.direct.download.DirectDownloadManager;
-import org.apache.cloudstack.direct.download.DirectDownloadManager.HostCertificateStatus;
-import org.apache.log4j.Logger;
-
-import javax.inject.Inject;
-import java.util.ArrayList;
-import java.util.List;
-
-@APICommand(name = UploadTemplateDirectDownloadCertificateCmd.APINAME,
-        description = "Upload a certificate for HTTPS direct template download on KVM hosts",
-        responseObject = DirectDownloadCertificateResponse.class,
-        since = "4.11.0",
-        authorized = {RoleType.Admin})
-public class UploadTemplateDirectDownloadCertificateCmd extends BaseCmd {
-
-    @Inject
-    DirectDownloadManager directDownloadManager;
-
-    private static final Logger LOG = Logger.getLogger(UploadTemplateDirectDownloadCertificateCmd.class);
-    public static final String APINAME = "uploadTemplateDirectDownloadCertificate";
-
-    @Parameter(name = ApiConstants.CERTIFICATE, type = BaseCmd.CommandType.STRING, required = true, length = 65535,
-            description = "SSL certificate")
-    private String certificate;
-
-    @Parameter(name = ApiConstants.NAME , type = BaseCmd.CommandType.STRING, required = true,
-            description = "Name for the uploaded certificate")
-    private String name;
-
-    @Parameter(name = ApiConstants.HYPERVISOR, type = BaseCmd.CommandType.STRING, required = true, description = "Hypervisor type")
-    private String hypervisor;
-
-    @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class,
-            description = "Zone to upload certificate", required = true)
-    private Long zoneId;
-
-    @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class,
-            description = "(optional) the host ID to upload certificate")
-    private Long hostId;
-
-    private void createResponse(DirectDownloadCertificate certificate, final List<HostCertificateStatus> hostStatusList) {
-        final List<DirectDownloadCertificateHostStatusResponse> hostMapsResponse = new ArrayList<>();
-        if (certificate == null) {
-            throw new CloudRuntimeException("Unable to upload certificate");
-        }
-        DirectDownloadCertificateResponse response = _responseGenerator.createDirectDownloadCertificateResponse(certificate);
-        for (final HostCertificateStatus status : hostStatusList) {
-            if (status == null) {
-                continue;
-            }
-            DirectDownloadCertificateHostStatusResponse uploadResponse =
-                    _responseGenerator.createDirectDownloadCertificateHostStatusResponse(status);
-            hostMapsResponse.add(uploadResponse);
-        }
-        response.setHostsMap(hostMapsResponse);
-        response.setResponseName(getCommandName());
-        response.setObjectName("uploadtemplatedirectdownloadcertificate");
-        setResponseObject(response);
-    }
-
-    @Override
-    public void execute() {
-        if (!hypervisor.equalsIgnoreCase("kvm")) {
-            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Currently supporting KVM hosts only");
-        }
-
-        try {
-            LOG.debug("Uploading certificate " + name + " to agents for Direct Download");
-            Pair<DirectDownloadCertificate, List<HostCertificateStatus>> uploadStatus =
-                    directDownloadManager.uploadCertificateToHosts(certificate, name, hypervisor, zoneId, hostId);
-            DirectDownloadCertificate certificate = uploadStatus.first();
-            List<HostCertificateStatus> hostStatus = uploadStatus.second();
-            createResponse(certificate, hostStatus);
-        } catch (Exception e) {
-            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
-        }
-    }
-
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
-    @Override
-    public long getEntityOwnerId() {
-        return CallContext.current().getCallingAccount().getId();
-    }
-}
-
-
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package org.apache.cloudstack.api.command.admin.direct.download;
+
+import com.cloud.utils.Pair;
+import com.cloud.utils.exception.CloudRuntimeException;
+import org.apache.cloudstack.acl.RoleType;
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.response.DirectDownloadCertificateResponse;
+import org.apache.cloudstack.api.response.HostResponse;
+import org.apache.cloudstack.api.response.DirectDownloadCertificateHostStatusResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.cloudstack.context.CallContext;
+import org.apache.cloudstack.direct.download.DirectDownloadCertificate;
+import org.apache.cloudstack.direct.download.DirectDownloadManager;
+import org.apache.cloudstack.direct.download.DirectDownloadManager.HostCertificateStatus;
+import org.apache.log4j.Logger;
+
+import javax.inject.Inject;
+import java.util.ArrayList;
+import java.util.List;
+
+@APICommand(name = "uploadTemplateDirectDownloadCertificate",
+        description = "Upload a certificate for HTTPS direct template download on KVM hosts",
+        responseObject = DirectDownloadCertificateResponse.class,
+        since = "4.11.0",
+        authorized = {RoleType.Admin})
+public class UploadTemplateDirectDownloadCertificateCmd extends BaseCmd {
+
+    @Inject
+    DirectDownloadManager directDownloadManager;
+
+    private static final Logger LOG = Logger.getLogger(UploadTemplateDirectDownloadCertificateCmd.class);
+
+    @Parameter(name = ApiConstants.CERTIFICATE, type = BaseCmd.CommandType.STRING, required = true, length = 65535,
+            description = "SSL certificate")
+    private String certificate;
+
+    @Parameter(name = ApiConstants.NAME , type = BaseCmd.CommandType.STRING, required = true,
+            description = "Name for the uploaded certificate")
+    private String name;
+
+    @Parameter(name = ApiConstants.HYPERVISOR, type = BaseCmd.CommandType.STRING, required = true, description = "Hypervisor type")
+    private String hypervisor;
+
+    @Parameter(name = ApiConstants.ZONE_ID, type = CommandType.UUID, entityType = ZoneResponse.class,
+            description = "Zone to upload certificate", required = true)
+    private Long zoneId;
+
+    @Parameter(name = ApiConstants.HOST_ID, type = CommandType.UUID, entityType = HostResponse.class,
+            description = "(optional) the host ID to upload certificate")
+    private Long hostId;
+
+    private void createResponse(DirectDownloadCertificate certificate, final List<HostCertificateStatus> hostStatusList) {
+        final List<DirectDownloadCertificateHostStatusResponse> hostMapsResponse = new ArrayList<>();
+        if (certificate == null) {
+            throw new CloudRuntimeException("Unable to upload certificate");
+        }
+        DirectDownloadCertificateResponse response = _responseGenerator.createDirectDownloadCertificateResponse(certificate);
+        for (final HostCertificateStatus status : hostStatusList) {
+            if (status == null) {
+                continue;
+            }
+            DirectDownloadCertificateHostStatusResponse uploadResponse =
+                    _responseGenerator.createDirectDownloadCertificateHostStatusResponse(status);
+            hostMapsResponse.add(uploadResponse);
+        }
+        response.setHostsMap(hostMapsResponse);
+        response.setResponseName(getCommandName());
+        response.setObjectName("uploadtemplatedirectdownloadcertificate");
+        setResponseObject(response);
+    }
+
+    @Override
+    public void execute() {
+        if (!hypervisor.equalsIgnoreCase("kvm")) {
+            throw new ServerApiException(ApiErrorCode.PARAM_ERROR, "Currently supporting KVM hosts only");
+        }
+
+        try {
+            LOG.debug("Uploading certificate " + name + " to agents for Direct Download");
+            Pair<DirectDownloadCertificate, List<HostCertificateStatus>> uploadStatus =
+                    directDownloadManager.uploadCertificateToHosts(certificate, name, hypervisor, zoneId, hostId);
+            DirectDownloadCertificate certificate = uploadStatus.first();
+            List<HostCertificateStatus> hostStatus = uploadStatus.second();
+            createResponse(certificate, hostStatus);
+        } catch (Exception e) {
+            throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage());
+        }
+    }
+
+    @Override
+    public long getEntityOwnerId() {
+        return CallContext.current().getCallingAccount().getId();
+    }
+}
+
+
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
index 149ddab6ffa..f6e09695f88 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/CreateDomainCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class CreateDomainCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateDomainCmd.class.getName());
 
-    private static final String s_name = "createdomainresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -82,11 +81,6 @@ public class CreateDomainCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
index 4302089dbc3..e0783b63098 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/DeleteDomainCmd.java
@@ -41,7 +41,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized =
         RoleType.Admin, RoleType.DomainAdmin })
 public class DeleteDomainCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteDomainCmd.class.getName());
-    private static final String s_name = "deletedomainresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -74,11 +73,6 @@ public class DeleteDomainCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Domain domain = _entityMgr.findById(Domain.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
index fb6c5be56ac..72614627f31 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/ListDomainChildrenCmd.java
@@ -39,7 +39,6 @@ import com.cloud.utils.Pair;
 public class ListDomainChildrenCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListDomainChildrenCmd.class.getName());
 
-    private static final String s_name = "listdomainchildrenresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -93,11 +92,6 @@ public class ListDomainChildrenCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends Domain>, Integer> result = _domainService.searchForDomainChildren(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
index 76cc3292c9f..db4030da772 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/domain/UpdateDomainCmd.java
@@ -38,7 +38,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateDomainCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateDomainCmd.class.getName());
-    private static final String s_name = "updatedomainresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -78,11 +77,6 @@ public class UpdateDomainCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
index 891ecb6d47b..3adc711f35f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsCmd.java
@@ -43,7 +43,6 @@ import java.util.Map;
 public class AddGuestOsCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(AddGuestOsCmd.class.getName());
 
-    private static final String s_name = "addguestosresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -98,11 +97,6 @@ public class AddGuestOsCmd extends BaseAsyncCreateCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java
index 79e82d6f5d4..6d9ac5286c8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/AddGuestOsMappingCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class AddGuestOsMappingCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(AddGuestOsMappingCmd.class.getName());
 
-    private static final String s_name = "addguestosmappingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -86,11 +85,6 @@ public class AddGuestOsMappingCmd extends BaseAsyncCreateCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java
index a7fc9e0decd..70c039fef7d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/ListGuestOsMappingCmd.java
@@ -37,7 +37,6 @@ import com.cloud.utils.Pair;
 public class ListGuestOsMappingCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListGuestOsMappingCmd.class.getName());
 
-    private static final String s_name = "listguestosmappingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -79,11 +78,6 @@ public class ListGuestOsMappingCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends GuestOSHypervisor>, Integer> result = _mgr.listGuestOSMappingByCriteria(this);
@@ -98,4 +92,4 @@ public class ListGuestOsMappingCmd extends BaseListCmd {
         response.setResponseName(getCommandName());
         setResponseObject(response);
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java
index fc8c9e641a2..14beb83e073 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class RemoveGuestOsCmd extends BaseAsyncCmd {
 
     public static final Logger s_logger = Logger.getLogger(RemoveGuestOsCmd.class.getName());
-    private static final String s_name = "removeguestosresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -58,11 +57,6 @@ public class RemoveGuestOsCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java
index 690bc9f94b7..0a72b7e0451 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/RemoveGuestOsMappingCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class RemoveGuestOsMappingCmd extends BaseAsyncCmd {
 
     public static final Logger s_logger = Logger.getLogger(RemoveGuestOsMappingCmd.class.getName());
-    private static final String s_name = "removeguestosmappingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -58,11 +57,6 @@ public class RemoveGuestOsMappingCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
index d67ffc66e95..1168bf00ffc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsCmd.java
@@ -42,7 +42,6 @@ public class UpdateGuestOsCmd extends BaseAsyncCmd {
 
     public static final Logger s_logger = Logger.getLogger(UpdateGuestOsCmd.class.getName());
 
-    private static final String s_name = "updateguestosresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -89,11 +88,6 @@ public class UpdateGuestOsCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java
index 2683a21dfcf..679ec35c049 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/guest/UpdateGuestOsMappingCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.Account;
 public class UpdateGuestOsMappingCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateGuestOsMappingCmd.class.getName());
 
-    private static final String s_name = "updateguestosmappingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -74,11 +73,6 @@ public class UpdateGuestOsMappingCmd extends BaseAsyncCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
index 2fe76420781..12033c04b80 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
@@ -31,7 +31,6 @@ import org.apache.cloudstack.api.ApiArgValidator;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostHAResponse;
@@ -42,12 +41,11 @@ import org.apache.cloudstack.ha.HAResource;
 
 import javax.inject.Inject;
 
-@APICommand(name = ConfigureHAForHostCmd.APINAME, description = "Configures HA for a host",
+@APICommand(name = "configureHAForHost", description = "Configures HA for a host",
         responseObject = HostHAResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class ConfigureHAForHostCmd extends BaseAsyncCmd {
-    public static final String APINAME = "configureHAForHost";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -80,11 +78,6 @@ public final class ConfigureHAForHostCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
index 053c978b831..d570746765b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
@@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager;
 
 import javax.inject.Inject;
 
-@APICommand(name = DisableHAForClusterCmd.APINAME, description = "Disables HA cluster-wide",
+@APICommand(name = "disableHAForCluster", description = "Disables HA cluster-wide",
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class DisableHAForClusterCmd extends BaseAsyncCmd {
-    public static final String APINAME = "disableHAForCluster";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -70,11 +69,6 @@ public final class DisableHAForClusterCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
index 87ebe878ceb..5a8b1f1954f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
@@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiArgValidator;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostHAResponse;
@@ -41,12 +40,11 @@ import org.apache.cloudstack.ha.HAResource;
 
 import javax.inject.Inject;
 
-@APICommand(name = DisableHAForHostCmd.APINAME, description = "Disables HA for a host",
+@APICommand(name = "disableHAForHost", description = "Disables HA for a host",
         responseObject = HostHAResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class DisableHAForHostCmd extends BaseAsyncCmd {
-    public static final String APINAME = "disableHAForHost";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -71,11 +69,6 @@ public final class DisableHAForHostCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
index 845c4a663b5..fbd57fa82a1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
@@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager;
 
 import javax.inject.Inject;
 
-@APICommand(name = DisableHAForZoneCmd.APINAME, description = "Disables HA for a zone",
+@APICommand(name = "disableHAForZone", description = "Disables HA for a zone",
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class DisableHAForZoneCmd extends BaseAsyncCmd {
-    public static final String APINAME = "disableHAForZone";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -70,11 +69,6 @@ public final class DisableHAForZoneCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
index e06d0d2c1b0..7e627939ca5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
@@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager;
 
 import javax.inject.Inject;
 
-@APICommand(name = EnableHAForClusterCmd.APINAME, description = "Enables HA cluster-wide",
+@APICommand(name = "enableHAForCluster", description = "Enables HA cluster-wide",
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class EnableHAForClusterCmd extends BaseAsyncCmd {
-    public static final String APINAME = "enableHAForCluster";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -70,11 +69,6 @@ public final class EnableHAForClusterCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
index b23841ad56f..aac3d350519 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
@@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiArgValidator;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostHAResponse;
@@ -41,12 +40,11 @@ import org.apache.cloudstack.ha.HAResource;
 
 import javax.inject.Inject;
 
-@APICommand(name = EnableHAForHostCmd.APINAME, description = "Enables HA for a host",
+@APICommand(name = "enableHAForHost", description = "Enables HA for a host",
         responseObject = HostHAResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class EnableHAForHostCmd extends BaseAsyncCmd {
-    public static final String APINAME = "enableHAForHost";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -71,11 +69,6 @@ public final class EnableHAForHostCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
index 443d303c296..f9b1560bd8a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
@@ -40,12 +40,11 @@ import org.apache.cloudstack.ha.HAConfigManager;
 
 import javax.inject.Inject;
 
-@APICommand(name = EnableHAForZoneCmd.APINAME, description = "Enables HA for a zone",
+@APICommand(name = "enableHAForZone", description = "Enables HA for a zone",
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class EnableHAForZoneCmd extends BaseAsyncCmd {
-    public static final String APINAME = "enableHAForZone";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -70,11 +69,6 @@ public final class EnableHAForZoneCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
index 58f227cca13..808e0b4e801 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
@@ -42,11 +42,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-@APICommand(name = ListHostHAProvidersCmd.APINAME, description = "Lists HA providers", responseObject = HostHAResponse.class,
+@APICommand(name = "listHostHAProviders", description = "Lists HA providers", responseObject = HostHAResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class ListHostHAProvidersCmd extends BaseCmd {
-    public static final String APINAME = "listHostHAProviders";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -71,11 +70,6 @@ public final class ListHostHAProvidersCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
index 75a900c2198..c610a605277 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
@@ -42,11 +42,10 @@ import javax.inject.Inject;
 import java.util.ArrayList;
 import java.util.List;
 
-@APICommand(name = ListHostHAResourcesCmd.APINAME, description = "Lists host HA resources", responseObject = HostHAResponse.class,
+@APICommand(name = "listHostHAResources", description = "Lists host HA resources", responseObject = HostHAResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.11", authorized = {RoleType.Admin})
 public final class ListHostHAResourcesCmd extends BaseCmd {
-    public static final String APINAME = "listHostHAResources";
 
     @Inject
     private HAConfigManager haConfigManager;
@@ -71,11 +70,6 @@ public final class ListHostHAResourcesCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
index b58aaf345ae..15955b9f0a8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddHostCmd.java
@@ -42,7 +42,6 @@ import com.cloud.user.Account;
 public class AddHostCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddHostCmd.class.getName());
 
-    private static final String s_name = "addhostresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -126,11 +125,6 @@ public class AddHostCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
index 9108d600419..225eb1dfecd 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/AddSecondaryStorageCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class AddSecondaryStorageCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddSecondaryStorageCmd.class.getName());
-    private static final String s_name = "addsecondarystorageresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -63,11 +62,6 @@ public class AddSecondaryStorageCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java
index 9d6a575bc62..4e9d997b3b7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelHostAsDegradedCmd.java
@@ -62,11 +62,6 @@ public class CancelHostAsDegradedCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return COMMAND_RESPONSE_NAME;
-    }
-
     public static String getResultObjectName() {
         return "host";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
index a584c057595..cca449f570b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/CancelMaintenanceCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class CancelMaintenanceCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(CancelMaintenanceCmd.class.getName());
 
-    private static final String s_name = "cancelhostmaintenanceresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -58,11 +57,6 @@ public class CancelMaintenanceCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "host";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java
index c6188eadb8d..6bb8f382e54 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeclareHostAsDegradedCmd.java
@@ -62,11 +62,6 @@ public class DeclareHostAsDegradedCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return COMMAND_RESPONSE_NAME;
-    }
-
     public static String getResultObjectName() {
         return "host";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
index b9945281296..609d189b0ca 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/DeleteHostCmd.java
@@ -34,7 +34,6 @@ import com.cloud.user.Account;
 public class DeleteHostCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteHostCmd.class.getName());
 
-    private static final String s_name = "deletehostresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -73,11 +72,6 @@ public class DeleteHostCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
index ad9b6af3436..2b6ccb68eea 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java
@@ -39,7 +39,6 @@ import com.cloud.utils.Ternary;
 public class FindHostsForMigrationCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(FindHostsForMigrationCmd.class.getName());
 
-    private static final String s_name = "findhostsformigrationresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -64,11 +63,6 @@ public class FindHostsForMigrationCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         ListResponse<HostForMigrationResponse> response = null;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java
index 7adb3a14d19..ed4f9a09bc5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostTagsCmd.java
@@ -29,7 +29,6 @@ import org.apache.cloudstack.api.response.HostTagResponse;
 public class ListHostTagsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListHostTagsCmd.class.getName());
 
-    private static final String s_name = "listhosttagsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -43,11 +42,6 @@ public class ListHostTagsCmd extends BaseListCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.Host;
@@ -61,4 +55,4 @@ public class ListHostTagsCmd extends BaseListCmd {
 
         setResponseObject(response);
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
index 1ec8f6bf5dc..75fe339b710 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java
@@ -47,7 +47,6 @@ import com.cloud.utils.Ternary;
 public class ListHostsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListHostsCmd.class.getName());
 
-    private static final String s_name = "listhostsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -192,11 +191,6 @@ public class ListHostsCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.Host;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
index fc228225c2e..a89965e822e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/PrepareForMaintenanceCmd.java
@@ -37,7 +37,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 public class PrepareForMaintenanceCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(PrepareForMaintenanceCmd.class.getName());
 
-    private static final String s_name = "preparehostformaintenanceresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -58,11 +57,6 @@ public class PrepareForMaintenanceCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "host";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
index 82625280270..7439d9da514 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReconnectHostCmd.java
@@ -38,7 +38,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 public class ReconnectHostCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ReconnectHostCmd.class.getName());
 
-    private static final String s_name = "reconnecthostresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -59,11 +58,6 @@ public class ReconnectHostCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "host";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
index c0d339e86b7..90c388bc7dc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/ReleaseHostReservationCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class ReleaseHostReservationCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ReleaseHostReservationCmd.class.getName());
 
-    private static final String s_name = "releasehostreservationresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -58,11 +57,6 @@ public class ReleaseHostReservationCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
index 40f19388934..5ca53c07740 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostCmd.java
@@ -36,7 +36,6 @@ import java.util.List;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateHostCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateHostCmd.class.getName());
-    private static final String s_name = "updatehostresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -104,11 +103,6 @@ public class UpdateHostCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "updatehost";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
index 5a884cf72ab..f94d23c4b0b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/host/UpdateHostPasswordCmd.java
@@ -32,7 +32,6 @@ requestHasSensitiveInfo = true, responseHasSensitiveInfo = false)
 public class UpdateHostPasswordCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateHostPasswordCmd.class.getName());
 
-    private static final String s_name = "updatehostpasswordresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -82,11 +81,6 @@ public class UpdateHostPasswordCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
index 7e39749ff17..1c7e4a0ce21 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ConfigureInternalLoadBalancerElementCmd.java
@@ -48,7 +48,6 @@ import com.cloud.user.Account;
             responseHasSensitiveInfo = false)
 public class ConfigureInternalLoadBalancerElementCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ConfigureInternalLoadBalancerElementCmd.class.getName());
-    private static final String s_name = "configureinternalloadbalancerelementresponse";
 
     @Inject
     private List<InternalLoadBalancerElementService> _service;
@@ -83,11 +82,6 @@ public class ConfigureInternalLoadBalancerElementCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
index b9c61f3bf90..f11f081031a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/CreateInternalLoadBalancerElementCmd.java
@@ -46,7 +46,6 @@ import com.cloud.user.Account;
             responseHasSensitiveInfo = false)
 public class CreateInternalLoadBalancerElementCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateInternalLoadBalancerElementCmd.class.getName());
-    private static final String s_name = "createinternalloadbalancerelementresponse";
 
     @Inject
     private List<InternalLoadBalancerElementService> _service;
@@ -78,11 +77,6 @@ public class CreateInternalLoadBalancerElementCmd extends BaseAsyncCreateCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
index 8f62b419691..82d373e3119 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/internallb/ListInternalLoadBalancerElementsCmd.java
@@ -47,7 +47,6 @@ import com.cloud.network.VirtualRouterProvider;
             responseHasSensitiveInfo = false)
 public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListInternalLoadBalancerElementsCmd.class.getName());
-    private static final String s_name = "listinternalloadbalancerelementsresponse";
 
     @Inject
     private InternalLoadBalancerElementService _service;
@@ -86,11 +85,6 @@ public class ListInternalLoadBalancerElementsCmd extends BaseListCmd {
         return enabled;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
         ResourceAllocationException {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java
index 4e2ae10da54..3af772d332f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/management/ListMgmtsCmd.java
@@ -19,19 +19,17 @@ package org.apache.cloudstack.api.command.admin.management;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.ManagementServerResponse;
 import org.apache.log4j.Logger;
 
-@APICommand(name = ListMgmtsCmd.APINAME, description = "Lists management servers.", responseObject = ManagementServerResponse.class,
+@APICommand(name = "listManagementServers", description = "Lists management servers.", responseObject = ManagementServerResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListMgmtsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListMgmtsCmd.class.getName());
 
-    public static final String APINAME = "listManagementServers";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -59,11 +57,6 @@ public class ListMgmtsCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.Host;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
index 68c43c449e2..be0cd9f2fa7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkDeviceCmd.java
@@ -45,7 +45,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
             requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class AddNetworkDeviceCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddNetworkDeviceCmd.class);
-    private static final String s_name = "addnetworkdeviceresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -86,11 +85,6 @@ public class AddNetworkDeviceCmd extends BaseCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         // TODO Auto-generated method stub
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
index 756c35fc233..176375ce181 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/AddNetworkServiceProviderCmd.java
@@ -45,7 +45,6 @@ import com.cloud.user.Account;
 public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(AddNetworkServiceProviderCmd.class.getName());
 
-    private static final String s_name = "addnetworkserviceproviderresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -97,11 +96,6 @@ public class AddNetworkServiceProviderCmd extends BaseAsyncCreateCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java
index 4f69be1b417..d7c7bec99f9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java
@@ -37,7 +37,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 
-@APICommand(name = CreateGuestNetworkIpv6PrefixCmd.APINAME,
+@APICommand(name = "createGuestNetworkIpv6Prefix",
         description = "Creates a guest network IPv6 prefix.",
         responseObject = DataCenterGuestIpv6PrefixResponse.class,
         since = "4.17.0.0",
@@ -47,7 +47,6 @@ import com.cloud.user.Account;
 public class CreateGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(CreateGuestNetworkIpv6PrefixCmd.class);
 
-    public static final String APINAME = "createGuestNetworkIpv6Prefix";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -102,11 +101,6 @@ public class CreateGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java
index d7aa7484cff..2bab4f05352 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateManagementNetworkIpRangeCmd.java
@@ -36,7 +36,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 
-@APICommand(name = CreateManagementNetworkIpRangeCmd.APINAME,
+@APICommand(name = "createManagementNetworkIpRange",
         description = "Creates a Management network IP range.",
         responseObject = PodResponse.class,
         since = "4.11.0.0",
@@ -46,7 +46,6 @@ import com.cloud.user.Account;
 public class CreateManagementNetworkIpRangeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(CreateManagementNetworkIpRangeCmd.class);
 
-    public static final String APINAME = "createManagementNetworkIpRange";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -150,11 +149,6 @@ public class CreateManagementNetworkIpRangeCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index eb8e9c6ec8e..1126edd1d44 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -50,7 +50,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class CreateNetworkOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateNetworkOfferingCmd.class.getName());
-    private static final String s_name = "createnetworkofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -201,10 +200,6 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
         return networkRate;
     }
 
-    public static String getName() {
-        return s_name;
-    }
-
     public Long getServiceOfferingId() {
         return serviceOfferingId;
     }
@@ -362,11 +357,6 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
index 9819cde6b4e..294ee047fe6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreatePhysicalNetworkCmd.java
@@ -42,7 +42,6 @@ import com.cloud.user.Account;
 public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreatePhysicalNetworkCmd.class.getName());
 
-    private static final String s_name = "createphysicalnetworkresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -120,11 +119,6 @@ public class CreatePhysicalNetworkCmd extends BaseAsyncCreateCmd {
         return networkName;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
index 6d3e9f0549b..d2dc3d8688f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateStorageNetworkIpRangeCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
 public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(CreateStorageNetworkIpRangeCmd.class);
 
-    private static final String s_name = "createstoragenetworkiprangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -125,11 +124,6 @@ public class CreateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
index e8fc7b383b9..e6a289d096b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DedicateGuestVlanRangeCmd.java
@@ -41,7 +41,6 @@ import com.cloud.user.Account;
 public class DedicateGuestVlanRangeCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DedicateGuestVlanRangeCmd.class.getName());
 
-    private static final String s_name = "dedicateguestvlanrangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -94,11 +93,6 @@ public class DedicateGuestVlanRangeCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java
index 830aeac8dae..67d309456d6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java
@@ -37,7 +37,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = DeleteGuestNetworkIpv6PrefixCmd.APINAME,
+@APICommand(name = "deleteGuestNetworkIpv6Prefix",
         description = "Deletes an existing guest network IPv6 prefix.",
         responseObject = SuccessResponse.class,
         since = "4.17.0.0",
@@ -46,7 +46,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
         authorized = {RoleType.Admin})
 public class DeleteGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteGuestNetworkIpv6PrefixCmd.class);
-    public static final String APINAME = "deleteGuestNetworkIpv6Prefix";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -89,11 +88,6 @@ public class DeleteGuestNetworkIpv6PrefixCmd extends BaseAsyncCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java
index ae7a0f70473..abb72eb2724 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteManagementNetworkIpRangeCmd.java
@@ -34,7 +34,7 @@ import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 
-@APICommand(name = DeleteManagementNetworkIpRangeCmd.APINAME,
+@APICommand(name = "deleteManagementNetworkIpRange",
         description = "Deletes a management network IP range. This action is only allowed when no IPs in this range are allocated.",
         responseObject = SuccessResponse.class,
         since = "4.11.0.0",
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
 public class DeleteManagementNetworkIpRangeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteManagementNetworkIpRangeCmd.class);
 
-    public static final String APINAME = "deleteManagementNetworkIpRange";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -124,14 +123,9 @@ public class DeleteManagementNetworkIpRangeCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
index abd9c11e7f0..d7e8744d6b7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkDeviceCmd.java
@@ -41,7 +41,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteNetworkDeviceCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteNetworkDeviceCmd.class);
-    private static final String s_name = "deletenetworkdeviceresponse";
 
     @Inject
     ExternalNetworkDeviceManager nwDeviceMgr;
@@ -77,11 +76,6 @@ public class DeleteNetworkDeviceCmd extends BaseCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         // TODO Auto-generated method stub
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
index 62de3dd1752..80ce48cc7d9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkOfferingCmd.java
@@ -33,7 +33,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteNetworkOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteNetworkOfferingCmd.class.getName());
-    private static final String s_name = "deletenetworkofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -58,11 +57,6 @@ public class DeleteNetworkOfferingCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
index fc752e8f881..1ccfff5d7ba 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteNetworkServiceProviderCmd.java
@@ -38,7 +38,6 @@ import com.cloud.user.Account;
 public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteNetworkServiceProviderCmd.class.getName());
 
-    private static final String s_name = "deletenetworkserviceproviderresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -63,11 +62,6 @@ public class DeleteNetworkServiceProviderCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
index 06619aecc36..79f0685c6c6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeletePhysicalNetworkCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class DeletePhysicalNetworkCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeletePhysicalNetworkCmd.class.getName());
 
-    private static final String s_name = "deletephysicalnetworkresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -61,11 +60,6 @@ public class DeletePhysicalNetworkCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
index c4317278af6..b5de43dc5e2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteStorageNetworkIpRangeCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
 public class DeleteStorageNetworkIpRangeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteStorageNetworkIpRangeCmd.class);
 
-    private static final String s_name = "deletestoragenetworkiprangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -83,11 +82,6 @@ public class DeleteStorageNetworkIpRangeCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
index 617a07b5c8c..67324d81927 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListDedicatedGuestVlanRangesCmd.java
@@ -41,7 +41,6 @@ import com.cloud.utils.Pair;
 public class ListDedicatedGuestVlanRangesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListDedicatedGuestVlanRangesCmd.class.getName());
 
-    private static final String s_name = "listdedicatedguestvlanrangesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -112,11 +111,6 @@ public class ListDedicatedGuestVlanRangesCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java
index d31a3ba3351..a9885ffbd63 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.java
@@ -29,7 +29,7 @@ import org.apache.cloudstack.api.response.ZoneResponse;
 
 import com.cloud.dc.DataCenterGuestIpv6Prefix;
 
-@APICommand(name = ListGuestNetworkIpv6PrefixesCmd.APINAME,
+@APICommand(name = "listGuestNetworkIpv6Prefixes",
         description = "Lists guest network IPv6 prefixes",
         responseObject = DataCenterGuestIpv6PrefixResponse.class,
         since = "4.17.0",
@@ -38,7 +38,6 @@ import com.cloud.dc.DataCenterGuestIpv6Prefix;
 
 public class ListGuestNetworkIpv6PrefixesCmd extends BaseListCmd {
 
-    public static final String APINAME = "listGuestNetworkIpv6Prefixes";
 
     @Parameter(name = ApiConstants.ID,
             type = CommandType.UUID,
@@ -80,9 +79,4 @@ public class ListGuestNetworkIpv6PrefixesCmd extends BaseListCmd {
         this.setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
     }
-
-}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java
index dc9df12467b..1daeac9c53d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java
@@ -41,7 +41,6 @@ import com.cloud.utils.Pair;
 public class ListGuestVlansCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListGuestVlansCmd.class.getName());
 
-    private static final String s_name = "listguestvlansresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -90,11 +89,6 @@ public class ListGuestVlansCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends GuestVlan>, Integer> vlans = _networkService.listGuestVlans(this);
@@ -110,4 +104,4 @@ public class ListGuestVlansCmd extends BaseListCmd {
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
index 8242df94025..04b9584b819 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkIsolationMethodsCmd.java
@@ -34,7 +34,6 @@ import com.cloud.network.Networks;
             responseHasSensitiveInfo = false)
 public class ListNetworkIsolationMethodsCmd extends BaseListCmd {
 
-    private static final String s_name = "listnetworkisolationmethodsresponse";
 
     @Override
     public void execute() {
@@ -54,9 +53,4 @@ public class ListNetworkIsolationMethodsCmd extends BaseListCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
     }
-
-}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
index 94b859716e4..67fc8292a93 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListNetworkServiceProvidersCmd.java
@@ -41,7 +41,6 @@ import com.cloud.utils.Pair;
             responseHasSensitiveInfo = false)
 public class ListNetworkServiceProvidersCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListNetworkServiceProvidersCmd.class.getName());
-    private static final String Name = "listnetworkserviceprovidersresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -79,11 +78,6 @@ public class ListNetworkServiceProvidersCmd extends BaseListCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return Name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
index e495fd6a398..b8f30d3f7a1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListPhysicalNetworksCmd.java
@@ -40,7 +40,6 @@ import com.cloud.utils.Pair;
 public class ListPhysicalNetworksCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListPhysicalNetworksCmd.class.getName());
 
-    private static final String s_name = "listphysicalnetworksresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -75,11 +74,6 @@ public class ListPhysicalNetworksCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
index b3f8b8197a4..c22ec8ee19b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListStorageNetworkIpRangeCmd.java
@@ -104,11 +104,6 @@ public class ListStorageNetworkIpRangeCmd extends BaseListCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return _name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
index 39e99a43a6c..361da2d0db4 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListSupportedNetworkServicesCmd.java
@@ -41,7 +41,6 @@ import com.cloud.user.Account;
             responseHasSensitiveInfo = false)
 public class ListSupportedNetworkServicesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListSupportedNetworkServicesCmd.class.getName());
-    private static final String s_name = "listsupportednetworkservicesresponse";
 
     @Parameter(name = ApiConstants.PROVIDER, type = CommandType.STRING, description = "network service provider name")
     private String providerName;
@@ -72,11 +71,6 @@ public class ListSupportedNetworkServicesCmd extends BaseListCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java
index 95ed1234cf9..b38e8f453b0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateNetworkCmd.java
@@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.ServerApiException;
@@ -40,7 +39,7 @@ import com.cloud.offering.NetworkOffering;
 import com.cloud.user.Account;
 import com.cloud.user.User;
 
-@APICommand(name = MigrateNetworkCmd.APINAME, description = "moves a network to another physical network",
+@APICommand(name = "migrateNetwork", description = "moves a network to another physical network",
             responseObject = NetworkResponse.class,
             responseView = ResponseView.Restricted,
             entityType = {Network.class},
@@ -51,7 +50,6 @@ import com.cloud.user.User;
 public class MigrateNetworkCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(MigrateNetworkCmd.class.getName());
 
-    public static final String APINAME = "migrateNetwork";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -86,11 +84,6 @@ public class MigrateNetworkCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Network network = _networkService.getNetwork(id);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java
index a5611c67aa4..cca367ce750 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/MigrateVPCCmd.java
@@ -28,7 +28,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ResponseObject;
 import org.apache.cloudstack.api.ServerApiException;
@@ -41,7 +40,7 @@ import com.cloud.network.vpc.Vpc;
 import com.cloud.user.Account;
 import com.cloud.user.User;
 
-@APICommand(name = MigrateVPCCmd.APINAME,
+@APICommand(name = "migrateVPC",
             description = "moves a vpc to another physical network",
             responseObject = VpcResponse.class,
             responseView = ResponseObject.ResponseView.Restricted,
@@ -53,7 +52,6 @@ import com.cloud.user.User;
 public class MigrateVPCCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(MigrateVPCCmd.class.getName());
 
-    public static final String APINAME = "migrateVPC";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -106,11 +104,6 @@ public class MigrateVPCCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public void execute() {
         User callerUser = _accountService.getActiveUser(CallContext.current().getCallingUserId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
index f6e49491fdf..916357920a1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/ReleaseDedicatedGuestVlanRangeCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ReleaseDedicatedGuestVlanRangeCmd.class.getName());
-    private static final String s_name = "releasededicatedguestvlanrangeresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -54,11 +53,6 @@ public class ReleaseDedicatedGuestVlanRangeCmd extends BaseAsyncCmd {
     // ///////////////// Accessors ///////////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public Long getId() {
         return id;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
index 61a2d8a8fdc..57c34822759 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkOfferingCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateNetworkOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateNetworkOfferingCmd.class.getName());
-    private static final String s_name = "updatenetworkofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -194,11 +193,6 @@ public class UpdateNetworkOfferingCmd extends BaseCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
index a448ed77df3..1bbf21b85ed 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateNetworkServiceProviderCmd.java
@@ -42,7 +42,6 @@ import com.cloud.user.Account;
 public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateNetworkServiceProviderCmd.class.getName());
 
-    private static final String s_name = "updatenetworkserviceproviderresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -79,11 +78,6 @@ public class UpdateNetworkServiceProviderCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
index 6f0cc3f6015..24fd93f49d1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.Account;
 public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(UpdatePhysicalNetworkCmd.class.getName());
 
-    private static final String s_name = "updatephysicalnetworkresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -84,11 +83,6 @@ public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java
index ee59631b9eb..4e880f122d8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java
@@ -33,7 +33,7 @@ import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.user.Account;
 
-@APICommand(name = UpdatePodManagementNetworkIpRangeCmd.APINAME,
+@APICommand(name = "updatePodManagementNetworkIpRange",
         description = "Updates a management network IP range. Only allowed when no IPs are allocated.",
         responseObject = SuccessResponse.class,
         since = "4.16.0.0",
@@ -44,7 +44,6 @@ public class UpdatePodManagementNetworkIpRangeCmd extends BaseAsyncCmd {
 
     public static final Logger s_logger = Logger.getLogger(UpdatePodManagementNetworkIpRangeCmd.class);
 
-    public static final String APINAME = "updatePodManagementNetworkIpRange";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -119,11 +118,6 @@ public class UpdatePodManagementNetworkIpRangeCmd extends BaseAsyncCmd {
         return "Updating pod management IP range " + getNewStartIP() + "-" + getNewEndIP() + " of Pod: " + getPodId();
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
index d82c28d1bff..459c89debc9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdateStorageNetworkIpRangeCmd.java
@@ -42,7 +42,6 @@ import com.cloud.user.Account;
             responseHasSensitiveInfo = false)
 public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateStorageNetworkIpRangeCmd.class);
-    private static final String s_name = "updatestoragenetworkiprangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -114,11 +113,6 @@ public class UpdateStorageNetworkIpRangeCmd extends BaseAsyncCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
index 46a8936e498..304b29071e6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateDiskOfferingCmd.java
@@ -48,7 +48,6 @@ import com.cloud.user.Account;
 public class CreateDiskOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateDiskOfferingCmd.class.getName());
 
-    private static final String s_name = "creatediskofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -326,11 +325,6 @@ public class CreateDiskOfferingCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
index a1c28d21981..24f5682a218 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java
@@ -48,7 +48,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class CreateServiceOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateServiceOfferingCmd.class.getName());
-    private static final String s_name = "createserviceofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -487,11 +486,6 @@ public class CreateServiceOfferingCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
index 8987d50066e..0159cd297f9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteDiskOfferingCmd.java
@@ -33,7 +33,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteDiskOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteDiskOfferingCmd.class.getName());
-    private static final String s_name = "deletediskofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -54,11 +53,6 @@ public class DeleteDiskOfferingCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
index 2a07fff9b15..9b7f9d48e30 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/DeleteServiceOfferingCmd.java
@@ -33,7 +33,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteServiceOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteServiceOfferingCmd.class.getName());
-    private static final String s_name = "deleteserviceofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -58,11 +57,6 @@ public class DeleteServiceOfferingCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
index f05c74eef7c..fe7ac869dbb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateDiskOfferingCmd.java
@@ -41,7 +41,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateDiskOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateDiskOfferingCmd.class.getName());
-    private static final String s_name = "updatediskofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -270,11 +269,6 @@ public class UpdateDiskOfferingCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
index 42532932dca..68f40df60fc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java
@@ -41,7 +41,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateServiceOfferingCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateServiceOfferingCmd.class.getName());
-    private static final String s_name = "updateserviceofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -180,11 +179,6 @@ public class UpdateServiceOfferingCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java
index 0bd029afbd3..dad6506729a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ChangeOutOfBandManagementPasswordCmd.java
@@ -29,7 +29,6 @@ import org.apache.cloudstack.api.ApiArgValidator;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostResponse;
@@ -40,11 +39,10 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Inject;
 
-@APICommand(name = ChangeOutOfBandManagementPasswordCmd.APINAME, description = "Changes out-of-band management interface password on the host and updates the interface configuration in CloudStack if the operation succeeds, else reverts the old password",
+@APICommand(name = "changeOutOfBandManagementPassword", description = "Changes out-of-band management interface password on the host and updates the interface configuration in CloudStack if the operation succeeds, else reverts the old password",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = true, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class ChangeOutOfBandManagementPasswordCmd extends BaseAsyncCmd {
-    public static final String APINAME = "changeOutOfBandManagementPassword";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -79,11 +77,6 @@ public class ChangeOutOfBandManagementPasswordCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java
index f58d52100c2..699e2855185 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/ConfigureOutOfBandManagementCmd.java
@@ -40,11 +40,10 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.inject.Inject;
 
-@APICommand(name = ConfigureOutOfBandManagementCmd.APINAME, description = "Configures a host's out-of-band management interface",
+@APICommand(name = "configureOutOfBandManagement", description = "Configures a host's out-of-band management interface",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = true, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class ConfigureOutOfBandManagementCmd extends BaseCmd {
-    public static final String APINAME = "configureOutOfBandManagement";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -89,11 +88,6 @@ public class ConfigureOutOfBandManagementCmd extends BaseCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java
index 67d84d50966..604aae66889 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForClusterCmd.java
@@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService;
 
 import javax.inject.Inject;
 
-@APICommand(name = DisableOutOfBandManagementForClusterCmd.APINAME, description = "Disables out-of-band management for a cluster",
+@APICommand(name = "disableOutOfBandManagementForCluster", description = "Disables out-of-band management for a cluster",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class DisableOutOfBandManagementForClusterCmd extends BaseAsyncCmd {
-    public static final String APINAME = "disableOutOfBandManagementForCluster";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -77,11 +76,6 @@ public class DisableOutOfBandManagementForClusterCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     final public Long getClusterId() {
         return clusterId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java
index 009d0d3fd16..51c0fbcc3db 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForHostCmd.java
@@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService;
 
 import javax.inject.Inject;
 
-@APICommand(name = DisableOutOfBandManagementForHostCmd.APINAME, description = "Disables out-of-band management for a host",
+@APICommand(name = "disableOutOfBandManagementForHost", description = "Disables out-of-band management for a host",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class DisableOutOfBandManagementForHostCmd extends BaseAsyncCmd {
-    public static final String APINAME = "disableOutOfBandManagementForHost";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -78,11 +77,6 @@ public class DisableOutOfBandManagementForHostCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     final public Long getHostId() {
         return hostId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java
index 82e92a75ea6..4c3e92cf05d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/DisableOutOfBandManagementForZoneCmd.java
@@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService;
 
 import javax.inject.Inject;
 
-@APICommand(name = DisableOutOfBandManagementForZoneCmd.APINAME, description = "Disables out-of-band management for a zone",
+@APICommand(name = "disableOutOfBandManagementForZone", description = "Disables out-of-band management for a zone",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class DisableOutOfBandManagementForZoneCmd extends BaseAsyncCmd {
-    public static final String APINAME = "disableOutOfBandManagementForZone";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -77,11 +76,6 @@ public class DisableOutOfBandManagementForZoneCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     final public Long getZoneId() {
         return zoneId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java
index 64279c3a6db..a69f27fb3ac 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForClusterCmd.java
@@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService;
 
 import javax.inject.Inject;
 
-@APICommand(name = EnableOutOfBandManagementForClusterCmd.APINAME, description = "Enables out-of-band management for a cluster",
+@APICommand(name = "enableOutOfBandManagementForCluster", description = "Enables out-of-band management for a cluster",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class EnableOutOfBandManagementForClusterCmd extends BaseAsyncCmd {
-    public static final String APINAME = "enableOutOfBandManagementForCluster";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -77,11 +76,6 @@ public class EnableOutOfBandManagementForClusterCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     final public Long getClusterId() {
         return clusterId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java
index 746725602dd..5e32c8943bf 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForHostCmd.java
@@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService;
 
 import javax.inject.Inject;
 
-@APICommand(name = EnableOutOfBandManagementForHostCmd.APINAME, description = "Enables out-of-band management for a host",
+@APICommand(name = "enableOutOfBandManagementForHost", description = "Enables out-of-band management for a host",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class EnableOutOfBandManagementForHostCmd extends BaseAsyncCmd {
-    public static final String APINAME = "enableOutOfBandManagementForHost";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -78,11 +77,6 @@ public class EnableOutOfBandManagementForHostCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     final public Long getHostId() {
         return hostId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java
index cae21813303..4eea4d50fe0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/EnableOutOfBandManagementForZoneCmd.java
@@ -40,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService;
 
 import javax.inject.Inject;
 
-@APICommand(name = EnableOutOfBandManagementForZoneCmd.APINAME, description = "Enables out-of-band management for a zone",
+@APICommand(name = "enableOutOfBandManagementForZone", description = "Enables out-of-band management for a zone",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class EnableOutOfBandManagementForZoneCmd extends BaseAsyncCmd {
-    public static final String APINAME = "enableOutOfBandManagementForZone";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -77,11 +76,6 @@ public class EnableOutOfBandManagementForZoneCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     final public Long getZoneId() {
         return zoneId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java
index d61f62c1b0a..d10664f0a25 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/outofbandmanagement/IssueOutOfBandManagementPowerActionCmd.java
@@ -30,7 +30,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.HostResponse;
@@ -41,11 +40,10 @@ import org.apache.cloudstack.outofbandmanagement.OutOfBandManagementService;
 
 import javax.inject.Inject;
 
-@APICommand(name = IssueOutOfBandManagementPowerActionCmd.APINAME, description = "Initiates the specified power action to the host's out-of-band management interface",
+@APICommand(name = "issueOutOfBandManagementPowerAction", description = "Initiates the specified power action to the host's out-of-band management interface",
         responseObject = OutOfBandManagementResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         since = "4.9.0", authorized = {RoleType.Admin})
 public class IssueOutOfBandManagementPowerActionCmd extends BaseAsyncCmd {
-    public static final String APINAME = "issueOutOfBandManagementPowerAction";
 
     @Inject
     private OutOfBandManagementService outOfBandManagementService;
@@ -85,11 +83,6 @@ public class IssueOutOfBandManagementPowerActionCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
index 9a060e01345..33fe6c759b2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/CreatePodCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.Account;
 public class CreatePodCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreatePodCmd.class.getName());
 
-    private static final String s_name = "createpodresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -102,13 +101,6 @@ public class CreatePodCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
-
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
index 454bfd079b0..bdb9ef26694 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/DeletePodCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
 public class DeletePodCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeletePodCmd.class.getName());
 
-    private static final String s_name = "deletepodresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -56,11 +55,6 @@ public class DeletePodCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
index 3cc03f24d7c..c0e26a32eee 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/ListPodsByCmd.java
@@ -37,7 +37,6 @@ import com.cloud.utils.Pair;
 public class ListPodsByCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListPodsByCmd.class.getName());
 
-    private static final String s_name = "listpodsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -86,11 +85,6 @@ public class ListPodsByCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends Pod>, Integer> result = _mgr.searchForPods(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
index d49e9bd981e..99ab5e1cee4 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/pod/UpdatePodCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
 public class UpdatePodCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdatePodCmd.class.getName());
 
-    private static final String s_name = "updatepodresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -98,11 +97,6 @@ public class UpdatePodCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
index f6743baf625..61bf32ab822 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/AddRegionCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class AddRegionCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddRegionCmd.class.getName());
 
-    private static final String s_name = "addregionresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -74,11 +73,6 @@ public class AddRegionCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
index c28a29c6e9f..61deceb0691 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/CreatePortableIpRangeCmd.java
@@ -45,7 +45,6 @@ public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd {
 
     public static final Logger s_logger = Logger.getLogger(CreatePortableIpRangeCmd.class.getName());
 
-    private static final String s_name = "createportableiprangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -101,11 +100,6 @@ public class CreatePortableIpRangeCmd extends BaseAsyncCreateCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
index 415456f9414..180e34c7a8f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/RemoveRegionCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class RemoveRegionCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(RemoveRegionCmd.class.getName());
-    private static final String s_name = "removeregionresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -59,11 +58,6 @@ public class RemoveRegionCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
index b08cbbbb10c..c772efd5e1f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/region/UpdateRegionCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateRegionCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateRegionCmd.class.getName());
-    private static final String s_name = "updateregionresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -74,11 +73,6 @@ public class UpdateRegionCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
index 79b3520b0b4..003b823e106 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ArchiveAlertsCmd.java
@@ -39,7 +39,6 @@ public class ArchiveAlertsCmd extends BaseCmd {
 
     public static final Logger s_logger = Logger.getLogger(ArchiveAlertsCmd.class.getName());
 
-    private static final String s_name = "archivealertsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -87,11 +86,6 @@ public class ArchiveAlertsCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
index 246b25785b3..eb384892758 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/DeleteAlertsCmd.java
@@ -39,7 +39,6 @@ public class DeleteAlertsCmd extends BaseCmd {
 
     public static final Logger s_logger = Logger.getLogger(DeleteAlertsCmd.class.getName());
 
-    private static final String s_name = "deletealertsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -87,11 +86,6 @@ public class DeleteAlertsCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
index 8f21263b85c..3471ab60837 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
@@ -36,7 +36,6 @@ public class ListAlertsCmd extends BaseListCmd {
 
     public static final Logger s_logger = Logger.getLogger(ListAlertsCmd.class.getName());
 
-    private static final String s_name = "listalertsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -71,11 +70,6 @@ public class ListAlertsCmd extends BaseListCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends Alert>, Integer> result = _mgr.searchForAlerts(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
index 76ca3a79b11..253677616f0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/ListCapacityCmd.java
@@ -43,7 +43,6 @@ public class ListCapacityCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListCapacityCmd.class.getName());
     private static final DecimalFormat s_percentFormat = new DecimalFormat("##.##");
 
-    private static final String s_name = "listcapacityresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -114,11 +113,6 @@ public class ListCapacityCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         List<? extends Capacity> result = null;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java
index a3f9fe9df76..7ee3e50e0cd 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/StartRollingMaintenanceCmd.java
@@ -26,7 +26,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ClusterResponse;
@@ -47,7 +46,7 @@ import com.cloud.resource.RollingMaintenanceManager;
 import com.cloud.utils.Pair;
 import com.cloud.utils.Ternary;
 
-@APICommand(name = StartRollingMaintenanceCmd.APINAME, description = "Start rolling maintenance",
+@APICommand(name = "startRollingMaintenance", description = "Start rolling maintenance",
         responseObject = RollingMaintenanceResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         authorized = {RoleType.Admin})
@@ -58,7 +57,6 @@ public class StartRollingMaintenanceCmd extends BaseAsyncCmd {
 
     public static final Logger s_logger = Logger.getLogger(StartRollingMaintenanceCmd.class.getName());
 
-    public static final String APINAME = "startRollingMaintenance";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -142,11 +140,6 @@ public class StartRollingMaintenanceCmd extends BaseAsyncCmd {
         this.setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
@@ -210,4 +203,4 @@ public class StartRollingMaintenanceCmd extends BaseAsyncCmd {
         }
         return null;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
index e8d6cc55d6d..5dfada57216 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/UploadCustomCertificateCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.Account;
 public class UploadCustomCertificateCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(UploadCustomCertificateCmd.class.getName());
 
-    private static final String s_name = "uploadcustomcertificateresponse";
 
     @Parameter(name = ApiConstants.CERTIFICATE, type = CommandType.STRING, required = true, description = "The certificate to be uploaded.", length = 65535)
     private String certificate;
@@ -90,11 +89,6 @@ public class UploadCustomCertificateCmd extends BaseAsyncCmd {
         return ("Uploading custom certificate to the db, and applying it to all the cpvms in the system");
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "certificate";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java
index de45839bb09..8fb02ea7054 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java
@@ -39,7 +39,6 @@ import java.util.List;
 public class DeleteResourceIconCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteResourceIconCmd.class.getName());
 
-    private static final String s_name = "deleteresourceiconresponse";
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
@@ -87,11 +86,6 @@ public class DeleteResourceIconCmd extends BaseCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();// Let's give the caller here for event logging.
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/ListResourceIconCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/ListResourceIconCmd.java
index bc8eb009072..0af11ceec22 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/ListResourceIconCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/ListResourceIconCmd.java
@@ -37,7 +37,6 @@ import java.util.List;
 public class ListResourceIconCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(ListResourceIconCmd.class.getName());
 
-    private static final String s_name = "listresourceiconresponse";
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
@@ -74,11 +73,6 @@ public class ListResourceIconCmd extends BaseCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java
index 3075bf3a1ab..ea5d8995a2a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java
@@ -48,7 +48,6 @@ import java.util.List;
 public class UploadResourceIconCmd extends BaseCmd {
     public static final Logger LOGGER = Logger.getLogger(UploadResourceIconCmd.class.getName());
 
-    private static final String s_name = "uploadresourceiconresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -126,11 +125,6 @@ public class UploadResourceIconCmd extends BaseCmd {
         }
         return true;
     }
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();// Let's give the caller here for event logging.
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
index d3b4896e53b..a1b01a1c04f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureOvsElementCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
 public class ConfigureOvsElementCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger
         .getLogger(ConfigureOvsElementCmd.class.getName());
-    private static final String s_name = "configureovselementresponse";
     @Inject
     private List<VirtualRouterElementService> _service;
 
@@ -81,11 +80,6 @@ public class ConfigureOvsElementCmd extends BaseAsyncCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "boolean";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
index 575920cc327..b7f7a050d07 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ConfigureVirtualRouterElementCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ConfigureVirtualRouterElementCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ConfigureVirtualRouterElementCmd.class.getName());
-    private static final String s_name = "configurevirtualrouterelementresponse";
 
     @Inject
     private List<VirtualRouterElementService> _service;
@@ -87,11 +86,6 @@ public class ConfigureVirtualRouterElementCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "boolean";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
index 4bb6d9066c7..f93ca35a06a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/CreateVirtualRouterElementCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class CreateVirtualRouterElementCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateVirtualRouterElementCmd.class.getName());
-    private static final String s_name = "createvirtualrouterelementresponse";
 
     @Inject
     private List<VirtualRouterElementService> _service;
@@ -94,11 +93,6 @@ public class CreateVirtualRouterElementCmd extends BaseAsyncCreateCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
index b6b370a6ba4..d2dce6b9ff3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/DestroyRouterCmd.java
@@ -39,7 +39,6 @@ import com.cloud.vm.VirtualMachine;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DestroyRouterCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DestroyRouterCmd.class.getName());
-    private static final String s_name = "destroyrouterresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -60,11 +59,6 @@ public class DestroyRouterCmd extends BaseAsyncCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java
index dc1020b4a3b..93a48eba49c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/GetRouterHealthCheckResultsCmd.java
@@ -39,7 +39,7 @@ import com.cloud.user.Account;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine;
 
-@APICommand(name = GetRouterHealthCheckResultsCmd.APINAME,
+@APICommand(name = "getRouterHealthCheckResults",
         responseObject = RouterHealthCheckResultsListResponse.class,
         description = "Starts a router.",
         entityType = {VirtualMachine.class},
@@ -48,7 +48,6 @@ import com.cloud.vm.VirtualMachine;
         since = "4.14.0")
 public class GetRouterHealthCheckResultsCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(GetRouterHealthCheckResultsCmd.class.getName());
-    public static final String APINAME = "getRouterHealthCheckResults";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -78,11 +77,6 @@ public class GetRouterHealthCheckResultsCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getRouterId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
index 75c69564188..89b39f87e44 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListOvsElementsCmd.java
@@ -44,7 +44,6 @@ import com.cloud.network.element.VirtualRouterElementService;
 public class ListOvsElementsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger
         .getLogger(ListNetworkOfferingsCmd.class.getName());
-    private static final String Name = "listovselementsresponse";
     @Inject
     private List<VirtualRouterElementService> _service;
     // ///////////////////////////////////////////////////
@@ -87,11 +86,6 @@ public class ListOvsElementsCmd extends BaseListCmd {
         return enabled;
     }
 
-    @Override
-    public String getCommandName() {
-        return Name;
-    }
-
     @Override
     public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
         ResourceAllocationException {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
index e5c689dcd87..6e955e46212 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListRoutersCmd.java
@@ -42,7 +42,6 @@ import com.cloud.vm.VirtualMachine;
 public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListRoutersCmd.class.getName());
 
-    private static final String s_name = "listroutersresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -154,11 +153,6 @@ public class ListRoutersCmd extends BaseListProjectAndAccountResourcesCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.DomainRouter;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
index b77aa06ad76..6eb24dce074 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
@@ -43,7 +43,6 @@ import com.cloud.network.element.VirtualRouterElementService;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListVirtualRouterElementsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListVirtualRouterElementsCmd.class.getName());
-    private static final String s_name = "listvirtualrouterelementsresponse";
 
     // TODO, VirtualRouterElementServer is not singleton in system!
     @Inject
@@ -92,11 +91,6 @@ public class ListVirtualRouterElementsCmd extends BaseListCmd {
         return enabled;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
         ResourceAllocationException {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
index bc0e6e8dee7..6e334d7e442 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/RebootRouterCmd.java
@@ -40,7 +40,6 @@ import com.cloud.vm.VirtualMachine;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class RebootRouterCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(RebootRouterCmd.class.getName());
-    private static final String s_name = "rebootrouterresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -64,11 +63,6 @@ public class RebootRouterCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
index 25235cb0434..121b2a1bd11 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StartRouterCmd.java
@@ -42,7 +42,6 @@ import com.cloud.vm.VirtualMachine;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class StartRouterCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(StartRouterCmd.class.getName());
-    private static final String s_name = "startrouterresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -63,11 +62,6 @@ public class StartRouterCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "router";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
index dc970ce61ad..b9e15661268 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/StopRouterCmd.java
@@ -41,7 +41,6 @@ import com.cloud.vm.VirtualMachine;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class StopRouterCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(StopRouterCmd.class.getName());
-    private static final String s_name = "stoprouterresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -65,11 +64,6 @@ public class StopRouterCmd extends BaseAsyncCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
index 067d344337b..2d5255614c6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
@@ -35,7 +35,6 @@ import com.cloud.vm.VirtualMachine;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpgradeRouterCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpgradeRouterCmd.class.getName());
-    private static final String s_name = "changeserviceforrouterresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -67,11 +66,6 @@ public class UpgradeRouterCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         VirtualRouter router = _entityMgr.findById(VirtualRouter.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
index 2004910c9f4..fa0fe5800ee 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpgradeRouterTemplateCmd.class.getName());
-    private static final String s_name = "upgraderoutertemplateresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -107,11 +106,6 @@ public class UpgradeRouterTemplateCmd extends org.apache.cloudstack.api.BaseCmd
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
index 839d64dcf9d..b8ab1461a2b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/AddImageStoreCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class AddImageStoreCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddImageStoreCmd.class.getName());
-    private static final String s_name = "addimagestoreresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -119,11 +118,6 @@ public class AddImageStoreCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
index b3c0437e9bf..08069446893 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class CreateSecondaryStagingStoreCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateSecondaryStagingStoreCmd.class.getName());
-    private static final String s_name = "createsecondarystagingstoreresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -95,11 +94,6 @@ public class CreateSecondaryStagingStoreCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
index ae44bc93732..0eacc5cda6b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateStoragePoolCmd.java
@@ -43,7 +43,6 @@ import com.cloud.user.Account;
 public class CreateStoragePoolCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateStoragePoolCmd.class.getName());
 
-    private static final String s_name = "createstoragepoolresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -147,11 +146,6 @@ public class CreateStoragePoolCmd extends BaseCmd {
         return hypervisor;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
index ad812adf0cb..194f0baf603 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteImageStoreCmd.java
@@ -34,7 +34,6 @@ import com.cloud.user.Account;
 public class DeleteImageStoreCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteImageStoreCmd.class.getName());
 
-    private static final String s_name = "deleteimagestoreresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -55,11 +54,6 @@ public class DeleteImageStoreCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
index 5465fd1440f..d87768e7f39 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeletePoolCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeletePoolCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeletePoolCmd.class.getName());
-    private static final String s_name = "deletestoragepoolresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -64,11 +63,6 @@ public class DeletePoolCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
index 16398623359..34a26461fa8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/DeleteSecondaryStagingStoreCmd.java
@@ -34,7 +34,6 @@ import com.cloud.user.Account;
 public class DeleteSecondaryStagingStoreCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteSecondaryStagingStoreCmd.class.getName());
 
-    private static final String s_name = "deletesecondarystagingstoreresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -55,11 +54,6 @@ public class DeleteSecondaryStagingStoreCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
index 8133806cbc6..699f4831415 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java
@@ -40,7 +40,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(FindStoragePoolsForMigrationCmd.class.getName());
 
-    private static final String s_name = "findstoragepoolsformigrationresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -61,11 +60,6 @@ public class FindStoragePoolsForMigrationCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.StoragePool;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
index 4f7cf81f20d..a9eac3ed76d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListImageStoresCmd.java
@@ -30,7 +30,6 @@ import org.apache.log4j.Logger;
 public class ListImageStoresCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListImageStoresCmd.class.getName());
 
-    private static final String s_name = "listimagestoresresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -90,11 +89,6 @@ public class ListImageStoresCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         ListResponse<ImageStoreResponse> response = _queryService.searchForImageStores(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
index b2455c3037a..ce1164000fc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java
@@ -34,7 +34,6 @@ import org.apache.cloudstack.api.response.ZoneResponse;
 public class ListStoragePoolsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListStoragePoolsCmd.class.getName());
 
-    private static final String s_name = "liststoragepoolsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -106,11 +105,6 @@ public class ListStoragePoolsCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.StoragePool;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
index 3e960ee84a8..347b66061f6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageProvidersCmd.java
@@ -41,16 +41,10 @@ import com.cloud.exception.ResourceUnavailableException;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListStorageProvidersCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListStorageProvidersCmd.class.getName());
-    private static final String s_name = "liststorageprovidersresponse";
 
     @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "the type of storage provider: either primary or image", required = true)
     private String type;
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public String getType() {
         return this.type;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java
index d740d04cff7..43981ee1a3d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/ListStorageTagsCmd.java
@@ -29,7 +29,6 @@ import org.apache.cloudstack.api.response.StorageTagResponse;
 public class ListStorageTagsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListStorageTagsCmd.class.getName());
 
-    private static final String s_name = "liststoragetagsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -43,11 +42,6 @@ public class ListStorageTagsCmd extends BaseListCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.StoragePool;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java
index e8a287552b6..de9b55a9ff1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/MigrateSecondaryStorageDataCmd.java
@@ -32,7 +32,7 @@ import org.apache.log4j.Logger;
 
 import com.cloud.event.EventTypes;
 
-@APICommand(name = MigrateSecondaryStorageDataCmd.APINAME,
+@APICommand(name = "migrateSecondaryStorageData",
         description = "migrates data objects from one secondary storage to destination image store(s)",
         responseObject = MigrationResponse.class,
         requestHasSensitiveInfo = false,
@@ -43,7 +43,6 @@ public class MigrateSecondaryStorageDataCmd extends BaseAsyncCmd {
 
     public static final Logger LOGGER = Logger.getLogger(MigrateSecondaryStorageDataCmd.class.getName());
 
-    public static final String APINAME = "migrateSecondaryStorageData";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -104,11 +103,6 @@ public class MigrateSecondaryStorageDataCmd extends BaseAsyncCmd {
         CallContext.current().setEventDetails(response.getMessage());
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
@@ -123,4 +117,4 @@ public class MigrateSecondaryStorageDataCmd extends BaseAsyncCmd {
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.ImageStore;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/SyncStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/SyncStoragePoolCmd.java
index 9761e330a4c..d7a783a4ff4 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/SyncStoragePoolCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/SyncStoragePoolCmd.java
@@ -35,7 +35,7 @@ import org.apache.cloudstack.context.CallContext;
 
 import java.util.logging.Logger;
 
-@APICommand(name = SyncStoragePoolCmd.APINAME,
+@APICommand(name = "syncStoragePool",
         description = "Sync storage pool with management server (currently supported for Datastore Cluster in VMware and syncs the datastores in it)",
         responseObject = StoragePoolResponse.class,
         requestHasSensitiveInfo = false,
@@ -45,7 +45,6 @@ import java.util.logging.Logger;
         )
 public class SyncStoragePoolCmd extends BaseAsyncCmd {
 
-    public static final String APINAME = "syncStoragePool";
     public static final Logger LOGGER = Logger.getLogger(SyncStoragePoolCmd.class.getName());
 
     /////////////////////////////////////////////////////
@@ -85,11 +84,6 @@ public class SyncStoragePoolCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
index a99c5e5d75c..3351d389c6f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateCloudToUseObjectStoreCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateCloudToUseObjectStoreCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateCloudToUseObjectStoreCmd.class.getName());
-    private static final String s_name = "updatecloudtouseobjectstoreresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -112,11 +111,6 @@ public class UpdateCloudToUseObjectStoreCmd extends BaseCmd {
 
 
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStorageCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStorageCapabilitiesCmd.java
index b6fb03dd798..8403d3c6241 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStorageCapabilitiesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStorageCapabilitiesCmd.java
@@ -31,13 +31,11 @@ import org.apache.cloudstack.api.response.StoragePoolResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.log4j.Logger;
 
-import java.util.Locale;
 
-@APICommand(name = UpdateStorageCapabilitiesCmd.APINAME, description = "Syncs capabilities of storage pools",
+@APICommand(name = "updateStorageCapabilities", description = "Syncs capabilities of storage pools",
         responseObject = StoragePoolResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.16.0")
 public class UpdateStorageCapabilitiesCmd extends BaseCmd {
-    public static final String APINAME = "updateStorageCapabilities";
     private static final Logger LOG = Logger.getLogger(UpdateStorageCapabilitiesCmd.class.getName());
 
     /////////////////////////////////////////////////////
@@ -74,11 +72,6 @@ public class UpdateStorageCapabilitiesCmd extends BaseCmd {
         this.setResponseObject(listResponse);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase(Locale.ROOT) + "response" ;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
index 0128a218a7c..9e34684a09d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class UpdateStoragePoolCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateStoragePoolCmd.class.getName());
 
-    private static final String s_name = "updatestoragepoolresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -94,11 +93,6 @@ public class UpdateStoragePoolCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
index 19a84252dd7..7eb87006d0d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/AddSwiftCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class AddSwiftCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddSwiftCmd.class.getName());
-    private static final String s_name = "addswiftresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -79,11 +78,6 @@ public class AddSwiftCmd extends BaseCmd {
         return key;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
index f80cfab4bdd..6d7bfbaf1b1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/swift/ListSwiftsCmd.java
@@ -32,7 +32,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListSwiftsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListSwiftsCmd.class.getName());
-    private static final String s_name = "listswiftsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -49,11 +48,6 @@ public class ListSwiftsCmd extends BaseListCmd {
         return id;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
index 408c3855feb..7ed536f6d4c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/DestroySystemVmCmd.java
@@ -39,7 +39,6 @@ import com.cloud.vm.VirtualMachine;
 public class DestroySystemVmCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DestroySystemVmCmd.class.getName());
 
-    private static final String s_name = "destroysystemvmresponse";
 
     @ACL(accessType = AccessType.OperateEntry)
     @Parameter(name = ApiConstants.ID,
@@ -53,11 +52,6 @@ public class DestroySystemVmCmd extends BaseAsyncCmd {
         return id;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "systemvm";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
index aee2084c2e8..b6f8c92fa17 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ListSystemVMsCmd.java
@@ -41,7 +41,6 @@ import com.cloud.vm.VirtualMachine;
 public class ListSystemVMsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListSystemVMsCmd.class.getName());
 
-    private static final String s_name = "listsystemvmsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -117,11 +116,6 @@ public class ListSystemVMsCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.SystemVm;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
index decc722e86f..f0f7aca16c8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/MigrateSystemVMCmd.java
@@ -49,7 +49,6 @@ import com.cloud.vm.VirtualMachine;
 public class MigrateSystemVMCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(MigrateSystemVMCmd.class.getName());
 
-    private static final String s_name = "migratesystemvmresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -106,11 +105,6 @@ public class MigrateSystemVMCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java
index a0c066ce0e8..ae3c36b4948 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmd.java
@@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
@@ -33,12 +32,11 @@ import org.apache.cloudstack.api.response.SystemVmResponse;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.log4j.Logger;
 
-@APICommand(name = PatchSystemVMCmd.APINAME, description = "Attempts to live patch systemVMs - CPVM, SSVM ",
+@APICommand(name = "patchSystemVm", description = "Attempts to live patch systemVMs - CPVM, SSVM ",
         responseObject = SuccessResponse.class, requestHasSensitiveInfo = false,
         responseHasSensitiveInfo = false, authorized = { RoleType.Admin }, since = "4.17.0")
 public class PatchSystemVMCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(PatchSystemVMCmd.class.getName());
-    public static final String APINAME = "patchSystemVm";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -79,11 +77,6 @@ public class PatchSystemVMCmd extends BaseAsyncCmd {
         return String.format("Attempting to live patch System VM with Id: %s ", this._uuidMgr.getUuid(VirtualMachine.class, getId()));
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
index 6c440ff2ba8..0ba7e0c2edf 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/RebootSystemVmCmd.java
@@ -39,7 +39,6 @@ import com.cloud.vm.VirtualMachine;
 public class RebootSystemVmCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(RebootSystemVmCmd.class.getName());
 
-    private static final String s_name = "rebootsystemvmresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -67,11 +66,6 @@ public class RebootSystemVmCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
index a3dd5a032d9..0cb517f4058 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StartSystemVMCmd.java
@@ -39,7 +39,6 @@ import com.cloud.vm.VirtualMachine;
 public class StartSystemVMCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(StartSystemVMCmd.class.getName());
 
-    private static final String s_name = "startsystemvmresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -64,11 +63,6 @@ public class StartSystemVMCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public static String getResultObjectName() {
         return "systemvm";
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
index 44056671044..755c8e46205 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/StopSystemVmCmd.java
@@ -41,7 +41,6 @@ import com.cloud.vm.VirtualMachine;
 public class StopSystemVmCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(StopSystemVmCmd.class.getName());
 
-    private static final String s_name = "stopsystemvmresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -70,11 +69,6 @@ public class StopSystemVmCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
index a13b9bb9bd2..12f80f32b06 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
@@ -42,7 +42,6 @@ import com.cloud.vm.VirtualMachine;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpgradeSystemVMCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpgradeSystemVMCmd.class.getName());
-    private static final String s_name = "changeserviceforsystemvmresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -78,11 +77,6 @@ public class UpgradeSystemVMCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
index 0537c01fd3c..9b8d402864a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/template/PrepareTemplateCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
 public class PrepareTemplateCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(PrepareTemplateCmd.class.getName());
 
-    private static final String s_name = "preparetemplateresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -90,11 +89,6 @@ public class PrepareTemplateCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
index e0d755518f9..95593714feb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficMonitorCmd.java
@@ -36,7 +36,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class AddTrafficMonitorCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(AddTrafficMonitorCmd.class.getName());
-    private static final String s_name = "addtrafficmonitorresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -82,11 +81,6 @@ public class AddTrafficMonitorCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
index 1111434c660..809129402a8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
 public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(AddTrafficTypeCmd.class.getName());
 
-    private static final String s_name = "addtraffictyperesponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -144,11 +143,6 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
index 4c2bac23a17..ff371d6e83d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficMonitorCmd.java
@@ -34,7 +34,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteTrafficMonitorCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteTrafficMonitorCmd.class.getName());
-    private static final String s_name = "deletetrafficmonitorresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -55,11 +54,6 @@ public class DeleteTrafficMonitorCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
index 0dda89b2a5c..a728690a09d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/DeleteTrafficTypeCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.Account;
 public class DeleteTrafficTypeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteTrafficTypeCmd.class.getName());
 
-    private static final String s_name = "deletetraffictyperesponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -56,11 +55,6 @@ public class DeleteTrafficTypeCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
index 184f88aed24..65b864f2ab6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/GenerateUsageRecordsCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
 public class GenerateUsageRecordsCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(GenerateUsageRecordsCmd.class.getName());
 
-    private static final String s_name = "generateusagerecordsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -80,11 +79,6 @@ public class GenerateUsageRecordsCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
index ac632cecda1..f3a65bbfffd 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
@@ -35,7 +35,6 @@ import com.cloud.host.Host;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListTrafficMonitorsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListTrafficMonitorsCmd.class.getName());
-    private static final String s_name = "listtrafficmonitorsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -56,11 +55,6 @@ public class ListTrafficMonitorsCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         List<? extends Host> trafficMonitors = _networkUsageService.listTrafficMonitors(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
index bd634bbe5c2..97f43155be6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypeImplementorsCmd.java
@@ -45,7 +45,6 @@ import com.cloud.utils.Pair;
             responseHasSensitiveInfo = false)
 public class ListTrafficTypeImplementorsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListTrafficTypeImplementorsCmd.class);
-    private static final String s_name = "listtraffictypeimplementorsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -87,8 +86,4 @@ public class ListTrafficTypeImplementorsCmd extends BaseListCmd {
         return Account.ACCOUNT_ID_SYSTEM;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
     }
-}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
index a5a5a5d8d3d..6e36ca3bd8d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficTypesCmd.java
@@ -38,7 +38,6 @@ import com.cloud.utils.Pair;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListTrafficTypesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListTrafficTypesCmd.class.getName());
-    private static final String s_name = "listtraffictypesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -65,11 +64,6 @@ public class ListTrafficTypesCmd extends BaseListCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java
index 91a38b0021c..3cb148c2af0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageRecordsCmd.java
@@ -24,7 +24,6 @@ import java.util.Set;
 
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.AccountResponse;
@@ -37,13 +36,12 @@ import org.apache.cloudstack.usage.Usage;
 
 import com.cloud.utils.Pair;
 
-@APICommand(name = ListUsageRecordsCmd.APINAME,
+@APICommand(name = "listUsageRecords",
         description = "Lists usage records for accounts",
         responseObject = UsageRecordResponse.class,
         requestHasSensitiveInfo = false,
         responseHasSensitiveInfo = false)
 public class ListUsageRecordsCmd extends BaseListCmd {
-    public static final String APINAME = "listUsageRecords";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -166,11 +164,6 @@ public class ListUsageRecordsCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends Usage>, Integer> usageRecords = _usageService.getUsageRecords(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
index 2c5a7866cbb..15f9dd20e29 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListUsageTypesCmd.java
@@ -31,12 +31,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListUsageTypesCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(ListUsageTypesCmd.class.getName());
-    private static final String s_name = "listusagetypesresponse";
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
 
     @Override
     public long getEntityOwnerId() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java
index da7871cbb9d..710a11c0d7f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/RemoveRawUsageRecordsCmd.java
@@ -35,7 +35,6 @@ import org.apache.log4j.Logger;
 public class RemoveRawUsageRecordsCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(RemoveRawUsageRecordsCmd.class.getName());
 
-    private static final String s_name = "removerawusagerecordsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -48,11 +47,6 @@ public class RemoveRawUsageRecordsCmd extends BaseCmd {
         return interval;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
index 3c7548583c3..103e58c4e03 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.Account;
 public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateTrafficTypeCmd.class.getName());
 
-    private static final String s_name = "updatetraffictyperesponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -102,11 +101,6 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
index 63d532bd275..e8f5944e407 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/CreateUserCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.User;
 public class CreateUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateUserCmd.class.getName());
 
-    private static final String s_name = "createuserresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -125,11 +124,6 @@ public class CreateUserCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
index e8ac7fd3720..a4f13d5e9c7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DeleteUserCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.User;
 public class DeleteUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteUserCmd.class.getName());
 
-    private static final String s_name = "deleteuserresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -63,11 +62,6 @@ public class DeleteUserCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         User user = _entityMgr.findById(User.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
index 89c7af4cec2..f7a51d0b1d3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.UserAccount;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
 public class DisableUserCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DisableUserCmd.class.getName());
-    private static final String s_name = "disableuserresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -64,11 +63,6 @@ public class DisableUserCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_USER_DISABLE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
index d69eccf9342..f13eac8f2a9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/EnableUserCmd.java
@@ -38,7 +38,6 @@ import com.cloud.user.UserAccount;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
 public class EnableUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(EnableUserCmd.class.getName());
-    private static final String s_name = "enableuserresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -62,11 +61,6 @@ public class EnableUserCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         User user = _entityMgr.findById(User.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
index d58f6959632..5fcad8068b1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserCmd.java
@@ -32,7 +32,6 @@ import com.cloud.user.UserAccount;
 public class GetUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(GetUserCmd.class.getName());
 
-    private static final String s_name = "getuserresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -53,11 +52,6 @@ public class GetUserCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return 0;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
index f86204c68a9..253a55652ea 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
@@ -31,7 +31,7 @@ import org.apache.cloudstack.api.response.UserResponse;
 import java.util.Map;
 import org.apache.log4j.Logger;
 
-@APICommand(name = GetUserKeysCmd.APINAME,
+@APICommand(name = "getUserKeys",
             description = "This command allows the user to query the seceret and API keys for the account",
             responseObject = RegisterResponse.class,
             requestHasSensitiveInfo = false,
@@ -45,17 +45,10 @@ public class GetUserKeysCmd extends BaseCmd{
     private Long id;
 
     public static final Logger s_logger = Logger.getLogger(GetUserKeysCmd.class.getName());
-    public static final String APINAME = "getUserKeys";
 
     public Long getID(){
         return id;
-    }
-
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
-    public long getEntityOwnerId(){
+    }public long getEntityOwnerId(){
         User user = _entityMgr.findById(User.class, getID());
         if(user != null){
             return user.getAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
index 313ff22e972..a516a30e769 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/ListUsersCmd.java
@@ -36,7 +36,6 @@ import java.util.List;
 public class ListUsersCmd extends BaseListAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListUsersCmd.class.getName());
 
-    private static final String s_name = "listusersresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -88,11 +87,6 @@ public class ListUsersCmd extends BaseListAccountResourcesCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         ListResponse<UserResponse> response = _queryService.searchForUsers(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
index 69623d013d4..df6ef4f7b0b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/LockUserCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.UserAccount;
 public class LockUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(LockUserCmd.class.getName());
 
-    private static final String s_name = "lockuserresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -56,11 +55,6 @@ public class LockUserCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         User user = _entityMgr.findById(User.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java
index 1d4096f37e3..56552ba95df 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java
@@ -48,7 +48,6 @@ import com.google.common.base.Preconditions;
 public class MoveUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(MoveUserCmd.class.getName());
 
-    public static final String APINAME = "moveUser";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -94,11 +93,6 @@ public class MoveUserCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         User user = _entityMgr.findById(User.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
index f0d92322f39..4199015b9ca 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java
@@ -36,7 +36,6 @@ import com.cloud.user.User;
 public class RegisterCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(RegisterCmd.class.getName());
 
-    private static final String s_name = "registeruserkeysresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -61,11 +60,6 @@ public class RegisterCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         User user = _entityMgr.findById(User.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
index 5035b32d14d..5cfb5c4a649 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/user/UpdateUserCmd.java
@@ -39,7 +39,6 @@ requestHasSensitiveInfo = true, responseHasSensitiveInfo = true)
 public class UpdateUserCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateUserCmd.class.getName());
 
-    private static final String s_name = "updateuserresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -131,11 +130,6 @@ public class UpdateUserCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         User user = _entityMgr.findById(User.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
index a2c77cecf94..66aefd46966 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/CreateVlanIpRangeCmd.java
@@ -45,7 +45,6 @@ import com.cloud.user.Account;
 public class CreateVlanIpRangeCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateVlanIpRangeCmd.class.getName());
 
-    private static final String s_name = "createvlaniprangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -210,11 +209,6 @@ public class CreateVlanIpRangeCmd extends BaseCmd {
         return physicalNetworkId;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
index 58a8458312d..7c122dfc22e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java
@@ -38,7 +38,6 @@ import com.cloud.user.Account;
 public class DedicatePublicIpRangeCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DedicatePublicIpRangeCmd.class.getName());
 
-    private static final String s_name = "dedicatepubliciprangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -84,11 +83,6 @@ public class DedicatePublicIpRangeCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
index af32fc4ebd7..15f0bde37a1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/DeleteVlanIpRangeCmd.java
@@ -34,7 +34,6 @@ import com.cloud.user.Account;
 public class DeleteVlanIpRangeCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteVlanIpRangeCmd.class.getName());
 
-    private static final String s_name = "deletevlaniprangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -55,11 +54,6 @@ public class DeleteVlanIpRangeCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
index d5edd301a66..3b5370e3f15 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ListVlanIpRangesCmd.java
@@ -42,7 +42,6 @@ import com.cloud.utils.Pair;
 public class ListVlanIpRangesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListVlanIpRangesCmd.class.getName());
 
-    private static final String s_name = "listvlaniprangesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -135,11 +134,6 @@ public class ListVlanIpRangesCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends Vlan>, Integer> vlans = _mgr.searchForVlans(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
index 15cfbc64e30..846433a60fc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java
@@ -34,7 +34,6 @@ import com.cloud.user.Account;
 public class ReleasePublicIpRangeCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(ReleasePublicIpRangeCmd.class.getName());
 
-    private static final String s_name = "releasepubliciprangeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -55,11 +54,6 @@ public class ReleasePublicIpRangeCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java
index 7a7775e4863..caaf4c5ae01 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java
@@ -33,13 +33,12 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 import com.cloud.utils.net.NetUtils;
 
-@APICommand(name = UpdateVlanIpRangeCmd.APINAME, description = "Updates a VLAN IP range.", responseObject =
+@APICommand(name = "updateVlanIpRange", description = "Updates a VLAN IP range.", responseObject =
         VlanIpRangeResponse.class, since = "4.16.0",
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         authorized = {RoleType.Admin})
 public class UpdateVlanIpRangeCmd extends BaseCmd {
 
-    public static final String APINAME = "updateVlanIpRange";
     public static final Logger s_logger = Logger.getLogger(UpdateVlanIpRangeCmd.class.getName());
 
     /////////////////////////////////////////////////////
@@ -155,13 +154,8 @@ public class UpdateVlanIpRangeCmd extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
index 290349070d5..1d53bbb39ad 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/AssignVMCmd.java
@@ -48,7 +48,6 @@ import com.cloud.vm.VirtualMachine;
 public class AssignVMCmd extends BaseCmd  {
     public static final Logger s_logger = Logger.getLogger(AssignVMCmd.class.getName());
 
-    private static final String s_name = "assignvirtualmachineresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -120,11 +119,6 @@ public class AssignVMCmd extends BaseCmd  {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         try {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
index cd9b89b6ffe..4cd7f541c4e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ExpungeVMCmd.java
@@ -45,7 +45,6 @@ import com.cloud.vm.VirtualMachine;
 public class ExpungeVMCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ExpungeVMCmd.class.getName());
 
-    private static final String s_name = "expungevirtualmachineresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -67,11 +66,6 @@ public class ExpungeVMCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         UserVm vm = _responseGenerator.findUserVmById(getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
index bf39f99519f..98af820201c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/GetVMUserDataCmd.java
@@ -33,7 +33,6 @@ import com.cloud.uservm.UserVm;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class GetVMUserDataCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(GetVMUserDataCmd.class);
-    private static final String s_name = "getvirtualmachineuserdataresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -75,8 +74,4 @@ public class GetVMUserDataCmd extends BaseCmd {
         return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
     }
-}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java
index dca683f787f..70233317cc5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ImportUnmanagedInstanceCmd.java
@@ -56,7 +56,7 @@ import com.cloud.user.Account;
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.VmDetailConstants;
 
-@APICommand(name = ImportUnmanagedInstanceCmd.API_NAME,
+@APICommand(name = "importUnmanagedInstance",
         description = "Import unmanaged virtual machine from a given cluster.",
         responseObject = UserVmResponse.class,
         responseView = ResponseObject.ResponseView.Full,
@@ -66,7 +66,6 @@ import com.cloud.vm.VmDetailConstants;
         since = "4.14.0")
 public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd {
     public static final Logger LOGGER = Logger.getLogger(ImportUnmanagedInstanceCmd.class);
-    public static final String API_NAME = "importUnmanagedInstance";
 
     @Inject
     public VmImportService vmImportService;
@@ -298,11 +297,6 @@ public class ImportUnmanagedInstanceCmd extends BaseAsyncCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return API_NAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Long accountId = _accountService.finalyzeAccountId(accountName, domainId, projectId, true);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java
index a991ef4e03d..13b6748c74d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ListUnmanagedInstancesCmd.java
@@ -22,7 +22,6 @@ import javax.inject.Inject;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
-import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ResponseObject;
@@ -42,7 +41,7 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.user.Account;
 
-@APICommand(name = ListUnmanagedInstancesCmd.API_NAME,
+@APICommand(name = "listUnmanagedInstances",
         description = "Lists unmanaged virtual machines for a given cluster.",
         responseObject = UnmanagedInstanceResponse.class,
         responseView = ResponseObject.ResponseView.Full,
@@ -53,7 +52,6 @@ import com.cloud.user.Account;
         since = "4.14.0")
 public class ListUnmanagedInstancesCmd extends BaseListCmd {
     public static final Logger LOGGER = Logger.getLogger(ListUnmanagedInstancesCmd.class.getName());
-    public static final String API_NAME = "listUnmanagedInstances";
 
     @Inject
     public VmImportService vmImportService;
@@ -97,11 +95,6 @@ public class ListUnmanagedInstancesCmd extends BaseListCmd {
         setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return API_NAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
index 2962dd4a68f..b685b366cd1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java
@@ -52,7 +52,6 @@ import com.cloud.vm.VirtualMachine;
 public class MigrateVMCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName());
 
-    private static final String s_name = "migratevirtualmachineresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -109,11 +108,6 @@ public class MigrateVMCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         UserVm userVm = _entityMgr.findById(UserVm.class, getVirtualMachineId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
index 8778d8ccbcd..731cb67aa83 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
@@ -54,7 +54,6 @@ import com.cloud.vm.VirtualMachine;
 public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(MigrateVirtualMachineWithVolumeCmd.class.getName());
 
-    private static final String s_name = "migratevirtualmachinewithvolumeresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -115,11 +114,6 @@ public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         UserVm userVm = _entityMgr.findById(UserVm.class, getVirtualMachineId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
index 50062acfab3..b0698ed1e7a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/RecoverVMCmd.java
@@ -40,7 +40,6 @@ import com.cloud.vm.VirtualMachine;
 public class RecoverVMCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(RecoverVMCmd.class.getName());
 
-    private static final String s_name = "recovervirtualmachineresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -62,11 +61,6 @@ public class RecoverVMCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         UserVm userVm = _entityMgr.findById(UserVm.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java
index db729b7f8d7..20c7c536c45 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vm/UnmanageVMInstanceCmd.java
@@ -44,7 +44,7 @@ import org.apache.log4j.Logger;
 
 import javax.inject.Inject;
 
-@APICommand(name = UnmanageVMInstanceCmd.API_NAME,
+@APICommand(name = "unmanageVirtualMachine",
         description = "Unmanage a guest virtual machine.",
         entityType = {VirtualMachine.class},
         responseObject = UnmanageVMInstanceResponse.class,
@@ -54,7 +54,6 @@ import javax.inject.Inject;
 public class UnmanageVMInstanceCmd extends BaseAsyncCmd {
 
     public static final Logger LOGGER = Logger.getLogger(UnmanageVMInstanceCmd.class);
-    public static final String API_NAME = "unmanageVirtualMachine";
 
     @Inject
     private UnmanagedVMsManager unmanagedVMsManager;
@@ -109,11 +108,6 @@ public class UnmanageVMInstanceCmd extends BaseAsyncCmd {
         this.setResponseObject(response);
     }
 
-    @Override
-    public String getCommandName() {
-        return API_NAME.toLowerCase() + BaseAsyncCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         UserVm vm = _responseGenerator.findUserVmById(vmId);
@@ -133,4 +127,4 @@ public class UnmanageVMInstanceCmd extends BaseAsyncCmd {
         return vmId;
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java
index b42e3d95285..b5ba70cf5e2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java
@@ -71,4 +71,4 @@ public class CreatePrivateGatewayByAdminCmd extends CreatePrivateGatewayCmd impl
     public Boolean getBypassVlanOverlapCheck() {
         return BooleanUtils.toBoolean(bypassVlanOverlapCheck);
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
index 6539c5c226d..f1c2a5b48a9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreateVPCOfferingCmd.java
@@ -48,7 +48,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateVPCOfferingCmd.class.getName());
-    private static final String s_name = "createvpcofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -221,11 +220,6 @@ public class CreateVPCOfferingCmd extends BaseAsyncCreateCmd {
         return "creating VPC offering. Id: " + getEntityId();
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
index 063faf96a98..d6c3cac68c7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeletePrivateGatewayCmd.java
@@ -42,7 +42,6 @@ import com.cloud.user.Account;
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class DeletePrivateGatewayCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeletePrivateGatewayCmd.class.getName());
-    private static final String s_name = "deleteprivategatewayresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -62,11 +61,6 @@ public class DeletePrivateGatewayCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_PRIVATE_GATEWAY_DELETE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
index a5e1b7c90a5..aba4c857b0b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/DeleteVPCOfferingCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteVPCOfferingCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteVPCOfferingCmd.class.getName());
-    private static final String s_name = "deletevpcofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -56,11 +55,6 @@ public class DeleteVPCOfferingCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
index 0d1a57a6612..12babad504e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/UpdateVPCOfferingCmd.java
@@ -41,7 +41,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateVPCOfferingCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateVPCOfferingCmd.class.getName());
-    private static final String s_name = "updatevpcofferingresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -161,11 +160,6 @@ public class UpdateVPCOfferingCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
index af377cd347a..263d3c824b0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/CreateZoneCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
 public class CreateZoneCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(CreateZoneCmd.class.getName());
 
-    private static final String s_name = "createzoneresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -156,11 +155,6 @@ public class CreateZoneCmd extends BaseCmd {
 
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
index c7029b052ec..c530e999bf8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/DeleteZoneCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
 public class DeleteZoneCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteZoneCmd.class.getName());
 
-    private static final String s_name = "deletezoneresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -56,11 +55,6 @@ public class DeleteZoneCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
index 9dd0337a83f..264aea3f449 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/MarkDefaultZoneForAccountCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
 public class MarkDefaultZoneForAccountCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(MarkDefaultZoneForAccountCmd.class.getName());
 
-    private static final String s_name = "markdefaultzoneforaccountresponse";
 
     /////////////////////////////////////////////////////
     ////////////////API parameters //////////////////////
@@ -86,11 +85,6 @@ public class MarkDefaultZoneForAccountCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
index ac80ca59f92..1379050cbf7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/zone/UpdateZoneCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
 public class UpdateZoneCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateZoneCmd.class.getName());
 
-    private static final String s_name = "updatezoneresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -174,11 +173,6 @@ public class UpdateZoneCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
index 1ccb18ffaa6..57c0e484843 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddAccountToProjectCmd.java
@@ -46,7 +46,6 @@ import com.cloud.projects.ProjectAccount;
 public class AddAccountToProjectCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(AddAccountToProjectCmd.class.getName());
 
-    private static final String s_name = "addaccounttoprojectresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -104,11 +103,6 @@ public class AddAccountToProjectCmd extends BaseAsyncCmd {
         return null;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java
index 906927e041e..d38ae057f05 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/AddUserToProjectCmd.java
@@ -38,10 +38,9 @@ import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.projects.ProjectAccount;
 
-@APICommand(name = AddUserToProjectCmd.APINAME, description = "Adds user to a project", responseObject = SuccessResponse.class, since = "4.14",
+@APICommand(name = "addUserToProject", description = "Adds user to a project", responseObject = SuccessResponse.class, since = "4.14",
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User})
 public class AddUserToProjectCmd extends BaseAsyncCmd {
-    public static final String APINAME = "addUserToProject";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -139,11 +138,6 @@ public class AddUserToProjectCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccountId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
index 6804f091e71..34935f506ec 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
@@ -40,7 +40,6 @@ import com.cloud.projects.Project;
 public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteAccountFromProjectCmd.class.getName());
 
-    private static final String s_name = "deleteaccountfromprojectresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -59,11 +58,6 @@ public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java
index 7cd90125041..596fb876008 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java
@@ -38,11 +38,10 @@ import com.cloud.event.EventTypes;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.projects.Project;
 
-@APICommand(name = DeleteUserFromProjectCmd.APINAME, description = "Deletes user from the project", responseObject = SuccessResponse.class, since = "4.15.0",
+@APICommand(name = "deleteUserFromProject", description = "Deletes user from the project", responseObject = SuccessResponse.class, since = "4.15.0",
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User})
 public class DeleteUserFromProjectCmd extends BaseAsyncCmd {
     public static final Logger LOGGER = Logger.getLogger(DeleteUserFromProjectCmd.class.getName());
-    public static final String APINAME = "deleteUserFromProject";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -85,11 +84,6 @@ public class DeleteUserFromProjectCmd extends BaseAsyncCmd {
     }
 
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Project project = _projectService.getProject(projectId);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
index bcfedd2262d..3d50fc553b8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/account/ListProjectAccountsCmd.java
@@ -35,7 +35,6 @@ import com.cloud.user.Account;
 public class ListProjectAccountsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListProjectAccountsCmd.class.getName());
 
-    private static final String s_name = "listprojectaccountsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -78,11 +77,6 @@ public class ListProjectAccountsCmd extends BaseListCmd {
         return projectRoleId;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         //TODO - return project entity ownerId
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
index 17b17632ca5..b31520e1b88 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/DisassociateIPAddrCmd.java
@@ -41,7 +41,6 @@ import com.cloud.user.Account;
 public class DisassociateIPAddrCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DisassociateIPAddrCmd.class.getName());
 
-    private static final String s_name = "disassociateipaddressresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -67,11 +66,6 @@ public class DisassociateIPAddrCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws InsufficientAddressCapacityException {
         CallContext.current().setEventDetails("IP ID: " + getIpAddressId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java
index ba8a512b183..eb908300283 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java
@@ -43,7 +43,6 @@ import com.cloud.network.IpAddress;
 public class ReleaseIPAddrCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(ReleaseIPAddrCmd.class.getName());
 
-    private static final String s_name = "releaseipaddressresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -65,11 +64,6 @@ public class ReleaseIPAddrCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         IpAddress ip = getIpAddress(id);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java
index 030a16b7a98..5e72986fb58 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java
@@ -52,7 +52,6 @@ import com.cloud.user.Account;
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class ReserveIPAddrCmd extends BaseCmd implements UserCmd {
     public static final Logger s_logger = Logger.getLogger(ReserveIPAddrCmd.class.getName());
-    private static final String s_name = "reserveipaddressresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -145,11 +144,6 @@ public class ReserveIPAddrCmd extends BaseCmd implements UserCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceUnavailableException, ResourceAllocationException, ConcurrentOperationException {
         IpAddress result = _networkService.reserveIpAddress(_accountService.getAccount(getEntityOwnerId()), isDisplay(), getIpAddressId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
index 9ed66b0935e..7055e1d5cb2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/address/UpdateIPAddrCmd.java
@@ -43,7 +43,6 @@ import com.cloud.user.Account;
  requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, entityType = { IpAddress.class })
 public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateIPAddrCmd.class.getName());
-    private static final String s_name = "updateipaddressresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -62,11 +61,6 @@ public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public Long getId() {
         return id;
     }
@@ -144,4 +138,4 @@ public class UpdateIPAddrCmd extends BaseAsyncCustomIdCmd {
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.IpAddress;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
index 052b98719d7..60dbc2a6e9a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
 public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateAffinityGroupCmd.class.getName());
 
-    private static final String s_name = "createaffinitygroupresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -104,11 +103,6 @@ public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account caller = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
index e96ba433474..c8967b08020 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java
@@ -41,7 +41,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteAffinityGroupCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteAffinityGroupCmd.class.getName());
-    private static final String s_name = "deleteaffinitygroupresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -93,11 +92,6 @@ public class DeleteAffinityGroupCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account caller = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
index 84ad0328463..2d6f45cc06e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java
@@ -33,17 +33,11 @@ import com.cloud.user.Account;
 public class ListAffinityGroupTypesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListAffinityGroupTypesCmd.class.getName());
 
-    private static final String s_name = "listaffinitygrouptypesresponse";
 
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
index de70361c331..ed6c3145198 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
@@ -33,7 +33,6 @@ import org.apache.cloudstack.api.response.UserVmResponse;
 public class ListAffinityGroupsCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListAffinityGroupsCmd.class.getName());
 
-    private static final String s_name = "listaffinitygroupsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -77,11 +76,6 @@ public class ListAffinityGroupsCmd extends BaseListProjectAndAccountResourcesCmd
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         ListResponse<AffinityGroupResponse> response = _queryService.searchForAffinityGroups(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
index a33a6200906..cf5ff366096 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScalePolicyCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteAutoScalePolicyCmd.class.getName());
-    private static final String s_name = "deleteautoscalepolicyresponse";
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
     // ///////////////////////////////////////////////////
@@ -64,11 +63,6 @@ public class DeleteAutoScalePolicyCmd extends BaseAsyncCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         AutoScalePolicy autoScalePolicy = _entityMgr.findById(AutoScalePolicy.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
index cb458b2daf2..badfcc0957e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmGroupCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteAutoScaleVmGroupCmd.class.getName());
-    private static final String s_name = "deleteautoscalevmgroupresponse";
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
     // ///////////////////////////////////////////////////
@@ -74,11 +73,6 @@ public class DeleteAutoScaleVmGroupCmd extends BaseAsyncCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         AutoScaleVmGroup autoScaleVmGroup = _entityMgr.findById(AutoScaleVmGroup.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
index 5f9fd8a5f74..06bf7a9d378 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteAutoScaleVmProfileCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteAutoScaleVmProfileCmd.class.getName());
-    private static final String s_name = "deleteautoscalevmprofileresponse";
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
     // ///////////////////////////////////////////////////
@@ -64,11 +63,6 @@ public class DeleteAutoScaleVmProfileCmd extends BaseAsyncCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         AutoScaleVmProfile autoScaleVmProfile = _entityMgr.findById(AutoScaleVmProfile.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
index 3d21c3c0412..840484e45ad 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/DeleteConditionCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteConditionCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteConditionCmd.class.getName());
-    private static final String s_name = "deleteconditionresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -85,11 +84,6 @@ public class DeleteConditionCmd extends BaseAsyncCmd {
         return ApiCommandResourceType.Condition;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Condition condition = _entityMgr.findById(Condition.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
index 18d52092828..dc0baf4c786 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScalePoliciesCmd.java
@@ -37,7 +37,6 @@ import com.cloud.network.as.AutoScalePolicy;
 public class ListAutoScalePoliciesCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListAutoScalePoliciesCmd.class.getName());
 
-    private static final String s_name = "listautoscalepoliciesresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -88,11 +87,6 @@ public class ListAutoScalePoliciesCmd extends BaseListProjectAndAccountResources
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         List<? extends AutoScalePolicy> autoScalePolicies = _autoScaleService.listAutoScalePolicies(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
index 8035117b3e1..8404fbbb49f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmGroupsCmd.java
@@ -41,7 +41,6 @@ import com.cloud.network.as.AutoScaleVmGroup;
 public class ListAutoScaleVmGroupsCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListAutoScaleVmGroupsCmd.class.getName());
 
-    private static final String s_name = "listautoscalevmgroupsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -108,11 +107,6 @@ public class ListAutoScaleVmGroupsCmd extends BaseListProjectAndAccountResources
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         if (id != null && (loadBalancerId != null || profileId != null || policyId != null))
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
index 554b48854a4..435471faf13 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
@@ -39,7 +39,6 @@ import com.cloud.network.as.AutoScaleVmProfile;
 public class ListAutoScaleVmProfilesCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListAutoScaleVmProfilesCmd.class.getName());
 
-    private static final String s_name = "listautoscalevmprofilesresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -100,11 +99,6 @@ public class ListAutoScaleVmProfilesCmd extends BaseListProjectAndAccountResourc
     // ///////////////////////////////////////////////////
 
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         List<? extends AutoScaleVmProfile> autoScaleProfiles = _autoScaleService.listAutoScaleVmProfiles(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
index 00d937d28b0..fc1ca7097c8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/ListConditionsCmd.java
@@ -37,7 +37,6 @@ import com.cloud.network.as.Condition;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListConditionsCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListConditionsCmd.class.getName());
-    private static final String s_name = "listconditionsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -92,9 +91,4 @@ public class ListConditionsCmd extends BaseListProjectAndAccountResourcesCmd {
         return policyId;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
     }
-
-}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
index 08e0676b542..a64b5cb1680 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScalePolicyCmd.java
@@ -43,7 +43,6 @@ import com.cloud.user.Account;
 public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateAutoScalePolicyCmd.class.getName());
 
-    private static final String s_name = "updateautoscalepolicyresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -115,11 +114,6 @@ public class UpdateAutoScalePolicyCmd extends BaseAsyncCmd {
         return conditionIds;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         AutoScalePolicy autoScalePolicy = _entityMgr.findById(AutoScalePolicy.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
index ac3ade3c50b..87cd1fd3f4e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmGroupCmd.java
@@ -44,7 +44,6 @@ import com.cloud.user.Account;
 public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateAutoScaleVmGroupCmd.class.getName());
 
-    private static final String s_name = "updateautoscalevmgroupresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -157,11 +156,6 @@ public class UpdateAutoScaleVmGroupCmd extends BaseAsyncCustomIdCmd {
         return "Updating AutoScale Vm Group. Vm Group Id: " + getId();
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         AutoScaleVmGroup autoScaleVmGroup = _entityMgr.findById(AutoScaleVmGroup.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
index 0056051b336..c0b385932a9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateAutoScaleVmProfileCmd.java
@@ -47,7 +47,6 @@ import com.cloud.user.Account;
 public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateAutoScaleVmProfileCmd.class.getName());
 
-    private static final String s_name = "updateautoscalevmprofileresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -179,11 +178,6 @@ public class UpdateAutoScaleVmProfileCmd extends BaseAsyncCustomIdCmd {
         return "Updating AutoScale Vm Profile. Vm Profile Id: " + getId();
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         AutoScaleVmProfile vmProfile = _entityMgr.findById(AutoScaleVmProfile.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java
index b0e79e7e8ae..e946dd370c1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java
@@ -27,7 +27,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ConditionResponse;
@@ -38,12 +37,11 @@ import com.cloud.exception.ResourceInUseException;
 import com.cloud.network.as.Condition;
 import com.cloud.user.Account;
 
-@APICommand(name = UpdateConditionCmd.API_NAME, description = "Updates a condition for VM auto scaling", responseObject = SuccessResponse.class, entityType = {Condition.class},
+@APICommand(name = "updateCondition", description = "Updates a condition for VM auto scaling", responseObject = SuccessResponse.class, entityType = {Condition.class},
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User},
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.18.0")
 public class UpdateConditionCmd extends BaseAsyncCmd {
     public static final Logger LOGGER = Logger.getLogger(UpdateConditionCmd.class.getName());
-    public static final String API_NAME = "updateCondition";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -97,11 +95,6 @@ public class UpdateConditionCmd extends BaseAsyncCmd {
         return ApiCommandResourceType.Condition;
     }
 
-    @Override
-    public String getCommandName() {
-        return API_NAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Condition condition = _entityMgr.findById(Condition.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java
index 05bfc52b44b..0e6b2bc165e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/AssignVirtualMachineToBackupOfferingCmd.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.BackupOfferingResponse;
@@ -40,12 +39,11 @@ import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 
-@APICommand(name = AssignVirtualMachineToBackupOfferingCmd.APINAME,
+@APICommand(name = "assignVirtualMachineToBackupOffering",
         description = "Assigns a VM to a backup offering",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class AssignVirtualMachineToBackupOfferingCmd extends BaseAsyncCmd {
-    public static final String APINAME = "assignVirtualMachineToBackupOffering";
 
     @Inject
     private BackupManager backupManager;
@@ -99,11 +97,6 @@ public class AssignVirtualMachineToBackupOfferingCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
@@ -118,4 +111,4 @@ public class AssignVirtualMachineToBackupOfferingCmd extends BaseAsyncCmd {
     public String getEventDescription() {
         return "Assigning VM to backup offering ID: " + offeringId;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
index 189ebe2f69d..558f92e4006 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
@@ -25,7 +25,6 @@ import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCreateCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
@@ -41,12 +40,11 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = CreateBackupCmd.APINAME,
+@APICommand(name = "createBackup",
         description = "Create VM backup",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class CreateBackupCmd extends BaseAsyncCreateCmd {
-    public static final String APINAME = "createBackup";
 
     @Inject
     private BackupManager backupManager;
@@ -90,11 +88,6 @@ public class CreateBackupCmd extends BaseAsyncCreateCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.Backup;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
index e10386de987..5dc06af2123 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
@@ -36,12 +36,11 @@ import org.apache.cloudstack.context.CallContext;
 import com.cloud.utils.DateUtil;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = CreateBackupScheduleCmd.APINAME,
+@APICommand(name = "createBackupSchedule",
         description = "Creates a user-defined VM backup schedule",
         responseObject = BackupResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class CreateBackupScheduleCmd extends BaseCmd {
-    public static final String APINAME = "createBackupSchedule";
 
     @Inject
     private BackupManager backupManager;
@@ -116,11 +115,6 @@ public class CreateBackupScheduleCmd extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java
index 4098158a833..7f0a63ecc91 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupCmd.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.BackupResponse;
@@ -41,12 +40,11 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = DeleteBackupCmd.APINAME,
+@APICommand(name = "deleteBackup",
         description = "Delete VM backup",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class DeleteBackupCmd  extends BaseAsyncCmd {
-    public static final String APINAME = "deleteBackup";
 
     @Inject
     private BackupManager backupManager;
@@ -101,11 +99,6 @@ public class DeleteBackupCmd  extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java
index 1c7b65c8edc..0245f228b89 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java
@@ -38,12 +38,11 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = DeleteBackupScheduleCmd.APINAME,
+@APICommand(name = "deleteBackupSchedule",
         description = "Deletes the backup schedule of a VM",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class DeleteBackupScheduleCmd  extends BaseCmd {
-    public static final String APINAME = "deleteBackupSchedule";
 
     @Inject
     private BackupManager backupManager;
@@ -87,11 +86,6 @@ public class DeleteBackupScheduleCmd  extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java
index e745a6ba66d..d3c0f16d8d1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupOfferingsCmd.java
@@ -39,12 +39,11 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.Pair;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = ListBackupOfferingsCmd.APINAME,
+@APICommand(name = "listBackupOfferings",
         description = "Lists backup offerings",
         responseObject = BackupOfferingResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class ListBackupOfferingsCmd extends BaseBackupListCmd {
-    public static final String APINAME = "listBackupOfferings";
 
     @Inject
     private BackupManager backupManager;
@@ -89,8 +88,4 @@ public class ListBackupOfferingsCmd extends BaseBackupListCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
     }
-}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java
index 4068dc295dc..6cc765328f6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupScheduleCmd.java
@@ -39,12 +39,11 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = ListBackupScheduleCmd.APINAME,
+@APICommand(name = "listBackupSchedule",
         description = "List backup schedule of a VM",
         responseObject = BackupScheduleResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class ListBackupScheduleCmd extends BaseCmd {
-    public static final String APINAME = "listBackupSchedule";
 
     @Inject
     private BackupManager backupManager;
@@ -88,13 +87,8 @@ public class ListBackupScheduleCmd extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java
index 1e1e7312897..8597d97278c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/ListBackupsCmd.java
@@ -26,7 +26,6 @@ import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.BaseListProjectAndAccountResourcesCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
@@ -45,12 +44,11 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.Pair;
 
-@APICommand(name = ListBackupsCmd.APINAME,
+@APICommand(name = "listBackups",
         description = "Lists VM backups",
         responseObject = BackupResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class ListBackupsCmd extends BaseListProjectAndAccountResourcesCmd {
-    public static final String APINAME = "listBackups";
 
     @Inject
     private BackupManager backupManager;
@@ -122,11 +120,6 @@ public class ListBackupsCmd extends BaseListProjectAndAccountResourcesCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java
index 28f03f8c853..c451bff5456 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RemoveVirtualMachineFromBackupOfferingCmd.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
@@ -39,12 +38,11 @@ import com.cloud.exception.NetworkRuleConflictException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 
-@APICommand(name = RemoveVirtualMachineFromBackupOfferingCmd.APINAME,
+@APICommand(name = "removeVirtualMachineFromBackupOffering",
         description = "Removes a VM from any existing backup offering",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class RemoveVirtualMachineFromBackupOfferingCmd extends BaseAsyncCmd {
-    public static final String APINAME = "removeVirtualMachineFromBackupOffering";
 
     @Inject
     private BackupManager backupManager;
@@ -96,11 +94,6 @@ public class RemoveVirtualMachineFromBackupOfferingCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
@@ -115,4 +108,4 @@ public class RemoveVirtualMachineFromBackupOfferingCmd extends BaseAsyncCmd {
     public String getEventDescription() {
         return "Removing VM ID" + vmId + " from backup offering";
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java
index 62fa9a17b77..6d02a084b70 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreBackupCmd.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
@@ -40,12 +39,11 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = RestoreBackupCmd.APINAME,
+@APICommand(name = "restoreBackup",
         description = "Restores an existing stopped or deleted VM using a VM backup",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class RestoreBackupCmd extends BaseAsyncCmd {
-    public static final String APINAME = "restoreBackup";
 
     @Inject
     private BackupManager backupManager;
@@ -89,11 +87,6 @@ public class RestoreBackupCmd extends BaseAsyncCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java
index b5966a737df..310b0bd9bf1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/RestoreVolumeFromBackupAndAttachToVMCmd.java
@@ -24,7 +24,6 @@ import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseAsyncCmd;
-import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
@@ -41,12 +40,11 @@ import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-@APICommand(name = RestoreVolumeFromBackupAndAttachToVMCmd.APINAME,
+@APICommand(name = "restoreVolumeFromBackupAndAttachToVM",
         description = "Restore and attach a backed up volume to VM",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class RestoreVolumeFromBackupAndAttachToVMCmd extends BaseAsyncCmd {
-    public static final String APINAME = "restoreVolumeFromBackupAndAttachToVM";
 
     @Inject
     private BackupManager backupManager;
@@ -91,11 +89,6 @@ public class RestoreVolumeFromBackupAndAttachToVMCmd extends BaseAsyncCmd {
         return backupId;
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java
index 5a02cf9ac78..47c8dc42fac 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/UpdateBackupScheduleCmd.java
@@ -21,10 +21,9 @@ import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.response.BackupResponse;
 
-@APICommand(name = UpdateBackupScheduleCmd.APINAME,
+@APICommand(name = "updateBackupSchedule",
         description = "Updates a user-defined VM backup schedule",
         responseObject = BackupResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class UpdateBackupScheduleCmd extends CreateBackupScheduleCmd {
-    public static final String APINAME = "updateBackupSchedule";
 }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
index 05176f58a72..fa65101778c 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
@@ -31,12 +31,6 @@ import com.cloud.user.Account;
 public class ListCapabilitiesCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(ListCapabilitiesCmd.class.getName());
 
-    private static final String s_name = "listcapabilitiesresponse";
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
 
     @Override
     public long getEntityOwnerId() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java
index 37b9871ceae..11e84f1bef9 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java
@@ -40,13 +40,12 @@ import org.apache.log4j.Logger;
 import javax.inject.Inject;
 import java.util.Map;
 
-@APICommand(name = CreateConsoleEndpointCmd.APINAME, description = "Create a console endpoint to connect to a VM console",
+@APICommand(name = "createConsoleEndpoint", description = "Create a console endpoint to connect to a VM console",
         responseObject = CreateConsoleEndpointResponse.class, since = "4.18.0",
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class CreateConsoleEndpointCmd extends BaseCmd {
 
-    public static final String APINAME = "createConsoleEndpoint";
     public static final Logger s_logger = Logger.getLogger(CreateConsoleEndpointCmd.class.getName());
 
     @Inject
@@ -108,11 +107,6 @@ public class CreateConsoleEndpointCmd extends BaseCmd {
         return getParameterBase(ConsoleAccessUtils.CLIENT_INET_ADDRESS_KEY);
     }
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
index e4970d6530e..cdff7882e65 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ArchiveEventsCmd.java
@@ -41,7 +41,6 @@ public class ArchiveEventsCmd extends BaseCmd {
 
     public static final Logger s_logger = Logger.getLogger(ArchiveEventsCmd.class.getName());
 
-    private static final String s_name = "archiveeventsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -89,11 +88,6 @@ public class ArchiveEventsCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
index defb0096962..9d049ac5f06 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/event/DeleteEventsCmd.java
@@ -41,7 +41,6 @@ public class DeleteEventsCmd extends BaseCmd {
 
     public static final Logger s_logger = Logger.getLogger(DeleteEventsCmd.class.getName());
 
-    private static final String s_name = "deleteeventsresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -89,11 +88,6 @@ public class DeleteEventsCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
index 91f316c3d00..dd0f5179278 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventTypesCmd.java
@@ -31,12 +31,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListEventTypesCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(ListEventTypesCmd.class.getName());
-    private static final String s_name = "listeventtypesresponse";
-
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
 
     @Override
     public long getEntityOwnerId() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
index 66aff30e52d..202bd36bdb5 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/event/ListEventsCmd.java
@@ -33,7 +33,6 @@ import com.cloud.event.Event;
 public class ListEventsCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListEventsCmd.class.getName());
 
-    private static final String s_name = "listeventsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -121,11 +120,6 @@ public class ListEventsCmd extends BaseListProjectAndAccountResourcesCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
index 65539346a13..bedb073b880 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmd.java
@@ -50,7 +50,6 @@ import com.cloud.utils.net.NetUtils;
 public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements FirewallRule {
     public static final Logger s_logger = Logger.getLogger(CreateEgressFirewallRuleCmd.class.getName());
 
-    private static final String s_name = "createegressfirewallruleresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -136,11 +135,6 @@ public class CreateEgressFirewallRuleCmd extends BaseAsyncCreateCmd implements F
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public void setSourceCidrList(List<String> cidrs) {
         cidrlist = cidrs;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
index 878561d5e36..b77041ee174 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreateFirewallRuleCmd.java
@@ -48,7 +48,6 @@ import com.cloud.utils.net.NetUtils;
 public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements FirewallRule {
     public static final Logger s_logger = Logger.getLogger(CreateFirewallRuleCmd.class.getName());
 
-    private static final String s_name = "createfirewallruleresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -118,11 +117,6 @@ public class CreateFirewallRuleCmd extends BaseAsyncCreateCmd implements Firewal
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public void setSourceCidrList(List<String> cidrs) {
         cidrlist = cidrs;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
index a90367c8ac4..5e136210150 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
@@ -56,7 +56,6 @@ import com.cloud.vm.VirtualMachine;
 public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements PortForwardingRule {
     public static final Logger s_logger = Logger.getLogger(CreatePortForwardingRuleCmd.class.getName());
 
-    private static final String s_name = "createportforwardingruleresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -196,11 +195,6 @@ public class CreatePortForwardingRuleCmd extends BaseAsyncCreateCmd implements P
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceUnavailableException {
         CallContext callerContext = CallContext.current();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
index bcb25890135..f0ba8a92d01 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteEgressFirewallRuleCmd.java
@@ -42,7 +42,6 @@ import com.cloud.network.rules.FirewallRule;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteEgressFirewallRuleCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteEgressFirewallRuleCmd.class.getName());
-    private static final String s_name = "deleteegressfirewallruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -67,11 +66,6 @@ public class DeleteEgressFirewallRuleCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_FIREWALL_EGRESS_CLOSE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
index 7bd5836f99e..da1f6b62eca 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeleteFirewallRuleCmd.java
@@ -41,7 +41,6 @@ import com.cloud.network.rules.FirewallRule;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteFirewallRuleCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteFirewallRuleCmd.class.getName());
-    private static final String s_name = "deletefirewallruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -65,11 +64,6 @@ public class DeleteFirewallRuleCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_FIREWALL_CLOSE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
index 505777b64f9..aebf8da159b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/DeletePortForwardingRuleCmd.java
@@ -40,7 +40,6 @@ import com.cloud.network.rules.PortForwardingRule;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeletePortForwardingRuleCmd.class.getName());
-    private static final String s_name = "deleteportforwardingruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -69,11 +68,6 @@ public class DeletePortForwardingRuleCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_NET_RULE_DELETE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
index 3664031d550..c8c0e85252b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListEgressFirewallRulesCmd.java
@@ -40,7 +40,6 @@ import com.cloud.utils.Pair;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListEgressFirewallRulesCmd extends BaseListTaggedResourcesCmd implements IListFirewallRulesCmd {
     public static final Logger s_logger = Logger.getLogger(ListEgressFirewallRulesCmd.class.getName());
-    private static final String s_name = "listegressfirewallrulesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -95,11 +94,6 @@ public class ListEgressFirewallRulesCmd extends BaseListTaggedResourcesCmd imple
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends FirewallRule>, Integer> result = _firewallService.listFirewallRules(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
index 3c3feeabfe1..f79b77893d2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListFirewallRulesCmd.java
@@ -39,7 +39,6 @@ import com.cloud.utils.Pair;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListFirewallRulesCmd extends BaseListTaggedResourcesCmd implements IListFirewallRulesCmd {
     public static final Logger s_logger = Logger.getLogger(ListFirewallRulesCmd.class.getName());
-    private static final String s_name = "listfirewallrulesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -99,11 +98,6 @@ public class ListFirewallRulesCmd extends BaseListTaggedResourcesCmd implements
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends FirewallRule>, Integer> result = _firewallService.listFirewallRules(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
index d5c49a9a4d2..3a942c485fc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/ListPortForwardingRulesCmd.java
@@ -39,7 +39,6 @@ import com.cloud.utils.Pair;
 public class ListPortForwardingRulesCmd extends BaseListTaggedResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListPortForwardingRulesCmd.class.getName());
 
-    private static final String s_name = "listportforwardingrulesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -92,11 +91,6 @@ public class ListPortForwardingRulesCmd extends BaseListTaggedResourcesCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends PortForwardingRule>, Integer> result = _rulesService.listPortForwardingRules(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
index ddaaf7135b4..1aa06074367 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateEgressFirewallRuleCmd.java
@@ -39,7 +39,6 @@ import com.cloud.network.rules.FirewallRule.TrafficType;
 public class UpdateEgressFirewallRuleCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateEgressFirewallRuleCmd.class.getName());
 
-    private static final String s_name = "updateegressfirewallruleresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -70,11 +69,6 @@ public class UpdateEgressFirewallRuleCmd extends BaseAsyncCustomIdCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceUnavailableException {
         CallContext.current().setEventDetails("Rule Id: " + id);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
index 3d11ed0f3f5..b39efa01350 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdateFirewallRuleCmd.java
@@ -39,7 +39,6 @@ import com.cloud.network.rules.FirewallRule.TrafficType;
 public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateFirewallRuleCmd.class.getName());
 
-    private static final String s_name = "updatefirewallruleresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -71,11 +70,6 @@ public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceUnavailableException {
         CallContext.current().setEventDetails("Rule ID: " + id);
@@ -120,4 +114,4 @@ public class UpdateFirewallRuleCmd extends BaseAsyncCustomIdCmd {
         }
         return ownerId;
     }
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
index 7de50761630..2afc0bb66ad 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/firewall/UpdatePortForwardingRuleCmd.java
@@ -39,7 +39,6 @@ import com.cloud.utils.net.Ip;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdatePortForwardingRuleCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdatePortForwardingRuleCmd.class.getName());
-    private static final String s_name = "updateportforwardingruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -103,11 +102,6 @@ public class UpdatePortForwardingRuleCmd extends BaseAsyncCustomIdCmd {
 
 
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         PortForwardingRule rule = _entityMgr.findById(PortForwardingRule.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
index 5e89a2b05f0..18a209011c1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
@@ -36,7 +36,6 @@ import com.cloud.utils.Pair;
 public class ListGuestOsCategoriesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListGuestOsCategoriesCmd.class.getName());
 
-    private static final String s_name = "listoscategoriesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -64,11 +63,6 @@ public class ListGuestOsCategoriesCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends GuestOsCategory>, Integer> result = _mgr.listGuestOSCategoriesByCriteria(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
index 78fd112d0a6..7419cd8f759 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
@@ -37,7 +37,6 @@ import com.cloud.utils.Pair;
 public class ListGuestOsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListGuestOsCmd.class.getName());
 
-    private static final String s_name = "listostypesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -72,11 +71,6 @@ public class ListGuestOsCmd extends BaseListCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends GuestOS>, Integer> result = _mgr.listGuestOSByCriteria(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java
index 6151b6a29db..d4c59cd8d47 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java
@@ -43,7 +43,7 @@ import com.cloud.network.rules.FirewallRule;
 import com.cloud.user.Account;
 import com.cloud.utils.net.NetUtils;
 
-@APICommand(name = CreateIpv6FirewallRuleCmd.APINAME,
+@APICommand(name = "createIpv6FirewallRule",
         description = "Creates an Ipv6 firewall rule in the given network (the network has to belong to VPC)",
         responseObject = FirewallRuleResponse.class,
         requestHasSensitiveInfo = false,
@@ -52,7 +52,6 @@ import com.cloud.utils.net.NetUtils;
 public class CreateIpv6FirewallRuleCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateIpv6FirewallRuleCmd.class.getName());
 
-    public static final String APINAME = "createIpv6FirewallRule";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -159,11 +158,6 @@ public class CreateIpv6FirewallRuleCmd extends BaseAsyncCreateCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     public Integer getSourcePortStart() {
         return publicStartPort;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java
index 274f736a62b..5e176a3fabf 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java
@@ -34,7 +34,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.user.Account;
 
-@APICommand(name = DeleteIpv6FirewallRuleCmd.APINAME,
+@APICommand(name = "deleteIpv6FirewallRule",
         description = "Deletes a IPv6 firewall rule",
         responseObject = SuccessResponse.class,
         requestHasSensitiveInfo = false,
@@ -42,7 +42,6 @@ import com.cloud.user.Account;
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class DeleteIpv6FirewallRuleCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteIpv6FirewallRuleCmd.class.getName());
-    public static final String APINAME = "deleteIpv6FirewallRule";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -62,11 +61,6 @@ public class DeleteIpv6FirewallRuleCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_IPV6_FIREWALL_RULE_DELETE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java
index fc2714cf1bf..23941316275 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java
@@ -34,7 +34,7 @@ import org.apache.log4j.Logger;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.utils.Pair;
 
-@APICommand(name = ListIpv6FirewallRulesCmd.APINAME,
+@APICommand(name = "listIpv6FirewallRules",
         description = "Lists all IPv6 firewall rules",
         responseObject = FirewallRuleResponse.class,
         requestHasSensitiveInfo = false,
@@ -43,7 +43,6 @@ import com.cloud.utils.Pair;
 public class ListIpv6FirewallRulesCmd extends BaseListTaggedResourcesCmd implements IListFirewallRulesCmd {
     public static final Logger s_logger = Logger.getLogger(ListIpv6FirewallRulesCmd.class.getName());
 
-    public static final String APINAME = "listIpv6FirewallRules";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -100,11 +99,6 @@ public class ListIpv6FirewallRulesCmd extends BaseListTaggedResourcesCmd impleme
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends FirewallRule>, Integer> result = ipv6Service.listIpv6FirewallRules(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java
index 2295a17db83..49765c58daf 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.java
@@ -34,7 +34,7 @@ import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.user.Account;
 
-@APICommand(name = UpdateIpv6FirewallRuleCmd.APINAME,
+@APICommand(name = "updateIpv6FirewallRule",
         description = "Updates Ipv6 firewall rule with specified ID",
         responseObject = FirewallRuleResponse.class,
         requestHasSensitiveInfo = false,
@@ -43,7 +43,6 @@ import com.cloud.user.Account;
 public class UpdateIpv6FirewallRuleCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateIpv6FirewallRuleCmd.class.getName());
 
-    public static final String APINAME = "updateIpv6FirewallRule";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -121,11 +120,6 @@ public class UpdateIpv6FirewallRuleCmd extends BaseAsyncCustomIdCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + RESPONSE_SUFFIX;
-    }
-
     public Integer getSourcePortStart() {
         return publicStartPort;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
index 8e6750cc3e3..504e7c1b5cf 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/DeleteIsoCmd.java
@@ -38,7 +38,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteIsoCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteIsoCmd.class.getName());
-    private static final String s_name = "deleteisoresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -73,15 +72,6 @@ public class DeleteIsoCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
-    public static String getStaticName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         VirtualMachineTemplate iso = _entityMgr.findById(VirtualMachineTemplate.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
index 9e63ce00910..03ba2fab722 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/iso/ExtractIsoCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
 public class ExtractIsoCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(ExtractIsoCmd.class.getName());
 
-    private static final String s_name = "extractisoresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -86,11 +85,6 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_ISO_EXTRACT;
@@ -112,10 +106,6 @@ public class ExtractIsoCmd extends BaseAsyncCmd {
         return "extracting ISO: " + getId() + " from zone: " + getZoneId();
     }
 
-    public static String getStaticName() {
-        return s_name;
-    }
-
     @Override
     public ApiCommandResourceType getApiResourceType() {
         return ApiCommandResourceType.Iso;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
index d2ffcf3cd9f..3f035d45ae6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/job/ListAsyncJobsCmd.java
@@ -28,7 +28,6 @@ import org.apache.cloudstack.api.response.ListResponse;
 @APICommand(name = "listAsyncJobs", description = "Lists all pending asynchronous jobs for the account.", responseObject = AsyncJobResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListAsyncJobsCmd extends BaseListAccountResourcesCmd {
-    private static final String s_name = "listasyncjobsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -48,11 +47,6 @@ public class ListAsyncJobsCmd extends BaseListAccountResourcesCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
index 8a75552bfb8..f578078e3a1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/job/QueryAsyncJobResultCmd.java
@@ -31,7 +31,6 @@ import com.cloud.user.Account;
 public class QueryAsyncJobResultCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(QueryAsyncJobResultCmd.class.getName());
 
-    private static final String s_name = "queryasyncjobresultresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -52,11 +51,6 @@ public class QueryAsyncJobResultCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return Account.ACCOUNT_ID_SYSTEM;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
index 663815106e5..50d69c8d3ae 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignCertToLoadBalancerCmd.java
@@ -44,7 +44,6 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
 
     public static final Logger s_logger = Logger.getLogger(AssignCertToLoadBalancerCmd.class.getName());
 
-    private static final String s_name = "assigncerttoloadbalancerresponse";
 
     @Parameter(name = ApiConstants.LBID,
                type = CommandType.UUID,
@@ -77,11 +76,6 @@ public class AssignCertToLoadBalancerCmd extends BaseAsyncCmd {
         return EventTypes.EVENT_LB_CERT_ASSIGN;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventDescription() {
         return "Assigning a certificate to a load balancer";
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
index 0e2e86de1c7..7647b017f29 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/AssignToLoadBalancerRuleCmd.java
@@ -53,7 +53,6 @@ import com.cloud.vm.VirtualMachine;
 public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(AssignToLoadBalancerRuleCmd.class.getName());
 
-    private static final String s_name = "assigntoloadbalancerruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -99,11 +98,6 @@ public class AssignToLoadBalancerRuleCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getLoadBalancerId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
index 0b581f410a8..8c63c8f7951 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java
@@ -46,7 +46,6 @@ import com.cloud.utils.net.NetUtils;
 public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateApplicationLoadBalancerCmd.class.getName());
 
-    private static final String s_name = "createloadbalancerresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -192,11 +191,6 @@ public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceAllocationException, ResourceUnavailableException {
         ApplicationLoadBalancerRule rule = null;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
index 94c5324c23e..57cb8078738 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLBHealthCheckPolicyCmd.java
@@ -46,7 +46,6 @@ import com.cloud.user.Account;
 public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateLBHealthCheckPolicyCmd.class.getName());
 
-    private static final String s_name = "createlbhealthcheckpolicyresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -126,11 +125,6 @@ public class CreateLBHealthCheckPolicyCmd extends BaseAsyncCreateCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
index 8f384513ce3..ef9e46f3a76 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateLoadBalancerRuleCmd.java
@@ -54,7 +54,6 @@ import com.cloud.utils.net.NetUtils;
 public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements LoadBalancer */{
     public static final Logger s_logger = Logger.getLogger(CreateLoadBalancerRuleCmd.class.getName());
 
-    private static final String s_name = "createloadbalancerruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -263,11 +262,6 @@ public class CreateLoadBalancerRuleCmd extends BaseAsyncCreateCmd /*implements L
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceAllocationException, ResourceUnavailableException {
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
index d945e81a8b3..912c760168b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java
@@ -37,7 +37,6 @@ import com.cloud.exception.InvalidParameterValueException;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteApplicationLoadBalancerCmd.class.getName());
-    private static final String s_name = "deleteloadbalancerresponse";
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
@@ -57,11 +56,6 @@ public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         ApplicationLoadBalancerRule lb = _entityMgr.findById(ApplicationLoadBalancerRule.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
index 74df888b810..159d6b21cbc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLBHealthCheckPolicyCmd.java
@@ -38,7 +38,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteLBHealthCheckPolicyCmd.class.getName());
-    private static final String s_name = "deletelbhealthcheckpolicyresponse";
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
     // ///////////////////////////////////////////////////
@@ -62,11 +61,6 @@ public class DeleteLBHealthCheckPolicyCmd extends BaseAsyncCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
index 2c6ba178b38..f05d4cd2be3 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteLoadBalancerRuleCmd.java
@@ -38,7 +38,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteLoadBalancerRuleCmd.class.getName());
-    private static final String s_name = "deleteloadbalancerruleresponse";
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
@@ -62,11 +61,6 @@ public class DeleteLoadBalancerRuleCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
index 656c14c1048..3db733182a1 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteSslCertCmd.java
@@ -42,7 +42,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 public class DeleteSslCertCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteSslCertCmd.class.getName());
 
-    private static final String s_name = "deletesslcertresponse";
 
     @Inject
     CertService _certService;
@@ -80,14 +79,9 @@ public class DeleteSslCertCmd extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
     }
 
-}
\ No newline at end of file
+}
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
index a925b880a22..ad68b301844 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java
@@ -40,7 +40,6 @@ import com.cloud.utils.Pair;
 public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListApplicationLoadBalancersCmd.class.getName());
 
-    private static final String s_name = "listloadbalancersresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -102,11 +101,6 @@ public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd
         return super.getDisplay();
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public Scheme getScheme() {
         if (scheme != null) {
             if (scheme.equalsIgnoreCase(Scheme.Internal.toString())) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
index ad0486f31cc..1c1f5d1f9af 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBHealthCheckPoliciesCmd.java
@@ -39,7 +39,6 @@ import com.cloud.network.rules.LoadBalancer;
 public class ListLBHealthCheckPoliciesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListLBHealthCheckPoliciesCmd.class.getName());
 
-    private static final String s_name = "listlbhealthcheckpoliciesresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -78,11 +77,6 @@ public class ListLBHealthCheckPoliciesCmd extends BaseListCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         List<LBHealthCheckResponse> hcpResponses = new ArrayList<LBHealthCheckResponse>();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
index 4e11430d0b4..3d08d925797 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLBStickinessPoliciesCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
 public class ListLBStickinessPoliciesCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListLBStickinessPoliciesCmd.class.getName());
 
-    private static final String s_name = "listlbstickinesspoliciesresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -83,11 +82,6 @@ public class ListLBStickinessPoliciesCmd extends BaseListCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
index d1fa8da48f4..51a8fa4bfc8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListLoadBalancerRulesCmd.java
@@ -41,7 +41,6 @@ import com.cloud.utils.Pair;
 public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListLoadBalancerRulesCmd.class.getName());
 
-    private static final String s_name = "listloadbalancerrulesresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -114,11 +113,6 @@ public class ListLoadBalancerRulesCmd extends BaseListTaggedResourcesCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends LoadBalancer>, Integer> loadBalancers = _lbService.searchForLoadBalancers(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
index a917c58de60..3f422801780 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
@@ -41,7 +41,6 @@ import com.cloud.utils.exception.CloudRuntimeException;
 public class ListSslCertsCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(ListSslCertsCmd.class.getName());
 
-    private static final String s_name = "listsslcertsresponse";
 
     @Inject
     CertService _certService;
@@ -102,11 +101,6 @@ public class ListSslCertsCmd extends BaseCmd {
         }
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
index d794384b4fa..38593629f78 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveCertFromLoadBalancerCmd.java
@@ -42,7 +42,6 @@ public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd {
 
     public static final Logger s_logger = Logger.getLogger(RemoveCertFromLoadBalancerCmd.class.getName());
 
-    private static final String s_name = "removecertfromloadbalancerresponse";
 
     @Parameter(name = ApiConstants.LBID,
                type = CommandType.UUID,
@@ -68,11 +67,6 @@ public class RemoveCertFromLoadBalancerCmd extends BaseAsyncCmd {
         return EventTypes.EVENT_LB_CERT_REMOVE;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventDescription() {
         return "Removing a certificate from a load balancer with ID " + getLbRuleId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
index b0be9613748..01c30c4b3c7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/RemoveFromLoadBalancerRuleCmd.java
@@ -51,7 +51,6 @@ import com.cloud.user.Account;
 public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(RemoveFromLoadBalancerRuleCmd.class.getName());
 
-    private static final String s_name = "removefromloadbalancerruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -97,11 +96,6 @@ public class RemoveFromLoadBalancerRuleCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
index 2c91f934f7d..27d49096ed6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java
@@ -36,7 +36,6 @@ import com.cloud.network.rules.FirewallRule;
 public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateApplicationLoadBalancerCmd.class.getName());
 
-    private static final String s_name = "updateloadbalancerresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -50,11 +49,6 @@ public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd {
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public Long getId() {
         return id;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
index 06d9263c954..b6bb59e60dc 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBHealthCheckPolicyCmd.java
@@ -32,7 +32,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateLBHealthCheckPolicyCmd extends BaseAsyncCustomIdCmd{
     public static final Logger s_logger = Logger.getLogger(UpdateLBHealthCheckPolicyCmd.class.getName());
 
-    private static final String s_name = "updatelbhealthcheckpolicyresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -54,11 +53,6 @@ public class UpdateLBHealthCheckPolicyCmd extends BaseAsyncCustomIdCmd{
         return display;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
index 55b3d578c67..2b1f1cc38f6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLBStickinessPolicyCmd.java
@@ -31,7 +31,6 @@ requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateLBStickinessPolicyCmd extends BaseAsyncCustomIdCmd{
     public static final Logger s_logger = Logger.getLogger(UpdateLBStickinessPolicyCmd.class.getName());
 
-    private static final String s_name = "updatelbstickinesspolicyresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -53,11 +52,6 @@ public class UpdateLBStickinessPolicyCmd extends BaseAsyncCustomIdCmd{
         return display;
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         Account account = CallContext.current().getCallingAccount();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
index 6ee277a354c..b09c01adee6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateLoadBalancerRuleCmd.java
@@ -39,7 +39,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class UpdateLoadBalancerRuleCmd extends BaseAsyncCustomIdCmd {
     public static final Logger s_logger = Logger.getLogger(UpdateLoadBalancerRuleCmd.class.getName());
-    private static final String s_name = "updateloadbalancerruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -99,11 +98,6 @@ public class UpdateLoadBalancerRuleCmd extends BaseAsyncCustomIdCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         LoadBalancer lb = _entityMgr.findById(LoadBalancer.class, getId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
index c206a165bc6..abafde85615 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
@@ -43,7 +43,6 @@ import org.apache.cloudstack.network.tls.CertService;
 public class UploadSslCertCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(UploadSslCertCmd.class.getName());
 
-    private static final String s_name = "uploadsslcertresponse";
 
     @Inject
     CertService _certService;
@@ -138,11 +137,6 @@ public class UploadSslCertCmd extends BaseCmd {
 
     }
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         return CallContext.current().getCallingAccount().getId();
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
index 70b721b96ee..62c4906b1b7 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/CreateIpForwardingRuleCmd.java
@@ -47,7 +47,6 @@ import com.cloud.user.Account;
 public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements StaticNatRule {
     public static final Logger s_logger = Logger.getLogger(CreateIpForwardingRuleCmd.class.getName());
 
-    private static final String s_name = "createipforwardingruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -105,11 +104,6 @@ public class CreateIpForwardingRuleCmd extends BaseAsyncCreateCmd implements Sta
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() throws ResourceUnavailableException {
 
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
index d40a63fc67d..5b1335ccf22 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DeleteIpForwardingRuleCmd.java
@@ -39,7 +39,6 @@ import com.cloud.network.rules.FirewallRule;
 public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteIpForwardingRuleCmd.class.getName());
 
-    private static final String s_name = "deleteipforwardingruleresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -64,11 +63,6 @@ public class DeleteIpForwardingRuleCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         CallContext.current().setEventDetails("Rule ID: " + id);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
index c42670d2bc9..9afdfa3642e 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
@@ -39,7 +39,6 @@ import com.cloud.network.IpAddress;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DisableStaticNatCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DisableStaticNatCmd.class.getName());
-    private static final String s_name = "disablestaticnatresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -63,11 +62,6 @@ public class DisableStaticNatCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_DISABLE_STATIC_NAT;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
index 60e579196c4..ba97356582a 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
@@ -42,7 +42,6 @@ import com.cloud.uservm.UserVm;
 public class EnableStaticNatCmd extends BaseCmd {
     public static final Logger s_logger = Logger.getLogger(EnableStaticNatCmd.class.getName());
 
-    private static final String s_name = "enablestaticnatresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -113,11 +112,6 @@ public class EnableStaticNatCmd extends BaseCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public long getEntityOwnerId() {
         UserVm userVm = _entityMgr.findById(UserVm.class, getVirtualMachineId());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
index bc157fc9e1f..5e9da328bc8 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/nat/ListIpForwardingRulesCmd.java
@@ -40,7 +40,6 @@ import com.cloud.utils.Pair;
 public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListIpForwardingRulesCmd.class.getName());
 
-    private static final String s_name = "listipforwardingrulesresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -68,11 +67,6 @@ public class ListIpForwardingRulesCmd extends BaseListProjectAndAccountResources
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public Long getPublicIpAddressId() {
         return publicIpAddressId;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
index 28416ef9793..70e67151c1d 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java
@@ -45,7 +45,6 @@ import com.cloud.utils.net.NetUtils;
 public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateNetworkACLCmd.class.getName());
 
-    private static final String s_name = "createnetworkaclresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -143,11 +142,6 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     public String getAction() {
         return action;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
index 884ca53f05f..14dbfcafd7b 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLListCmd.java
@@ -40,7 +40,6 @@ import com.cloud.user.Account;
 public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd {
     public static final Logger s_logger = Logger.getLogger(CreateNetworkACLListCmd.class.getName());
 
-    private static final String s_name = "createnetworkacllistresponse";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -91,11 +90,6 @@ public class CreateNetworkACLListCmd extends BaseAsyncCreateCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void create() {
         NetworkACL result = _networkACLService.createNetworkACL(getName(), getDescription(), getVpcId(), isDisplay());
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java
index 8224562da76..4a1f65ba7a2 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java
@@ -35,7 +35,7 @@ import com.cloud.user.Account;
 
 import java.util.List;
 
-@APICommand(name = CreateNetworkPermissionsCmd.APINAME, description = "Updates network permissions.",
+@APICommand(name = "createNetworkPermissions", description = "Updates network permissions.",
         responseObject = SuccessResponse.class,
         entityType = {Network.class},
         requestHasSensitiveInfo = false,
@@ -45,7 +45,6 @@ import java.util.List;
 public class CreateNetworkPermissionsCmd extends BaseCmd {
     public static final Logger LOGGER = Logger.getLogger(CreateNetworkPermissionsCmd.class.getName());
 
-    public static final String APINAME = "createNetworkPermissions";
 
     // ///////////////////////////////////////////////////
     // ////////////// API parameters /////////////////////
@@ -99,11 +98,6 @@ public class CreateNetworkPermissionsCmd extends BaseCmd {
     // ///////////// API Implementation///////////////////
     // ///////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return APINAME.toLowerCase() + BaseCmd.RESPONSE_SUFFIX;
-    }
-
     @Override
     public void execute() {
         if (accountIds != null && accountNames != null) {
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
index 6243826c745..f171492b2f6 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteNetworkACLCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteNetworkACLCmd.class.getName());
-    private static final String s_name = "deletenetworkaclresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -57,11 +56,6 @@ public class DeleteNetworkACLCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_NETWORK_ACL_ITEM_DELETE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
index e6868dbbbdf..5c24efae6eb 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkACLListCmd.java
@@ -37,7 +37,6 @@ import com.cloud.user.Account;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteNetworkACLListCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteNetworkACLListCmd.class.getName());
-    private static final String s_name = "deletenetworkacllistresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -57,11 +56,6 @@ public class DeleteNetworkACLListCmd extends BaseAsyncCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public String getEventType() {
         return EventTypes.EVENT_NETWORK_ACL_DELETE;
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
index 9f2106139f8..5f15c23e23f 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
@@ -38,7 +38,6 @@ import com.cloud.network.Network;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class DeleteNetworkCmd extends BaseAsyncCmd {
     public static final Logger s_logger = Logger.getLogger(DeleteNetworkCmd.class.getName());
-    private static final String s_name = "deletenetworkresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -67,11 +66,6 @@ public class DeleteNetworkCmd extends BaseAsyncCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         CallContext.current().setEventDetails("Network Id: " + id);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
index 80d616ab6fc..f3a06142d78 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
@@ -38,7 +38,6 @@ import com.cloud.utils.Pair;
 public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListNetworkACLListsCmd.class.getName());
 
-    private static final String s_name = "listnetworkacllistsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -89,11 +88,6 @@ public class ListNetworkACLListsCmd extends BaseListProjectAndAccountResourcesCm
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends NetworkACL>, Integer> result = _networkACLService.listNetworkACLs(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
index 4815bf400e4..945142f4df0 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
@@ -38,7 +38,6 @@ import com.cloud.utils.Pair;
 public class ListNetworkACLsCmd extends BaseListTaggedResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListNetworkACLsCmd.class.getName());
 
-    private static final String s_name = "listnetworkaclsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -105,11 +104,6 @@ public class ListNetworkACLsCmd extends BaseListTaggedResourcesCmd {
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
 
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends NetworkACLItem>, Integer> result = _networkACLService.listNetworkACLItems(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
index e294d39251d..70c01fd1d88 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkOfferingsCmd.java
@@ -37,7 +37,6 @@ import com.cloud.utils.Pair;
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
 public class ListNetworkOfferingsCmd extends BaseListCmd {
     public static final Logger s_logger = Logger.getLogger(ListNetworkOfferingsCmd.class.getName());
-    private static final String s_name = "listnetworkofferingsresponse";
 
     /////////////////////////////////////////////////////
     //////////////// API parameters /////////////////////
@@ -192,11 +191,6 @@ public class ListNetworkOfferingsCmd extends BaseListCmd {
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////
-    @Override
-    public String getCommandName() {
-        return s_name;
-    }
-
     @Override
     public void execute() {
         Pair<List<? extends NetworkOffering>, Integer> offerings = _configService.searchForNetworkOfferings(this);
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java
index ea5034b1be7..9e6b01d3676 100644
--- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java
+++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java
@@ -35,7 +35,7 @@ import com.cloud.user.Account;
... 5792 lines suppressed ...