--- old/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c	2020-01-10 19:17:51.321400951 +0000
+++ new/src/jdk.jdwp.agent/share/native/libjdwp/ModuleReferenceImpl.c	2020-01-10 19:17:50.623386265 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -83,8 +83,10 @@
     return JNI_TRUE;
 }
 
-
-void *ModuleReference_Cmds[] = { (void *)3
-    ,(void *)getName
-    ,(void *)getClassLoader
+CommandSet ModuleReference_Cmds = {
+    2, "ModuleReference",
+    {
+        {getName, "GetName"},
+        {getClassLoader, "GetClassLoader"}
+    }
 };