--- old/test/jdk/jdk/incubator/vector/templates/Unit-header.template	2019-04-09 12:18:18.304575200 -0700
+++ new/test/jdk/jdk/incubator/vector/templates/Unit-header.template	2019-04-09 12:18:17.592002700 -0700
@@ -28,6 +28,7 @@
  */
 
 import jdk.incubator.vector.Vector.Shape;
+import jdk.incubator.vector.Vector.Species;
 import jdk.incubator.vector.Vector;
 
 #if[Byte]
@@ -67,13 +68,11 @@
 public class $vectorteststype$ extends AbstractVectorTest {
 
 #if[MaxBit]
-    static final Shape S_Max_BIT = getMaxBit();
-
-    static final $abstractvectortype$.$Type$Species SPECIES =
-                $Type$Vector.species(S_Max_BIT);
+    static final Species<$Wideboxtype$> SPECIES =
+                $Type$Vector.SPECIES_MAX;
 #else[MaxBit]
-    static final $abstractvectortype$.$Type$Species SPECIES =
-                $Type$Vector.species(Shape.S_$bits$_BIT);
+    static final Species<$Wideboxtype$> SPECIES =
+                $Type$Vector.SPECIES_$bits$;
 #end[MaxBit]
 
     static final int INVOC_COUNT = Integer.getInteger("jdk.incubator.vector.test.loop-iterations", 100);