--- old/test/jdk/jdk/incubator/vector/templates/Perf-Compare.template	2019-04-15 14:51:30.180001700 -0700
+++ new/test/jdk/jdk/incubator/vector/templates/Perf-Compare.template	2019-04-15 14:51:29.768052700 -0700
@@ -4,13 +4,13 @@
         $type$[] a = fa.apply(size);
         $type$[] b = fb.apply(size);
         boolean[] ms = fm.apply(size);
-        Vector.Mask<$Wideboxtype$> m = $abstractvectortype$.maskFromArray(SPECIES, ms, 0);
+        VectorMask<$Wideboxtype$> m = VectorMask.maskFromArray(SPECIES, ms, 0);
 
         for (int ic = 0; ic < INVOC_COUNT; ic++) {
             for (int i = 0; i < a.length; i += SPECIES.length()) {
                 $abstractvectortype$ av = $abstractvectortype$.fromArray(SPECIES, a, i);
                 $abstractvectortype$ bv = $abstractvectortype$.fromArray(SPECIES, b, i);
-                Vector.Mask<$Wideboxtype$> mv = av.[[TEST]](bv);
+                VectorMask<$Wideboxtype$> mv = av.[[TEST]](bv);
 
                 m = m.and(mv); // accumulate results, so JIT can't eliminate relevant computations
             }