--- a/src/hotspot/share/memory/metaspaceCounters.cpp	Wed Mar 14 10:38:02 2018 +0100
+++ b/src/hotspot/share/memory/metaspaceCounters.cpp	Sun Mar 11 07:11:03 2018 +0100
@@ -66,15 +66,15 @@
 MetaspacePerfCounters* MetaspaceCounters::_perf_counters = NULL;
 
 size_t MetaspaceCounters::used() {
-  return MetaspaceAux::used_bytes();
+  return MetaspaceUtils::used_bytes();
 }
 
 size_t MetaspaceCounters::capacity() {
-  return MetaspaceAux::committed_bytes();
+  return MetaspaceUtils::committed_bytes();
 }
 
 size_t MetaspaceCounters::max_capacity() {
-  return MetaspaceAux::reserved_bytes();
+  return MetaspaceUtils::reserved_bytes();
 }
 
 void MetaspaceCounters::initialize_performance_counters() {
@@ -98,15 +98,15 @@
 MetaspacePerfCounters* CompressedClassSpaceCounters::_perf_counters = NULL;
 
 size_t CompressedClassSpaceCounters::used() {
-  return MetaspaceAux::used_bytes(Metaspace::ClassType);
+  return MetaspaceUtils::used_bytes(Metaspace::ClassType);
 }
 
 size_t CompressedClassSpaceCounters::capacity() {
-  return MetaspaceAux::committed_bytes(Metaspace::ClassType);
+  return MetaspaceUtils::committed_bytes(Metaspace::ClassType);
 }
 
 size_t CompressedClassSpaceCounters::max_capacity() {
-  return MetaspaceAux::reserved_bytes(Metaspace::ClassType);
+  return MetaspaceUtils::reserved_bytes(Metaspace::ClassType);
 }
 
 void CompressedClassSpaceCounters::update_performance_counters() {