--- old/src/hotspot/share/prims/whitebox.cpp	2020-01-07 11:38:44.589576112 +0100
+++ new/src/hotspot/share/prims/whitebox.cpp	2020-01-07 11:38:44.234564889 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -1986,7 +1986,7 @@
 #endif // INCLUDE_CDS
 WB_END
 
-WB_ENTRY(jboolean, WB_isC2OrGraalIncludedInVmBuild(JNIEnv* env))
+WB_ENTRY(jboolean, WB_isC2OrJVMCIIncludedInVmBuild(JNIEnv* env))
 #if COMPILER2_OR_JVMCI
   return true;
 #else
@@ -2419,7 +2419,7 @@
   {CC"areOpenArchiveHeapObjectsMapped",   CC"()Z",    (void*)&WB_AreOpenArchiveHeapObjectsMapped},
   {CC"isCDSIncludedInVmBuild",            CC"()Z",    (void*)&WB_IsCDSIncludedInVmBuild },
   {CC"isJFRIncludedInVmBuild",            CC"()Z",    (void*)&WB_IsJFRIncludedInVmBuild },
-  {CC"isC2OrGraalIncludedInVmBuild",      CC"()Z",    (void*)&WB_isC2OrGraalIncludedInVmBuild },
+  {CC"isC2OrJVMCIIncludedInVmBuild",      CC"()Z",    (void*)&WB_isC2OrJVMCIIncludedInVmBuild },
   {CC"isJavaHeapArchiveSupported",        CC"()Z",    (void*)&WB_IsJavaHeapArchiveSupported },
   {CC"cdsMemoryMappingFailed",            CC"()Z",    (void*)&WB_CDSMemoryMappingFailed },
 
--- old/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java	2020-01-07 11:38:45.986620279 +0100
+++ new/test/hotspot/jtreg/gc/g1/TestGCLogMessages.java	2020-01-07 11:38:45.617608613 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 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
@@ -87,7 +87,7 @@
         }
 
         public boolean isAvailable() {
-            return Compiler.isC2OrGraalIncludedInVmBuild();
+            return Compiler.isC2OrJVMCIIncludedInVmBuild();
         }
     }
 
--- old/test/lib/sun/hotspot/WhiteBox.java	2020-01-07 11:38:47.314662265 +0100
+++ new/test/lib/sun/hotspot/WhiteBox.java	2020-01-07 11:38:46.924649935 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012, 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
@@ -227,7 +227,7 @@
   public native void NMTArenaMalloc(long arena, long size);
 
   // Compiler
-  public native boolean isC2OrGraalIncludedInVmBuild();
+  public native boolean isC2OrJVMCIIncludedInVmBuild();
 
   public native int     matchesMethod(Executable method, String pattern);
   public native int     matchesInline(Executable method, String pattern);
--- old/test/lib/sun/hotspot/code/Compiler.java	2020-01-07 11:38:48.646704377 +0100
+++ new/test/lib/sun/hotspot/code/Compiler.java	2020-01-07 11:38:48.260692174 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -35,12 +35,12 @@
     private static final WhiteBox WB = WhiteBox.getWhiteBox();
 
     /**
-     * Check if C2 or Graal were included in the VM build
+     * Check if C2 or JVMCI were included in the VM build
      *
-     * @return true if either C2 or Graal were included in the VM build.
+     * @return true if either C2 or JVMCI were included in the VM build.
      */
-    public static boolean isC2OrGraalIncludedInVmBuild() {
-        return WB.isC2OrGraalIncludedInVmBuild();
+    public static boolean isC2OrJVMCIIncludedInVmBuild() {
+        return WB.isC2OrJVMCIIncludedInVmBuild();
     }
 
     /**