--- old/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp	2018-06-06 00:37:30.965382165 +0200
+++ new/src/hotspot/share/jfr/recorder/checkpoint/types/jfrType.hpp	2018-06-06 00:37:30.707371054 +0200
@@ -135,12 +135,12 @@
   void serialize(JfrCheckpointWriter& writer);
 };
 
-class ZStatCounterTypeConstant : public JfrSerializer {
+class ZStatisticsCounterTypeConstant : public JfrSerializer {
  public:
   void serialize(JfrCheckpointWriter& writer);
 };
 
-class ZStatSamplerTypeConstant : public JfrSerializer {
+class ZStatisticsSamplerTypeConstant : public JfrSerializer {
  public:
   void serialize(JfrCheckpointWriter& writer);
 };