--- old/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV1.java	2020-02-18 11:57:38.096727242 +0100
+++ new/test/lib/jdk/test/lib/containers/cgroup/MetricsTesterCgroupV1.java	2020-02-18 11:57:37.957726987 +0100
@@ -39,7 +39,7 @@
 import java.util.stream.Stream;
 
 import jdk.internal.platform.Metrics;
-import jdk.internal.platform.MetricsCgroupV1;
+import jdk.internal.platform.CgroupV1Metrics;
 
 public class MetricsTesterCgroupV1 implements CgroupMetricsTester {
 
@@ -204,7 +204,7 @@
     }
 
     public void testMemorySubsystem() {
-        MetricsCgroupV1 metrics = (MetricsCgroupV1)Metrics.systemMetrics();
+        CgroupV1Metrics metrics = (CgroupV1Metrics)Metrics.systemMetrics();
 
         // User Memory
         long oldVal = metrics.getMemoryFailCount();
@@ -328,7 +328,7 @@
     }
 
     public void testCpuAccounting() {
-        MetricsCgroupV1 metrics = (MetricsCgroupV1)Metrics.systemMetrics();
+        CgroupV1Metrics metrics = (CgroupV1Metrics)Metrics.systemMetrics();
         long oldVal = metrics.getCpuUsage();
         long newVal = getLongValueFromFile(Controller.CPUACCT, "cpuacct.usage");
 
@@ -367,7 +367,7 @@
     }
 
     public void testCpuSchedulingMetrics() {
-        MetricsCgroupV1 metrics = (MetricsCgroupV1)Metrics.systemMetrics();
+        CgroupV1Metrics metrics = (CgroupV1Metrics)Metrics.systemMetrics();
         long oldVal = metrics.getCpuPeriod();
         long newVal = getLongValueFromFile(Controller.CPUACCT, "cpu.cfs_period_us");
         if (!CgroupMetricsTester.compareWithErrorMargin(oldVal, newVal)) {
@@ -407,7 +407,7 @@
     }
 
     public void testCpuSets() {
-        MetricsCgroupV1 metrics = (MetricsCgroupV1)Metrics.systemMetrics();
+        CgroupV1Metrics metrics = (CgroupV1Metrics)Metrics.systemMetrics();
         Integer[] oldVal = Arrays.stream(metrics.getCpuSetCpus()).boxed().toArray(Integer[]::new);
         Arrays.sort(oldVal);
 
@@ -475,7 +475,7 @@
     }
 
     private void testBlkIO() {
-        MetricsCgroupV1 metrics = (MetricsCgroupV1)Metrics.systemMetrics();
+        CgroupV1Metrics metrics = (CgroupV1Metrics)Metrics.systemMetrics();
             long oldVal = metrics.getBlkIOServiceCount();
         long newVal = getLongValueFromFile(Controller.BLKIO,
                 "blkio.throttle.io_service_bytes", "Total");
@@ -492,7 +492,7 @@
     }
 
     public void testCpuConsumption() throws IOException, InterruptedException {
-        MetricsCgroupV1 metrics = (MetricsCgroupV1)Metrics.systemMetrics();
+        CgroupV1Metrics metrics = (CgroupV1Metrics)Metrics.systemMetrics();
         // make system call
         long newSysVal = metrics.getCpuSystemUsage();
         long newUserVal = metrics.getCpuUserUsage();
@@ -531,7 +531,7 @@
     }
 
     public void testMemoryUsage() throws Exception {
-        MetricsCgroupV1 metrics = (MetricsCgroupV1)Metrics.systemMetrics();
+        CgroupV1Metrics metrics = (CgroupV1Metrics)Metrics.systemMetrics();
         long memoryMaxUsage = metrics.getMemoryMaxUsage();
         long memoryUsage = metrics.getMemoryUsage();
         long newMemoryMaxUsage = 0, newMemoryUsage = 0;