diff -r 296560a21cea -r aa96c53c592b src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp
--- a/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp	Mon Jul 15 12:31:35 2019 +0200
+++ b/src/hotspot/share/gc/shenandoah/c2/shenandoahBarrierSetC2.cpp	Mon Jul 15 15:27:06 2019 +0200
@@ -297,7 +297,7 @@
 
 bool ShenandoahBarrierSetC2::is_shenandoah_lrb_call(Node* call) {
   return call->is_CallLeaf() &&
-         call->as_CallLeaf()->entry_point() == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_JRT);
+          call->as_CallLeaf()->entry_point() == CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier);
 }
 
 bool ShenandoahBarrierSetC2::is_shenandoah_marking_if(PhaseTransform *phase, Node* n) {
@@ -561,8 +561,8 @@
     GraphKit* kit = static_cast<C2ParseAccess &>(access).kit();
     Node* call = kit->make_runtime_call(GraphKit::RC_LEAF,
                                         oop_load_from_native_barrier_Type(),
-                                        CAST_FROM_FN_PTR(address, ShenandoahRuntime::oop_load_from_native_barrier),
-                                        "ShenandoahRuntime::oop_load_from_native_barrier",
+                                        CAST_FROM_FN_PTR(address, ShenandoahRuntime::load_reference_barrier_native),
+                                        "ShenandoahRuntime::load_reference_barrier_native",
                                         NULL, load);
     Node* proj = kit->gvn().transform(new ProjNode(call, TypeFunc::Parms+0));
     return kit->gvn().transform(new CheckCastPPNode(kit->control(), proj, load->bottom_type()));
@@ -750,7 +750,7 @@
   return strcmp(call->_name, "shenandoah_clone_barrier") == 0 ||
          strcmp(call->_name, "shenandoah_cas_obj") == 0 ||
          strcmp(call->_name, "shenandoah_wb_pre") == 0 ||
-         strcmp(call->_name, "ShenandoahRuntime::oop_load_from_native_barrier") == 0;
+         strcmp(call->_name, "ShenandoahRuntime::load_reference_barrier_native") == 0;
 }
 
 Node* ShenandoahBarrierSetC2::step_over_gc_barrier(Node* c) const {
@@ -1183,7 +1183,7 @@
       conn_graph->add_local_var_and_edge(n, PointsToNode::NoEscape, n->in(ShenandoahLoadReferenceBarrierNode::ValueIn), delayed_worklist);
       return true;
     case Op_CallLeaf:
-      if (strcmp(n->as_CallLeaf()->_name, "ShenandoahRuntime::oop_load_from_native_barrier") == 0) {
+      if (strcmp(n->as_CallLeaf()->_name, "ShenandoahRuntime::load_reference_barrier_native") == 0) {
         conn_graph->map_ideal_node(n, conn_graph->phantom_obj);
         return true;
       }