--- old/src/share/vm/gc/g1/g1CollectedHeap.cpp	2017-03-06 14:46:51.303204809 +0100
+++ new/src/share/vm/gc/g1/g1CollectedHeap.cpp	2017-03-06 14:46:51.188201332 +0100
@@ -4532,7 +4532,7 @@
 #if defined(COMPILER2) || INCLUDE_JVMCI
   double start = os::elapsedTime();
   DerivedPointerTable::update_pointers();
-  g1_policy()->phase_times()->record_dpt_update_time((os::elapsedTime() - start) * 1000.0);
+  g1_policy()->phase_times()->record_derived_pointer_table_update_time((os::elapsedTime() - start) * 1000.0);
 #endif
   g1_policy()->print_age_table();
 }
--- old/src/share/vm/gc/g1/g1GCPhaseTimes.cpp	2017-03-06 14:46:51.915223315 +0100
+++ new/src/share/vm/gc/g1/g1GCPhaseTimes.cpp	2017-03-06 14:46:51.804219958 +0100
@@ -114,7 +114,7 @@
   _cur_string_dedup_fixup_time_ms = 0.0;
   _cur_prepare_tlab_time_ms = 0.0;
   _cur_resize_tlab_time_ms = 0.0;
-  _cur_dpt_update_time_ms = 0.0;
+  _cur_derived_pointer_table_update_time_ms = 0.0;
   _cur_clear_ct_time_ms = 0.0;
   _cur_expand_heap_time_ms = 0.0;
   _cur_ref_proc_time_ms = 0.0;
@@ -381,7 +381,7 @@
 
   debug_time("Redirty Cards", _recorded_redirty_logged_cards_time_ms);
 #if defined(COMPILER2) || INCLUDE_JVMCI
-  debug_time("DPT Update", _cur_dpt_update_time_ms);
+  debug_time("DerivedPointerTable Update", _cur_derived_pointer_table_update_time_ms);
 #endif
   if (_recorded_clear_claimed_marks_time_ms > 0.0) {
     debug_time("Clear Claimed Marks", _recorded_clear_claimed_marks_time_ms);
--- old/src/share/vm/gc/g1/g1GCPhaseTimes.hpp	2017-03-06 14:46:52.489240671 +0100
+++ new/src/share/vm/gc/g1/g1GCPhaseTimes.hpp	2017-03-06 14:46:52.371237103 +0100
@@ -100,7 +100,7 @@
   double _cur_prepare_tlab_time_ms;
   double _cur_resize_tlab_time_ms;
 
-  double _cur_dpt_update_time_ms;
+  double _cur_derived_pointer_table_update_time_ms;
   
   double _cur_clear_ct_time_ms;
   double _cur_expand_heap_time_ms;
@@ -187,8 +187,8 @@
     _cur_resize_tlab_time_ms = ms;
   }
 
-  void record_dpt_update_time(double ms) {
-    _cur_dpt_update_time_ms = ms;
+  void record_derived_pointer_table_update_time(double ms) {
+    _cur_derived_pointer_table_update_time_ms = ms;
   }
 
   void record_clear_ct_time(double ms) {
--- old/test/gc/g1/TestGCLogMessages.java	2017-03-06 14:46:53.064258058 +0100
+++ new/test/gc/g1/TestGCLogMessages.java	2017-03-06 14:46:52.951254641 +0100
@@ -119,7 +119,7 @@
         new LogMessageWithLevel("Prepare TLABs", Level.DEBUG),
         new LogMessageWithLevel("Resize TLABs", Level.DEBUG),
 
-        new LogMessageWithLevel("DPT Update", Level.DEBUG),
+        new LogMessageWithLevel("DerivedPointerTable Update", Level.DEBUG),
         new LogMessageWithLevel("Start New Collection Set", Level.DEBUG),
     };