diff --git a/test/distributions/bharshbarg/fastFollowerEquality.chpl b/test/distributions/bharshbarg/fastFollowerEquality.chpl
index 717224b1f738..946621d0645a 100644
--- a/test/distributions/bharshbarg/fastFollowerEquality.chpl
+++ b/test/distributions/bharshbarg/fastFollowerEquality.chpl
@@ -28,9 +28,9 @@ proc test(DA : domain, DB : domain) {
 
 proc test(A : [?DA], B : [?DB]) {
   writeln("--- ", A.type:string, " vs. ", B.type:string, " ---");
-  DA.dist.displayRepresentation();
+  DA.distribution.displayRepresentation();
   writeln();
-  DB.dist.displayRepresentation();
+  DB.distribution.displayRepresentation();
   writeln();
 
   if !zipRange {
diff --git a/test/distributions/deitz/test_block_representation.chpl b/test/distributions/deitz/test_block_representation.chpl
index bcbc3063b377..283e4109a729 100644
--- a/test/distributions/deitz/test_block_representation.chpl
+++ b/test/distributions/deitz/test_block_representation.chpl
@@ -6,7 +6,7 @@ var A: [{1..4, 1..4} dmapped Block(boundingBox={1..4,1..4},
 
 writeln("Distribution Representation");
 writeln();
-A.domain.dist.displayRepresentation();
+A.domain.distribution.displayRepresentation();
 
 writeln();
 writeln("Domain");
diff --git a/test/distributions/robust/arithmetic/basics/test_reshape.chpl b/test/distributions/robust/arithmetic/basics/test_reshape.chpl
index 836bca45e52a..04dc4d392b1c 100644
--- a/test/distributions/robust/arithmetic/basics/test_reshape.chpl
+++ b/test/distributions/robust/arithmetic/basics/test_reshape.chpl
@@ -28,4 +28,4 @@ writeln(dist_eq(A3.domain.distribution, D3.distribution));
 if distType == DistType.default then
   writeln(true);
 else
-  writeln(dist_neq(A4.domain.dist, D1.dist));
+  writeln(dist_neq(A4.domain.distribution, D1.distribution));
diff --git a/test/distributions/robust/arithmetic/trivial/test_dot_dist.chpl b/test/distributions/robust/arithmetic/trivial/test_dot_dist.chpl
index 3031798098a8..2a0740783ae8 100644
--- a/test/distributions/robust/arithmetic/trivial/test_dot_dist.chpl
+++ b/test/distributions/robust/arithmetic/trivial/test_dot_dist.chpl
@@ -10,4 +10,4 @@ writeln(dist_eq(Dom2D32.distribution, Dist2D32));
 if distType == DistType.default then
   writeln(true);
 else
-  writeln(dist_neq(Dom2D32.dist, Dist2D));
+  writeln(dist_neq(Dom2D32.distribution, Dist2D));
diff --git a/test/distributions/robust/arithmetic/trivial/test_dot_domain.chpl b/test/distributions/robust/arithmetic/trivial/test_dot_domain.chpl
index 9cad94289a36..ec2957e77d05 100644
--- a/test/distributions/robust/arithmetic/trivial/test_dot_domain.chpl
+++ b/test/distributions/robust/arithmetic/trivial/test_dot_domain.chpl
@@ -15,4 +15,4 @@ writeln(dist_eq(A2D32.domain.distribution, Dist2D32));
 if distType == DistType.default then
   writeln(true);
 else
-  writeln(dist_neq(A1D.domain.dist, {1..n1}.dist));
+  writeln(dist_neq(A1D.domain.distribution, {1..n1}.distribution));
diff --git a/test/optimizations/bulkcomm/asenjo/redistBlockToCyclic/FFT_assignment.chpl b/test/optimizations/bulkcomm/asenjo/redistBlockToCyclic/FFT_assignment.chpl
index 0896665e559f..7c961f6e9d7d 100644
--- a/test/optimizations/bulkcomm/asenjo/redistBlockToCyclic/FFT_assignment.chpl
+++ b/test/optimizations/bulkcomm/asenjo/redistBlockToCyclic/FFT_assignment.chpl
@@ -185,7 +185,7 @@ proc dfft(A: [?ADom], W, cyclicPhase) {
       //       lo.. by str #num == lo, lo+str, lo+2*str, ... lo+(num-1)*str
       //
       forall lo in bankStart..#str do
-        on ADom.dist.idxToLocale(lo) do
+        on ADom.distribution.idxToLocale(lo) do
           local do butterfly(wk1, wk2, wk3, A.localSlice(lo..by str #radix));
 
       //
@@ -200,7 +200,7 @@ proc dfft(A: [?ADom], W, cyclicPhase) {
       // loop in parallel over the high bank, computing butterflies
       //
       forall lo in bankStart+span..#str do
-        on ADom.dist.idxToLocale(lo) do
+        on ADom.distribution.idxToLocale(lo) do
           local do butterfly(wk1, wk2, wk3, A.localSlice(lo.. by str #radix));
     }
   }
@@ -216,7 +216,7 @@ proc dfft(A: [?ADom], W, cyclicPhase) {
     //
     if (str*radix == numElements) {
       forall lo in 0..#str do
-        on ADom.dist.idxToLocale(lo) do
+        on ADom.distribution.idxToLocale(lo) do
           local do butterfly(1.0, 1.0, 1.0, A.localSlice(lo.. by str # radix));
     }
     //
@@ -224,7 +224,7 @@ proc dfft(A: [?ADom], W, cyclicPhase) {
     //
     else
       forall lo in 0..#str do
-        on ADom.dist.idxToLocale(lo) do
+        on ADom.distribution.idxToLocale(lo) do
           local {
             const a = A(lo),
 	      b = A(lo+str);
diff --git a/test/optimizations/bulkcomm/asenjo/redistBlockToCyclic/FFT_bulk.chpl b/test/optimizations/bulkcomm/asenjo/redistBlockToCyclic/FFT_bulk.chpl
index dc5bbd418e26..93131dfb122f 100644
--- a/test/optimizations/bulkcomm/asenjo/redistBlockToCyclic/FFT_bulk.chpl
+++ b/test/optimizations/bulkcomm/asenjo/redistBlockToCyclic/FFT_bulk.chpl
@@ -325,7 +325,7 @@ proc dfft(A: [?ADom], W, cyclicPhase) {
       //       lo.. by str #num == lo, lo+str, lo+2*str, ... lo+(num-1)*str
       //
       forall lo in bankStart..#str do
-        on ADom.dist.idxToLocale(lo) do
+        on ADom.distribution.idxToLocale(lo) do
           local do butterfly(wk1, wk2, wk3, A.localSlice(lo..by str #radix));
 
       //
@@ -340,7 +340,7 @@ proc dfft(A: [?ADom], W, cyclicPhase) {
       // loop in parallel over the high bank, computing butterflies
       //
       forall lo in bankStart+span..#str do
-        on ADom.dist.idxToLocale(lo) do
+        on ADom.distribution.idxToLocale(lo) do
           local do butterfly(wk1, wk2, wk3, A.localSlice(lo.. by str #radix));
     }
   }
@@ -356,7 +356,7 @@ proc dfft(A: [?ADom], W, cyclicPhase) {
     //
     if (str*radix == numElements) {
       forall lo in 0..#str do
-        on ADom.dist.idxToLocale(lo) do
+        on ADom.distribution.idxToLocale(lo) do
           local do butterfly(1.0, 1.0, 1.0, A.localSlice(lo.. by str # radix));
     }
     //
@@ -364,7 +364,7 @@ proc dfft(A: [?ADom], W, cyclicPhase) {
     //
     else
       forall lo in 0..#str do
-        on ADom.dist.idxToLocale(lo) do
+        on ADom.distribution.idxToLocale(lo) do
           local {
             const a = A(lo),
 	      b = A(lo+str);
diff --git a/test/performance/ferguson/cyclic-id-queries.chpl b/test/performance/ferguson/cyclic-id-queries.chpl
index 9012011fb554..3310c419f8fa 100644
--- a/test/performance/ferguson/cyclic-id-queries.chpl
+++ b/test/performance/ferguson/cyclic-id-queries.chpl
@@ -12,7 +12,7 @@ start();
 coforall loc in Locales do on loc {
   coforall tid in 1..here.maxTaskPar {
     for i in cyclicSpace {
-      var locid = cyclicDom.dist.idxToLocale(i).id;
+      var locid = cyclicDom.distribution.idxToLocale(i).id;
     }
   }
 }
@@ -36,7 +36,7 @@ start();
 coforall loc in Locales do on loc {
   coforall tid in 1..here.maxTaskPar {
     for i in cyclicSpace {
-      var loc = cyclicDom.dist.idxToLocale(i);
+      var loc = cyclicDom.distribution.idxToLocale(i);
       var locID = chpl_nodeFromLocaleID(__primitive("_wide_get_locale", loc));
       assert(cyclicArr[i].locale == Locales[locID]);
     }
@@ -46,7 +46,7 @@ stop();
 report(maxGets=0, maxOns=1);
 
 inline proc getLocale(dom, idx) {
-  var loc = dom.dist.idxToLocale(idx);
+  var loc = dom.distribution.idxToLocale(idx);
   var locID = chpl_nodeFromLocaleID(__primitive("_wide_get_locale", loc));
 
   // Handles cases where we get a locale that is allocated on another locale...