--- a/src/java.base/share/classes/java/util/random/MRG32k3a.java	Fri Jul 26 15:20:31 2019 -0300
+++ b/src/java.base/share/classes/java/util/random/MRG32k3a.java	Fri Jul 26 15:37:05 2019 -0300
@@ -27,12 +27,14 @@
 
 import java.math.BigInteger;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.random.RandomGenerator.LeapableGenerator;
+import java.util.random.RandomSupport.AbstractArbitrarilyJumpableGenerator;
 
 /**
  * A generator of uniform pseudorandom values applicable for use in
  * (among other contexts) isolated parallel computations that may
  * generate subtasks.  Class {@link MRG32k3a} implements
- * interfaces {@link RandomNumberGenerator} and {@link AbstractArbitrarilyJumpableRNG},
+ * interfaces {@link RandomGenerator} and {@link AbstractArbitrarilyJumpableGenerator},
  * and therefore supports methods for producing pseudorandomly chosen
  * numbers of type {@code int}, {@code long}, {@code float}, and {@code double}
  * as well as creating new {@link Xoroshiro128PlusMRG32k3a} objects
@@ -53,7 +55,7 @@
  *
  * @since 14
  */
-public final class MRG32k3a extends AbstractArbitrarilyJumpableRNG {
+public final class MRG32k3a extends AbstractArbitrarilyJumpableGenerator {
 
     /*
      * Implementation Overview.
@@ -87,7 +89,7 @@
      * The seed generator for default constructors.
      */
     private static final AtomicLong DEFAULT_GEN =
-        new AtomicLong(RNGSupport.initialSeed());
+        new AtomicLong(RandomSupport.initialSeed());
 
     /*
       32-bits Random number generator U(0,1): MRG32k3a
@@ -132,7 +134,7 @@
                     ;
                 return (r + origin);
             } else {
-                return RNGSupport.boundedNextInt(this, origin, bound);
+                return RandomSupport.boundedNextInt(this, origin, bound);
             }
         } else {
             return nextInt();
@@ -219,7 +221,7 @@
      * may, and typically does, vary across program invocations.
      */
     public MRG32k3a() {
-        this(DEFAULT_GEN.getAndAdd(RNGSupport.GOLDEN_RATIO_64));
+        this(DEFAULT_GEN.getAndAdd(RandomSupport.GOLDEN_RATIO_64));
     }
 
     /**
@@ -231,7 +233,7 @@
      */
     public MRG32k3a(byte[] seed) {
         // Convert the seed to 6 int values.
-        int[] data = RNGSupport.convertSeedBytesToInts(seed, 6, 0);
+        int[] data = RandomSupport.convertSeedBytesToInts(seed, 6, 0);
         int s10 = data[0], s11 = data[1], s12 = data[2];
         int s20 = data[3], s21 = data[4], s22 = data[5];
         this.s10 = ((double)(((long)s10) & 0x00000000ffffffffL)) % M1;