diff --git a/src/hotspot/share/memory/heapInspection.cpp b/src/hotspot/share/memory/heapInspection.cpp
index 385bf8ff6dd..8fc06c25355 100644
--- a/src/hotspot/share/memory/heapInspection.cpp
+++ b/src/hotspot/share/memory/heapInspection.cpp
@@ -590,7 +590,7 @@ static void print_flat_field(outputStream* st, int level, int offset, InstanceKl
   }
 }
 
-void PrintClassLayout::print_class_layout(outputStream* st, char* class_name) {
+void ClassPrintLayout::class_print_layout(outputStream* st, char* class_name) {
   KlassInfoTable cit(true);
   if (cit.allocation_failed()) {
     st->print_cr("ERROR: Ran out of C-heap; hierarchy not generated");
diff --git a/src/hotspot/share/memory/heapInspection.hpp b/src/hotspot/share/memory/heapInspection.hpp
index 9b6b631a9c7..646610e753d 100644
--- a/src/hotspot/share/memory/heapInspection.hpp
+++ b/src/hotspot/share/memory/heapInspection.hpp
@@ -190,9 +190,9 @@ class KlassInfoHisto : public StackObj {
   void sort();
 };
 
-class PrintClassLayout : AllStatic {
+class ClassPrintLayout : AllStatic {
  public:
-  static void print_class_layout(outputStream* st, char* classname);
+  static void class_print_layout(outputStream* st, char* classname);
 };
 
 #endif // INCLUDE_SERVICES
diff --git a/src/hotspot/share/runtime/vmOperations.cpp b/src/hotspot/share/runtime/vmOperations.cpp
index ab77ead2499..7091943f5cd 100644
--- a/src/hotspot/share/runtime/vmOperations.cpp
+++ b/src/hotspot/share/runtime/vmOperations.cpp
@@ -617,7 +617,7 @@ void VM_PrintClassHierarchy::doit() {
   KlassHierarchy::print_class_hierarchy(_out, _print_interfaces, _print_subclasses, _classname);
 }
 
-void VM_PrintClassLayout::doit() {
-  PrintClassLayout::print_class_layout(_out, _class_name);
+void VM_ClassPrintLayout::doit() {
+  ClassPrintLayout::class_print_layout(_out, _class_name);
 }
 #endif
diff --git a/src/hotspot/share/runtime/vmOperations.hpp b/src/hotspot/share/runtime/vmOperations.hpp
index b8626509813..297f8719c07 100644
--- a/src/hotspot/share/runtime/vmOperations.hpp
+++ b/src/hotspot/share/runtime/vmOperations.hpp
@@ -274,13 +274,13 @@ class VM_PrintCompileQueue: public VM_Operation {
   void doit();
 };
 
-class VM_PrintClassLayout: public VM_Operation {
+class VM_ClassPrintLayout: public VM_Operation {
  private:
   outputStream* _out;
   char* _class_name;
  public:
-  VM_PrintClassLayout(outputStream* st, char* class_name): _out(st), _class_name(class_name) {}
-  VMOp_Type type() const { return VMOp_PrintClassHierarchy; }
+  VM_ClassPrintLayout(outputStream* st, char* class_name): _out(st), _class_name(class_name) {}
+  VMOp_Type type() const { return VMOp_ClassPrintLayout; }
   void doit();
 };
 
diff --git a/src/hotspot/share/services/diagnosticCommand.cpp b/src/hotspot/share/services/diagnosticCommand.cpp
index d2d03556db3..496f61a00ee 100644
--- a/src/hotspot/share/services/diagnosticCommand.cpp
+++ b/src/hotspot/share/services/diagnosticCommand.cpp
@@ -119,7 +119,7 @@ void DCmd::register_dcmds() {
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<SymboltableDCmd>(full_export));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<StringtableDCmd>(full_export));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<metaspace::MetaspaceDCmd>(full_export));
-  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<PrintClassLayoutDCmd>(full_export));
+  DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<ClassPrintLayoutDCmd>(full_export));
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<EventLogDCmd>(full_export));
 #if INCLUDE_JVMTI // Both JVMTI and SERVICES have to be enabled to have this dcmd
   DCmdFactory::register_DCmdFactory(new DCmdFactoryImpl<JVMTIAgentLoadDCmd>(full_export));
@@ -946,21 +946,21 @@ void ClassHierarchyDCmd::execute(DCmdSource source, TRAPS) {
   VMThread::execute(&printClassHierarchyOp);
 }
 
-PrintClassLayoutDCmd::PrintClassLayoutDCmd(outputStream* output, bool heap) :
+ClassPrintLayoutDCmd::ClassPrintLayoutDCmd(outputStream* output, bool heap) :
                                        DCmdWithParser(output, heap),
   _classname("classname", "Name of class whose layout should be printed. ",
              "STRING", true) {
   _dcmdparser.add_dcmd_argument(&_classname);
 }
 
-void PrintClassLayoutDCmd::execute(DCmdSource source, TRAPS) {
-  VM_PrintClassLayout printClassLayoutOp(output(), _classname.value());
-  VMThread::execute(&printClassLayoutOp);
+void ClassPrintLayoutDCmd::execute(DCmdSource source, TRAPS) {
+  VM_ClassPrintLayout classPrintLayoutOp(output(), _classname.value());
+  VMThread::execute(&classPrintLayoutOp);
 }
 
-int PrintClassLayoutDCmd::num_arguments() {
+int ClassPrintLayoutDCmd::num_arguments() {
   ResourceMark rm;
-  PrintClassLayoutDCmd* dcmd = new PrintClassLayoutDCmd(nullptr, false);
+  ClassPrintLayoutDCmd* dcmd = new ClassPrintLayoutDCmd(nullptr, false);
   if (dcmd != nullptr) {
     DCmdMark mark(dcmd);
     return dcmd->_dcmdparser.num_arguments();
diff --git a/src/hotspot/share/services/diagnosticCommand.hpp b/src/hotspot/share/services/diagnosticCommand.hpp
index 09c9692ea82..182e89dc965 100644
--- a/src/hotspot/share/services/diagnosticCommand.hpp
+++ b/src/hotspot/share/services/diagnosticCommand.hpp
@@ -334,11 +334,11 @@ class ClassHierarchyDCmd : public DCmdWithParser {
   virtual void execute(DCmdSource source, TRAPS);
 };
 
-class PrintClassLayoutDCmd : public DCmdWithParser {
+class ClassPrintLayoutDCmd : public DCmdWithParser {
 protected:
   DCmdArgument<char*> _classname; // Class name whose layout should be printed.
 public:
-  PrintClassLayoutDCmd(outputStream* output, bool heap);
+  ClassPrintLayoutDCmd(outputStream* output, bool heap);
   static const char* name() {
     return "VM.class_print_layout";
   }