diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java
index ccb77de71f8..ea5bacfb1f4 100644
--- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java
+++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ImportVsphereStoragePoliciesCmd.java
@@ -49,7 +49,7 @@ import java.util.List;
         authorized = {RoleType.Admin})
 public class ImportVsphereStoragePoliciesCmd extends BaseCmd {
 
-    public static final Logger s_logger = Logger.getLogger(ImportVsphereStoragePoliciesCmd.class.getName());
+    public static final Logger LOGGER = Logger.getLogger(ImportVsphereStoragePoliciesCmd.class.getName());
 
     public static final String APINAME = "importVsphereStoragePolicies";
 
diff --git a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java
index 26a34a874e2..90e8e880548 100644
--- a/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java
+++ b/plugins/hypervisors/vmware/src/main/java/org/apache/cloudstack/api/command/admin/zone/ListVsphereStoragePoliciesCmd.java
@@ -48,7 +48,7 @@ import java.util.List;
         authorized = {RoleType.Admin})
 public class ListVsphereStoragePoliciesCmd extends BaseCmd {
 
-    public static final Logger s_logger = Logger.getLogger(ListVsphereStoragePoliciesCmd.class.getName());
+    public static final Logger LOGGER = Logger.getLogger(ListVsphereStoragePoliciesCmd.class.getName());
 
     public static final String APINAME = "listVsphereStoragePolicies";
 
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmPlacementSolverMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmPlacementSolverMO.java
index 9735f424d88..3eb909fc31b 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmPlacementSolverMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmPlacementSolverMO.java
@@ -30,7 +30,7 @@ import java.util.List;
 
 public class PbmPlacementSolverMO extends BaseMO {
 
-    private static final Logger s_logger = Logger.getLogger(PbmPlacementSolverMO.class);
+    private static final Logger LOGGER = Logger.getLogger(PbmPlacementSolverMO.class);
 
     public PbmPlacementSolverMO (VmwareContext context) {
         super(context, context.getPbmServiceContent().getPlacementSolver());
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmProfileManagerMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmProfileManagerMO.java
index 6858c7b0ffa..a4142ecde8a 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmProfileManagerMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/PbmProfileManagerMO.java
@@ -35,7 +35,7 @@ import java.util.stream.Collectors;
 
 public class PbmProfileManagerMO extends BaseMO {
 
-    private static final Logger s_logger = Logger.getLogger(PbmProfileManagerMO.class);
+    private static final Logger LOGGER = Logger.getLogger(PbmProfileManagerMO.class);
 
     public PbmProfileManagerMO (VmwareContext context) {
         super(context, context.getPbmServiceContent().getProfileManager());
@@ -50,8 +50,8 @@ public class PbmProfileManagerMO extends BaseMO {
     }
 
     public List<PbmProfileId> getStorageProfileIds() throws Exception {
-        if (s_logger.isDebugEnabled()) {
-            s_logger.debug("Querying vCenter " + _context.getServerAddress() + " for profiles");
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("Querying vCenter " + _context.getServerAddress() + " for profiles");
         }
         List<PbmProfileId> profileIds = _context.getPbmService().pbmQueryProfile(_mor, getStorageResourceType(), null);
         return profileIds;
@@ -76,7 +76,7 @@ public class PbmProfileManagerMO extends BaseMO {
 
         if (profileId == null) {
             String errMsg = String.format("Storage profile with id %s not found", storageProfileId);
-            s_logger.debug(errMsg);
+            LOGGER.debug(errMsg);
             throw new CloudRuntimeException(errMsg);
         }
 
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualStorageObjectManagerMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualStorageObjectManagerMO.java
index 7924dfda646..d5f4eb3af06 100644
--- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualStorageObjectManagerMO.java
+++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualStorageObjectManagerMO.java
@@ -30,7 +30,7 @@ import com.cloud.hypervisor.vmware.util.VmwareContext;
 
 public class VirtualStorageObjectManagerMO extends BaseMO {
     @SuppressWarnings("unused")
-    private static final Logger s_logger = Logger.getLogger(VirtualStorageObjectManagerMO.class);
+    private static final Logger LOGGER = Logger.getLogger(VirtualStorageObjectManagerMO.class);
 
     public VirtualStorageObjectManagerMO(VmwareContext context) {
         super(context, context.getServiceContent().getVStorageObjectManager());
@@ -86,7 +86,7 @@ public class VirtualStorageObjectManagerMO extends BaseMO {
             vStorageObject = (VStorageObject)taskInfo.getResult();
 
         } else {
-            s_logger.error("VMware CreateDisk_Task failed due to " + TaskMO.getTaskFailureInfo(_context, morTask));
+            LOGGER.error("VMware CreateDisk_Task failed due to " + TaskMO.getTaskFailureInfo(_context, morTask));
         }
 
         return vStorageObject;