diff --git a/README.md b/README.md
index 607dea928..6f6840c5e 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,8 @@ Buffers:
   - Name: Out1 # Buffer where our output will go
     Format: Float32
     Stride: 4
-    ZeroInitSize: 8
+    FillSize: 8
+    FillValue: 0.0 # The FillValue is optional and defaults to zero
   - Name: Expected1 # Buffer which stores the expected result of our test
     Format: Float32
     Stride: 4
@@ -96,7 +97,7 @@ Buffers:
   - Name: Out2 # Buffer where our output will go
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4 # ZeroInitSize needs to be 4 bytes minimum
+    FillSize: 4 # FillSize needs to be 4 bytes minimum
   - Name: Expected2 # Buffer which stores the expected result of our test
     Format: Float16
     Stride: 2
diff --git a/lib/Support/Pipeline.cpp b/lib/Support/Pipeline.cpp
index d47db5eea..74494f0d0 100644
--- a/lib/Support/Pipeline.cpp
+++ b/lib/Support/Pipeline.cpp
@@ -138,17 +138,36 @@ template <typename T> static void setData(IO &I, offloadtest::Buffer &B) {
     return;
   }
 
-  // zero-initialized buffer(s)
-  int64_t ZeroInitSize;
-  I.mapOptional("ZeroInitSize", ZeroInitSize, 0);
-  if (ZeroInitSize > 0) {
-    B.Size = ZeroInitSize;
+  // Buffers can be initialized to be filled with a fixed value.
+  int64_t FillSize;
+
+  // Explicitly reject ZeroInitSize to avoid a confusing error while
+  // transitioning to FillSize. We can remove this once in flight PRs have had
+  // time to go in.
+  I.mapOptional("ZeroInitSize", FillSize, 0);
+  if (FillSize > 0) {
+    I.setError("invalid key 'ZeroInitSize' - did you mean 'FillSize'?");
+    return;
+  }
+
+  T FillValue;
+  I.mapOptional("FillSize", FillSize, 0);
+  I.mapOptional("FillValue", FillValue, T{});
+  if (FillSize > 0) {
+    B.Size = FillSize;
+    llvm::SmallVector<T> FillData(FillSize);
+    std::fill(FillData.begin(), FillData.end(), FillValue);
+
     for (uint32_t I = 0; I < B.ArraySize; I++) {
       B.Data.push_back(std::make_unique<char[]>(B.Size));
-      memset(B.Data.back().get(), 0, B.Size);
+      memcpy(B.Data.back().get(), FillData.data(), B.Size);
     }
     return;
   }
+  if (FillValue) {
+    I.setError("'FillValue' specified without 'FillSize'");
+    return;
+  }
 
   // single buffer input
   if (B.ArraySize == 1) {
diff --git a/test/Basic/DescriptorSets.test b/test/Basic/DescriptorSets.test
index 5cb023c00..eab0758ad 100644
--- a/test/Basic/DescriptorSets.test
+++ b/test/Basic/DescriptorSets.test
@@ -23,11 +23,11 @@ Buffers:
   - Name: Out1
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Out2
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Basic/Mandelbrot.test b/test/Basic/Mandelbrot.test
index 76cf04b09..931da462f 100644
--- a/test/Basic/Mandelbrot.test
+++ b/test/Basic/Mandelbrot.test
@@ -62,7 +62,7 @@ Buffers:
   - Name: Tex
     Format: Float32
     Channels: 4
-    ZeroInitSize: 268435456 # 1024 * 1024 * 4 channels / pixel * 4 bytes / channel
+    FillSize: 268435456 # 1024 * 1024 * 4 channels / pixel * 4 bytes / channel
     OutputProps:
       Height: 4096
       Width: 4096
diff --git a/test/Basic/matrix_m-based_getter.test b/test/Basic/matrix_m-based_getter.test
index f52bbf6c7..b8e410e2e 100644
--- a/test/Basic/matrix_m-based_getter.test
+++ b/test/Basic/matrix_m-based_getter.test
@@ -50,7 +50,7 @@ Buffers:
     Data: [ 1, 2, 3, 4]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut
     Format: Int32
     Data: [ 1, 2, 3, 4 ]
diff --git a/test/Basic/matrix_one-based_getter.test b/test/Basic/matrix_one-based_getter.test
index 20ef90506..4214198c0 100644
--- a/test/Basic/matrix_one-based_getter.test
+++ b/test/Basic/matrix_one-based_getter.test
@@ -52,7 +52,7 @@ Buffers:
     Data: [ 1, 2, 3, 4]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut
     Format: Int32
     Data: [ 1, 2, 3, 4 ]
diff --git a/test/Basic/matrix_scalar_arithmetic.test b/test/Basic/matrix_scalar_arithmetic.test
index e98ecd204..fbf234218 100644
--- a/test/Basic/matrix_scalar_arithmetic.test
+++ b/test/Basic/matrix_scalar_arithmetic.test
@@ -32,16 +32,16 @@ Buffers:
     Data: [ 2, 4, 6, 8, 10, 12 ]
   - Name: DivOut
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: MulOut
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: AddOut
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: SubOut
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Basic/matrix_scalar_constructor.test b/test/Basic/matrix_scalar_constructor.test
index 3df226cb9..e892be5d6 100644
--- a/test/Basic/matrix_scalar_constructor.test
+++ b/test/Basic/matrix_scalar_constructor.test
@@ -5,9 +5,9 @@ RWBuffer<int> Out : register(u1);
 
 [numthreads(6,1,1)]
 void main(uint GI : SV_GroupIndex) {
-  int2x3 A = int2x3(In[0], In[1], In[2], 
-                    In[3], In[4], In[5]); 
-  
+  int2x3 A = int2x3(In[0], In[1], In[2],
+                    In[3], In[4], In[5]);
+
   int row = GI / 2;
   int col = GI % 2;
   Out[GI] = A[col][row];
@@ -26,7 +26,7 @@ Buffers:
     Data: [ 1, 2, 3, 4, 5, 6]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Int32
     Data: [ 1, 4, 2, 5, 3, 6 ]
diff --git a/test/Basic/simple.test b/test/Basic/simple.test
index 5a660caaa..6276a521b 100644
--- a/test/Basic/simple.test
+++ b/test/Basic/simple.test
@@ -21,7 +21,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Bugs/UAV-Sequental-Consistency.yaml b/test/Bugs/UAV-Sequental-Consistency.yaml
index 4bf337884..71e609e84 100644
--- a/test/Bugs/UAV-Sequental-Consistency.yaml
+++ b/test/Bugs/UAV-Sequental-Consistency.yaml
@@ -27,7 +27,7 @@ Buffers:
   - Name: Result
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult
     Format: Int32
     Stride: 4
diff --git a/test/Feature/Attributes/IfBranchAttr.test b/test/Feature/Attributes/IfBranchAttr.test
index 5f378699d..8ced3b136 100644
--- a/test/Feature/Attributes/IfBranchAttr.test
+++ b/test/Feature/Attributes/IfBranchAttr.test
@@ -24,7 +24,7 @@ Buffers:
     Data: [ 1, 4, 9, 16, 25, 36, 49, 64]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 32
+    FillSize: 32
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/Attributes/IfBranchFlatten.test b/test/Feature/Attributes/IfBranchFlatten.test
index be0022bd0..94ff019af 100644
--- a/test/Feature/Attributes/IfBranchFlatten.test
+++ b/test/Feature/Attributes/IfBranchFlatten.test
@@ -24,7 +24,7 @@ Buffers:
     Data: [ 1, 4, 9, 16, 25, 36, 49, 64]
   - Name: Out
     Format: Int32
-    ZeroInitSize: 32
+    FillSize: 32
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test b/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test
index b40431899..70225bd6c 100644
--- a/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test
+++ b/test/Feature/ByteAddressBuffer/ByteAddressBuffers.test
@@ -58,11 +58,11 @@ Buffers:
 
   - Name: OutBuf
     Format: Hex32
-    ZeroInitSize: 64
+    FillSize: 64
 
   - Name: MappedBuf
     Format: Int32
-    ZeroInitSize: 16
+    FillSize: 16
 
 DescriptorSets:
   - Resources:
diff --git a/test/Feature/ByteAddressBuffer/GetDimensions.test b/test/Feature/ByteAddressBuffer/GetDimensions.test
index 917b9784b..8efd4202b 100644
--- a/test/Feature/ByteAddressBuffer/GetDimensions.test
+++ b/test/Feature/ByteAddressBuffer/GetDimensions.test
@@ -39,7 +39,7 @@ Buffers:
 
   - Name: Out
     Format: Int32
-    ZeroInitSize: 8
+    FillSize: 8
 
   - Name: ExpectedOut
     Format: Int32
diff --git a/test/Feature/CBuffer/array-vec-index.test b/test/Feature/CBuffer/array-vec-index.test
index b538fea85..b4f2ec921 100644
--- a/test/Feature/CBuffer/array-vec-index.test
+++ b/test/Feature/CBuffer/array-vec-index.test
@@ -27,7 +27,7 @@ Buffers:
     ]
   - Name: Out
     Format: UInt32
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: ExpectedOut
     Format: UInt32
     Data: [ 8, 11 ]
diff --git a/test/Feature/CBuffer/arrays-16bit.test b/test/Feature/CBuffer/arrays-16bit.test
index d4ce6e80b..2b4c3cea7 100644
--- a/test/Feature/CBuffer/arrays-16bit.test
+++ b/test/Feature/CBuffer/arrays-16bit.test
@@ -45,7 +45,7 @@ Buffers:
     # Warp doesn't seem to like buffers with non-multiple of 4 strides, so we
     # add a small amount of buffer at the end here.
     Stride: 28
-    ZeroInitSize: 28
+    FillSize: 28
   - Name: ExpectedOut
     Format: Hex16
     Stride: 26
diff --git a/test/Feature/CBuffer/arrays-64bit.test b/test/Feature/CBuffer/arrays-64bit.test
index 3fa957c3e..260e05218 100644
--- a/test/Feature/CBuffer/arrays-64bit.test
+++ b/test/Feature/CBuffer/arrays-64bit.test
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out
     Format: Hex64
     Stride: 128
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut
     Format: Hex64
     Stride: 128
diff --git a/test/Feature/CBuffer/arrays.test b/test/Feature/CBuffer/arrays.test
index a1dd2a077..5ed2ece9b 100644
--- a/test/Feature/CBuffer/arrays.test
+++ b/test/Feature/CBuffer/arrays.test
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 128
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut
     Format: Hex32
     Stride: 128
diff --git a/test/Feature/CBuffer/scalars-16bit.test b/test/Feature/CBuffer/scalars-16bit.test
index 25c05e24d..89fc5068a 100644
--- a/test/Feature/CBuffer/scalars-16bit.test
+++ b/test/Feature/CBuffer/scalars-16bit.test
@@ -36,7 +36,7 @@ Buffers:
     Format: Hex16
     # Warp doesn't seem to be able to handle a stride of 6 so we use 8 here...
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
 DescriptorSets:
   - Resources:
     - Name: CBScalars
diff --git a/test/Feature/CBuffer/scalars-64bit.test b/test/Feature/CBuffer/scalars-64bit.test
index 2493e5d3c..e5855a47d 100644
--- a/test/Feature/CBuffer/scalars-64bit.test
+++ b/test/Feature/CBuffer/scalars-64bit.test
@@ -35,7 +35,7 @@ Buffers:
   - Name: Out
     Format: Hex64
     Stride: 24
-    ZeroInitSize: 24
+    FillSize: 24
 DescriptorSets:
   - Resources:
     - Name: CBScalars
diff --git a/test/Feature/CBuffer/scalars.test b/test/Feature/CBuffer/scalars.test
index fb12eee6c..b36c33a02 100644
--- a/test/Feature/CBuffer/scalars.test
+++ b/test/Feature/CBuffer/scalars.test
@@ -36,7 +36,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 12
-    ZeroInitSize: 12
+    FillSize: 12
 DescriptorSets:
   - Resources:
     - Name: CBScalars
diff --git a/test/Feature/CBuffer/structs.test b/test/Feature/CBuffer/structs.test
index ff8247a00..b197d6542 100644
--- a/test/Feature/CBuffer/structs.test
+++ b/test/Feature/CBuffer/structs.test
@@ -78,7 +78,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 60
-    ZeroInitSize: 60
+    FillSize: 60
 DescriptorSets:
   - Resources:
     - Name: CBVectors
diff --git a/test/Feature/CBuffer/vectors-16bit.test b/test/Feature/CBuffer/vectors-16bit.test
index efaf79f7f..16c758cc2 100644
--- a/test/Feature/CBuffer/vectors-16bit.test
+++ b/test/Feature/CBuffer/vectors-16bit.test
@@ -37,7 +37,7 @@ Buffers:
     Format: Hex16
     # Warp doesn't seem to be able to handle a stride of 10 so we use 12 here
     Stride: 12
-    ZeroInitSize: 12
+    FillSize: 12
 DescriptorSets:
   - Resources:
     - Name: CBVectors
diff --git a/test/Feature/CBuffer/vectors-64bit.test b/test/Feature/CBuffer/vectors-64bit.test
index 5becd2de3..ad61de488 100644
--- a/test/Feature/CBuffer/vectors-64bit.test
+++ b/test/Feature/CBuffer/vectors-64bit.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out
     Format: Hex64
     Stride: 72
-    ZeroInitSize: 72
+    FillSize: 72
 DescriptorSets:
   - Resources:
     - Name: CBVectors
diff --git a/test/Feature/CBuffer/vectors.test b/test/Feature/CBuffer/vectors.test
index d46f7e4ad..f64aff1b5 100644
--- a/test/Feature/CBuffer/vectors.test
+++ b/test/Feature/CBuffer/vectors.test
@@ -44,7 +44,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 52
-    ZeroInitSize: 52
+    FillSize: 52
 DescriptorSets:
   - Resources:
     - Name: CBVectors
diff --git a/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test b/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
index 11f3eb4f4..0da860678 100644
--- a/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
+++ b/test/Feature/HLSLLib/D3DCOLORtoUBYTE4.test
@@ -22,7 +22,7 @@ Buffers:
   - Name: Out0
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/abs.32.test b/test/Feature/HLSLLib/abs.32.test
index a7e98cfe0..83a586692 100644
--- a/test/Feature/HLSLLib/abs.32.test
+++ b/test/Feature/HLSLLib/abs.32.test
@@ -52,7 +52,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut1 # The result we expect
     Format: Int32
     Stride: 16
@@ -60,7 +60,7 @@ Buffers:
   - Name: Out2
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48 
+    FillSize: 48
   - Name: ExpectedOut2 # The result we expect
     Format: UInt32
     Stride: 16
@@ -68,7 +68,7 @@ Buffers:
   - Name: Out3
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48 
+    FillSize: 48
   - Name: ExpectedOut3 # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/abs.fp16.test b/test/Feature/HLSLLib/abs.fp16.test
index 86784e1c4..106fb63fe 100644
--- a/test/Feature/HLSLLib/abs.fp16.test
+++ b/test/Feature/HLSLLib/abs.fp16.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out1
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1 # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/abs.fp64.test b/test/Feature/HLSLLib/abs.fp64.test
index 967456115..35c33fe37 100644
--- a/test/Feature/HLSLLib/abs.fp64.test
+++ b/test/Feature/HLSLLib/abs.fp64.test
@@ -27,7 +27,7 @@ Buffers:
   - Name: Out1
     Format: Float64
     Stride: 32
-    ZeroInitSize: 96
+    FillSize: 96
   - Name: ExpectedOut1 # The result we expect
     Format: Float64
     Stride: 32
diff --git a/test/Feature/HLSLLib/abs.int16.test b/test/Feature/HLSLLib/abs.int16.test
index 9e70bf70f..aaa98ed2a 100644
--- a/test/Feature/HLSLLib/abs.int16.test
+++ b/test/Feature/HLSLLib/abs.int16.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out1
     Format: Int16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1 # The result we expect
     Format: Int16
     Stride: 8
@@ -47,7 +47,7 @@ Buffers:
   - Name: Out2
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 24 
+    FillSize: 24
   - Name: ExpectedOut2 # The result we expect
     Format: UInt16
     Stride: 8
diff --git a/test/Feature/HLSLLib/abs.int64.test b/test/Feature/HLSLLib/abs.int64.test
index c36d26ab5..e01af5f35 100644
--- a/test/Feature/HLSLLib/abs.int64.test
+++ b/test/Feature/HLSLLib/abs.int64.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out1
     Format: Int64
     Stride: 32
-    ZeroInitSize: 96
+    FillSize: 96
   - Name: ExpectedOut1 # The result we expect
     Format: Int64
     Stride: 32
@@ -47,7 +47,7 @@ Buffers:
   - Name: Out2
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 96 
+    FillSize: 96
   - Name: ExpectedOut2 # The result we expect
     Format: UInt64
     Stride: 32
diff --git a/test/Feature/HLSLLib/acos.16.test b/test/Feature/HLSLLib/acos.16.test
index 15f5934f8..58bf10346 100644
--- a/test/Feature/HLSLLib/acos.16.test
+++ b/test/Feature/HLSLLib/acos.16.test
@@ -24,12 +24,12 @@ Buffers:
   - Name: In
     Format: Float16
     Stride: 8
-    Data: [0x7e00, 0xfc00, 0x8001, 0x8000, 0x0, 0x0001, 0x7c00, 0x3c00, 0xbc00, 0x3e00, 0xbe00, 0x7e00] 
+    Data: [0x7e00, 0xfc00, 0x8001, 0x8000, 0x0, 0x0001, 0x7c00, 0x3c00, 0xbc00, 0x3e00, 0xbe00, 0x7e00]
     # nan, -inf, -denorm, -0, 0, denorm, inf, 1, -1, 1.5, -1.5, nan (filler)
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/acos.32.test b/test/Feature/HLSLLib/acos.32.test
index 4f468c893..d70887f96 100644
--- a/test/Feature/HLSLLib/acos.32.test
+++ b/test/Feature/HLSLLib/acos.32.test
@@ -29,7 +29,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/adduint64.test b/test/Feature/HLSLLib/adduint64.test
index bfb6af9cf..3bdf1e94f 100644
--- a/test/Feature/HLSLLib/adduint64.test
+++ b/test/Feature/HLSLLib/adduint64.test
@@ -33,7 +33,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/all.32.test b/test/Feature/HLSLLib/all.32.test
index 6c75814ba..3dc20282d 100644
--- a/test/Feature/HLSLLib/all.32.test
+++ b/test/Feature/HLSLLib/all.32.test
@@ -57,7 +57,7 @@ Buffers:
   - Name: Out0
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut0
     Format: Bool
     Stride: 4
@@ -65,7 +65,7 @@ Buffers:
   - Name: Out1
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1
     Format: Bool
     Stride: 4
@@ -73,7 +73,7 @@ Buffers:
   - Name: Out2
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut2
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/all.bool.test b/test/Feature/HLSLLib/all.bool.test
index 1c8785deb..9dde8e745 100644
--- a/test/Feature/HLSLLib/all.bool.test
+++ b/test/Feature/HLSLLib/all.bool.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/all.fp16.test b/test/Feature/HLSLLib/all.fp16.test
index f7fc1ffca..9ed4e6040 100644
--- a/test/Feature/HLSLLib/all.fp16.test
+++ b/test/Feature/HLSLLib/all.fp16.test
@@ -29,7 +29,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/all.fp64.test b/test/Feature/HLSLLib/all.fp64.test
index c2dd26c2b..fee8d9915 100644
--- a/test/Feature/HLSLLib/all.fp64.test
+++ b/test/Feature/HLSLLib/all.fp64.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/all.int16.test b/test/Feature/HLSLLib/all.int16.test
index b4bfd8cc1..d4f92a017 100644
--- a/test/Feature/HLSLLib/all.int16.test
+++ b/test/Feature/HLSLLib/all.int16.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out0
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut0
     Format: Bool
     Stride: 4
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out1
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/all.int64.test b/test/Feature/HLSLLib/all.int64.test
index 3324a6617..e3a92d4ab 100644
--- a/test/Feature/HLSLLib/all.int64.test
+++ b/test/Feature/HLSLLib/all.int64.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out0
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut0
     Format: Bool
     Stride: 4
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out1
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/and.test b/test/Feature/HLSLLib/and.test
index 9f6b2224e..131b49238 100644
--- a/test/Feature/HLSLLib/and.test
+++ b/test/Feature/HLSLLib/and.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Bool
     Stride: 16
diff --git a/test/Feature/HLSLLib/any.32.test b/test/Feature/HLSLLib/any.32.test
index 0fde5548a..9969b77e8 100644
--- a/test/Feature/HLSLLib/any.32.test
+++ b/test/Feature/HLSLLib/any.32.test
@@ -57,7 +57,7 @@ Buffers:
   - Name: Out0
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut0
     Format: Bool
     Stride: 4
@@ -65,7 +65,7 @@ Buffers:
   - Name: Out1
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1
     Format: Bool
     Stride: 4
@@ -73,7 +73,7 @@ Buffers:
   - Name: Out2
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut2
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/any.bool.test b/test/Feature/HLSLLib/any.bool.test
index 78aa9b176..187f34ee4 100644
--- a/test/Feature/HLSLLib/any.bool.test
+++ b/test/Feature/HLSLLib/any.bool.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/any.fp16.test b/test/Feature/HLSLLib/any.fp16.test
index c58e5e70c..ec72eb370 100644
--- a/test/Feature/HLSLLib/any.fp16.test
+++ b/test/Feature/HLSLLib/any.fp16.test
@@ -29,7 +29,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/any.fp64.test b/test/Feature/HLSLLib/any.fp64.test
index 56a9c6f82..857329db5 100644
--- a/test/Feature/HLSLLib/any.fp64.test
+++ b/test/Feature/HLSLLib/any.fp64.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/any.int16.test b/test/Feature/HLSLLib/any.int16.test
index 7fab6c602..f082d0fbb 100644
--- a/test/Feature/HLSLLib/any.int16.test
+++ b/test/Feature/HLSLLib/any.int16.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out0
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut0
     Format: Bool
     Stride: 4
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out1
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/any.int64.test b/test/Feature/HLSLLib/any.int64.test
index ae527478c..90bea3a13 100644
--- a/test/Feature/HLSLLib/any.int64.test
+++ b/test/Feature/HLSLLib/any.int64.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out0
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut0
     Format: Bool
     Stride: 4
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out1
     Format: Bool
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut1
     Format: Bool
     Stride: 4
diff --git a/test/Feature/HLSLLib/asdouble.32.test b/test/Feature/HLSLLib/asdouble.32.test
index a915e7f20..ad133a4e4 100644
--- a/test/Feature/HLSLLib/asdouble.32.test
+++ b/test/Feature/HLSLLib/asdouble.32.test
@@ -41,7 +41,7 @@ Buffers:
   - Name: Out
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut
     Format: Hex64
     Stride: 32
diff --git a/test/Feature/HLSLLib/asfloat.test b/test/Feature/HLSLLib/asfloat.test
index b50ed432a..a92d613a1 100644
--- a/test/Feature/HLSLLib/asfloat.test
+++ b/test/Feature/HLSLLib/asfloat.test
@@ -14,12 +14,12 @@ void main() {
   Out0[1] = float4(asfloat(In0[1].xyz), asfloat(In0[1].w));
   Out0[2] = float4(asfloat(In0[2].xy), asfloat(In0[2].zw));
   Out0[3] = asfloat(float4(0, 1, -50.555, 99.999));
-  
+
   Out1[0] = asfloat(In1[0]);
   Out1[1] = float4(asfloat(In1[1].xyz), asfloat(In1[1].w));
   Out1[2] = float4(asfloat(In1[2].xy), asfloat(In1[2].zw));
   Out1[3] = asfloat(uint4(0, 50, 10000, 4294967295));
-  
+
   Out2[0] = asfloat(In2[0]);
   Out2[1] = float4(asfloat(In2[1].xyz), asfloat(In2[1].w));
   Out2[2] = float4(asfloat(In2[2].xy), asfloat(In2[2].zw));
@@ -48,7 +48,7 @@ Buffers:
   - Name: Out0
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: Float32
     Stride: 16
@@ -56,7 +56,7 @@ Buffers:
   - Name: Out1
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut1
     Format: Float32
     Stride: 16
@@ -64,7 +64,7 @@ Buffers:
   - Name: Out2
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut2
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/asin.16.test b/test/Feature/HLSLLib/asin.16.test
index be71ae147..16903dddd 100644
--- a/test/Feature/HLSLLib/asin.16.test
+++ b/test/Feature/HLSLLib/asin.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/asin.32.test b/test/Feature/HLSLLib/asin.32.test
index daa5c55d5..44a1a76b8 100644
--- a/test/Feature/HLSLLib/asin.32.test
+++ b/test/Feature/HLSLLib/asin.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/asint.test b/test/Feature/HLSLLib/asint.test
index ed71ba9b1..f0fabda48 100644
--- a/test/Feature/HLSLLib/asint.test
+++ b/test/Feature/HLSLLib/asint.test
@@ -55,7 +55,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut1 # The result we expect
     Format: Int32
     Stride: 16
@@ -63,7 +63,7 @@ Buffers:
   - Name: Out2
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut2 # The result we expect
     Format: Int32
     Stride: 16
@@ -71,7 +71,7 @@ Buffers:
   - Name: Out3
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64 
+    FillSize: 64
   - Name: ExpectedOut3 # The result we expect
     Format: Int32
     Stride: 16
diff --git a/test/Feature/HLSLLib/asint16.fp16.test b/test/Feature/HLSLLib/asint16.fp16.test
index bc609e417..63e70e6c7 100644
--- a/test/Feature/HLSLLib/asint16.fp16.test
+++ b/test/Feature/HLSLLib/asint16.fp16.test
@@ -26,7 +26,7 @@ Buffers:
   - Name: Out0
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Int16
     Stride: 8
diff --git a/test/Feature/HLSLLib/asint16.int16.test b/test/Feature/HLSLLib/asint16.int16.test
index c3420432e..290ca2617 100644
--- a/test/Feature/HLSLLib/asint16.int16.test
+++ b/test/Feature/HLSLLib/asint16.int16.test
@@ -11,7 +11,7 @@ void main() {
   Out0[1] = int16_t4(asint16(In0[1].xyz), asint16(In0[1].w));
   Out0[2] = int16_t4(asint16(In0[2].xy), asint16(In0[2].zw));
   Out0[3] = asint16(int16_t4(0, 32767, -100, -32768));
-  
+
   Out1[0] = asint16(In1[0]);
   Out1[1] = int16_t4(asint16(In1[1].xyz), asint16(In1[1].w));
   Out1[2] = int16_t4(asint16(In1[2].xy), asint16(In1[2].zw));
@@ -36,7 +36,7 @@ Buffers:
   - Name: Out0
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Int16
     Stride: 8
@@ -44,7 +44,7 @@ Buffers:
   - Name: Out1
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: Int16
     Stride: 8
diff --git a/test/Feature/HLSLLib/asuint.32.test b/test/Feature/HLSLLib/asuint.32.test
index c72a989c9..f8e49ec26 100644
--- a/test/Feature/HLSLLib/asuint.32.test
+++ b/test/Feature/HLSLLib/asuint.32.test
@@ -48,7 +48,7 @@ Buffers:
   - Name: Out0
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: UInt32
     Stride: 16
@@ -56,7 +56,7 @@ Buffers:
   - Name: Out1
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut1
     Format: UInt32
     Stride: 16
@@ -64,7 +64,7 @@ Buffers:
   - Name: Out2
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut2
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/asuint.64.test b/test/Feature/HLSLLib/asuint.64.test
index a8fa2cfa2..d126b72f2 100644
--- a/test/Feature/HLSLLib/asuint.64.test
+++ b/test/Feature/HLSLLib/asuint.64.test
@@ -34,7 +34,7 @@ Buffers:
   - Name: Lows
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedLows
     Format: UInt32
     Stride: 16
@@ -42,7 +42,7 @@ Buffers:
   - Name: Highs
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedHighs
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/asuint16.fp16.test b/test/Feature/HLSLLib/asuint16.fp16.test
index 6d35f6dc1..4f5c04ceb 100644
--- a/test/Feature/HLSLLib/asuint16.fp16.test
+++ b/test/Feature/HLSLLib/asuint16.fp16.test
@@ -26,7 +26,7 @@ Buffers:
   - Name: Out0
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: UInt16
     Stride: 8
diff --git a/test/Feature/HLSLLib/asuint16.int16.test b/test/Feature/HLSLLib/asuint16.int16.test
index 8cffe691b..fb2517efe 100644
--- a/test/Feature/HLSLLib/asuint16.int16.test
+++ b/test/Feature/HLSLLib/asuint16.int16.test
@@ -11,7 +11,7 @@ void main() {
   Out0[1] = uint16_t4(asuint16(In0[1].xyz), asuint16(In0[1].w));
   Out0[2] = uint16_t4(asuint16(In0[2].xy), asuint16(In0[2].zw));
   Out0[3] = asuint16(uint16_t4(0, 100, 65535, 10));
-  
+
   Out1[0] = asuint16(In1[0]);
   Out1[1] = uint16_t4(asuint16(In1[1].xyz), asuint16(In1[1].w));
   Out1[2] = uint16_t4(asuint16(In1[2].xy), asuint16(In1[2].zw));
@@ -36,7 +36,7 @@ Buffers:
   - Name: Out0
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: UInt16
     Stride: 8
@@ -44,7 +44,7 @@ Buffers:
   - Name: Out1
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: UInt16
     Stride: 8
diff --git a/test/Feature/HLSLLib/atan.16.test b/test/Feature/HLSLLib/atan.16.test
index ca9d6bda5..189a70fb9 100644
--- a/test/Feature/HLSLLib/atan.16.test
+++ b/test/Feature/HLSLLib/atan.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/atan.32.test b/test/Feature/HLSLLib/atan.32.test
index 560d41a8b..961a3e8cc 100644
--- a/test/Feature/HLSLLib/atan.32.test
+++ b/test/Feature/HLSLLib/atan.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/atan2.16.test b/test/Feature/HLSLLib/atan2.16.test
index b3f1455f7..998c178e4 100644
--- a/test/Feature/HLSLLib/atan2.16.test
+++ b/test/Feature/HLSLLib/atan2.16.test
@@ -32,7 +32,7 @@ Buffers:
   - Name: Out0
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/atan2.32.test b/test/Feature/HLSLLib/atan2.32.test
index 848844427..c5c08a804 100644
--- a/test/Feature/HLSLLib/atan2.32.test
+++ b/test/Feature/HLSLLib/atan2.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out0
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/ceil.16.test b/test/Feature/HLSLLib/ceil.16.test
index 5f4818c0d..3d5e7a26e 100644
--- a/test/Feature/HLSLLib/ceil.16.test
+++ b/test/Feature/HLSLLib/ceil.16.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/ceil.32.test b/test/Feature/HLSLLib/ceil.32.test
index 630868cf9..670e63572 100644
--- a/test/Feature/HLSLLib/ceil.32.test
+++ b/test/Feature/HLSLLib/ceil.32.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/clamp.32.test b/test/Feature/HLSLLib/clamp.32.test
index 072678a8f..13aedfbcf 100644
--- a/test/Feature/HLSLLib/clamp.32.test
+++ b/test/Feature/HLSLLib/clamp.32.test
@@ -77,7 +77,7 @@ Buffers:
   - Name: Out0
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: Int32
     Stride: 16
@@ -85,7 +85,7 @@ Buffers:
   - Name: Out1
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut1
     Format: UInt32
     Stride: 16
@@ -93,7 +93,7 @@ Buffers:
   - Name: Out2
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut2
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/clamp.fp16.test b/test/Feature/HLSLLib/clamp.fp16.test
index d4d96c1b2..e94fc164c 100644
--- a/test/Feature/HLSLLib/clamp.fp16.test
+++ b/test/Feature/HLSLLib/clamp.fp16.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out0
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/clamp.fp64.test b/test/Feature/HLSLLib/clamp.fp64.test
index 338e419e3..ecee619c4 100644
--- a/test/Feature/HLSLLib/clamp.fp64.test
+++ b/test/Feature/HLSLLib/clamp.fp64.test
@@ -35,7 +35,7 @@ Buffers:
   - Name: Out0
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut0
     Format: Float64
     Stride: 32
diff --git a/test/Feature/HLSLLib/clamp.int16.test b/test/Feature/HLSLLib/clamp.int16.test
index 327f8a0f9..932b0c9d1 100644
--- a/test/Feature/HLSLLib/clamp.int16.test
+++ b/test/Feature/HLSLLib/clamp.int16.test
@@ -15,7 +15,7 @@ void main() {
   Out0[1] = int16_t4(clamp(In0[1].xyz, In1[1].xyz, In2[1].xyz), clamp(In0[1].w, In1[1].w, In2[1].w));
   Out0[2] = int16_t4(clamp(In0[2].xy, In1[2].xy, In2[2].xy), clamp(In0[2].zw, In1[2].zw, In2[2].zw));
   Out0[3] = clamp(int16_t4(100, 90, 0, 8), int16_t4(-32768, 100, -10, 5), int16_t4(32767, 100, 10, 6));
-  
+
   Out1[0] = clamp(In3[0], In4[0], In5[0]);
   Out1[1] = uint16_t4(clamp(In3[1].xyz, In4[1].xyz, In5[1].xyz), clamp(In3[1].w, In4[1].w, In5[1].w));
   Out1[2] = uint16_t4(clamp(In3[2].xy, In4[2].xy, In5[2].xy), clamp(In3[2].zw, In4[2].zw, In5[2].zw));
@@ -56,7 +56,7 @@ Buffers:
   - Name: Out0
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Int16
     Stride: 8
@@ -64,7 +64,7 @@ Buffers:
   - Name: Out1
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: UInt16
     Stride: 8
diff --git a/test/Feature/HLSLLib/clamp.int64.test b/test/Feature/HLSLLib/clamp.int64.test
index ad2db8f48..d079c0486 100644
--- a/test/Feature/HLSLLib/clamp.int64.test
+++ b/test/Feature/HLSLLib/clamp.int64.test
@@ -16,7 +16,7 @@ void main() {
   Out0[1] = int64_t4(clamp(In0[1].xyz, In1[1].xyz, In2[1].xyz), clamp(In0[1].w, In1[1].w, In2[1].w));
   Out0[2] = int64_t4(clamp(In0[2].xy, In1[2].xy, In2[2].xy), clamp(In0[2].zw, In1[2].zw, In2[2].zw));
   Out0[3] = clamp(int64_t4(100, 90, 0, 8), int64_t4(-2147483648, 100, -10, 5), int64_t4(2147483647, 100, 10, 6));
-  
+
   Out1[0] = clamp(In3[0], In4[0], In5[0]);
   Out1[1] = uint64_t4(clamp(In3[1].xyz, In4[1].xyz, In5[1].xyz), clamp(In3[1].w, In4[1].w, In5[1].w));
   Out1[2] = uint64_t4(clamp(In3[2].xy, In4[2].xy, In5[2].xy), clamp(In3[2].zw, In4[2].zw, In5[2].zw));
@@ -57,7 +57,7 @@ Buffers:
   - Name: Out0
     Format: Int64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut0
     Format: Int64
     Stride: 32
@@ -65,7 +65,7 @@ Buffers:
   - Name: Out1
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut1
     Format: UInt64
     Stride: 32
diff --git a/test/Feature/HLSLLib/cos.16.test b/test/Feature/HLSLLib/cos.16.test
index a7c684035..02bfa9af4 100644
--- a/test/Feature/HLSLLib/cos.16.test
+++ b/test/Feature/HLSLLib/cos.16.test
@@ -32,7 +32,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 40
+    FillSize: 40
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/cos.32.test b/test/Feature/HLSLLib/cos.32.test
index e301fce73..574ee2180 100644
--- a/test/Feature/HLSLLib/cos.32.test
+++ b/test/Feature/HLSLLib/cos.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/cosh.16.test b/test/Feature/HLSLLib/cosh.16.test
index 60fe8cd2e..0ef13f252 100644
--- a/test/Feature/HLSLLib/cosh.16.test
+++ b/test/Feature/HLSLLib/cosh.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/cosh.32.test b/test/Feature/HLSLLib/cosh.32.test
index b1b6c51dc..b79c9a0da 100644
--- a/test/Feature/HLSLLib/cosh.32.test
+++ b/test/Feature/HLSLLib/cosh.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/countbits.16.test b/test/Feature/HLSLLib/countbits.16.test
index 2b6ea97e2..998700074 100644
--- a/test/Feature/HLSLLib/countbits.16.test
+++ b/test/Feature/HLSLLib/countbits.16.test
@@ -52,11 +52,11 @@ Buffers:
   - Name: OutInt
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: OutUInt
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/countbits.32.test b/test/Feature/HLSLLib/countbits.32.test
index 3603e13a2..4d3458787 100644
--- a/test/Feature/HLSLLib/countbits.32.test
+++ b/test/Feature/HLSLLib/countbits.32.test
@@ -39,11 +39,11 @@ Buffers:
   - Name: OutInt
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: OutUInt
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/countbits.64.test b/test/Feature/HLSLLib/countbits.64.test
index 4cf6674e7..bec3ec85f 100644
--- a/test/Feature/HLSLLib/countbits.64.test
+++ b/test/Feature/HLSLLib/countbits.64.test
@@ -40,11 +40,11 @@ Buffers:
   - Name: OutInt
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: OutUInt
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/cross.16.test b/test/Feature/HLSLLib/cross.16.test
index 13ebc148a..5f8b814b7 100644
--- a/test/Feature/HLSLLib/cross.16.test
+++ b/test/Feature/HLSLLib/cross.16.test
@@ -34,7 +34,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/cross.32.test b/test/Feature/HLSLLib/cross.32.test
index 30e27ae90..f5a3d099e 100644
--- a/test/Feature/HLSLLib/cross.32.test
+++ b/test/Feature/HLSLLib/cross.32.test
@@ -32,7 +32,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/degrees.16.test b/test/Feature/HLSLLib/degrees.16.test
index 194e77caa..497d180ea 100644
--- a/test/Feature/HLSLLib/degrees.16.test
+++ b/test/Feature/HLSLLib/degrees.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/degrees.32.test b/test/Feature/HLSLLib/degrees.32.test
index 133af8b5b..4dec94cf0 100644
--- a/test/Feature/HLSLLib/degrees.32.test
+++ b/test/Feature/HLSLLib/degrees.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/distance.16.test b/test/Feature/HLSLLib/distance.16.test
index 3f76b1d0b..61de2b17a 100644
--- a/test/Feature/HLSLLib/distance.16.test
+++ b/test/Feature/HLSLLib/distance.16.test
@@ -80,7 +80,7 @@ Buffers:
   - Name: Result
     Format: Float16
     Stride: 2
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult
     Format: Float16
     Stride: 2
diff --git a/test/Feature/HLSLLib/distance.32.test b/test/Feature/HLSLLib/distance.32.test
index 6ceb88a69..08a8698cc 100644
--- a/test/Feature/HLSLLib/distance.32.test
+++ b/test/Feature/HLSLLib/distance.32.test
@@ -78,7 +78,7 @@ Buffers:
   - Name: Result
     Format: Float32
     Stride: 4
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedResult
     Format: Float32
     Stride: 4
diff --git a/test/Feature/HLSLLib/dot.32.test b/test/Feature/HLSLLib/dot.32.test
index b84a86d3d..f2f65e708 100644
--- a/test/Feature/HLSLLib/dot.32.test
+++ b/test/Feature/HLSLLib/dot.32.test
@@ -87,7 +87,7 @@ Buffers:
   - Name: Out0
     Format: Float32
     Stride: 4
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Float32
     Stride: 4
@@ -95,7 +95,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 4
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: Int32
     Stride: 4
@@ -103,7 +103,7 @@ Buffers:
   - Name: Out2
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut2
     Format: UInt32
     Stride: 4
diff --git a/test/Feature/HLSLLib/dot.fp16.test b/test/Feature/HLSLLib/dot.fp16.test
index 23be55a4e..9c3b4130d 100644
--- a/test/Feature/HLSLLib/dot.fp16.test
+++ b/test/Feature/HLSLLib/dot.fp16.test
@@ -40,7 +40,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 2
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut
     Format: Float16
     Stride: 2
diff --git a/test/Feature/HLSLLib/dot.fp64.test b/test/Feature/HLSLLib/dot.fp64.test
index c2ed598ff..6a16a4a9a 100644
--- a/test/Feature/HLSLLib/dot.fp64.test
+++ b/test/Feature/HLSLLib/dot.fp64.test
@@ -38,7 +38,7 @@ Buffers:
   - Name: Out
     Format: Float64
     Stride: 8
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut
     Format: Float64
     Stride: 8
diff --git a/test/Feature/HLSLLib/dot.int16.test b/test/Feature/HLSLLib/dot.int16.test
index 0945698d4..1f1c3463a 100644
--- a/test/Feature/HLSLLib/dot.int16.test
+++ b/test/Feature/HLSLLib/dot.int16.test
@@ -63,7 +63,7 @@ Buffers:
   - Name: Out0
     Format: Int16
     Stride: 2
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut0
     Format: Int16
     Stride: 2
@@ -71,7 +71,7 @@ Buffers:
   - Name: Out1
     Format: UInt16
     Stride: 2
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut1
     Format: UInt16
     Stride: 2
diff --git a/test/Feature/HLSLLib/dot.int64.test b/test/Feature/HLSLLib/dot.int64.test
index 1dbd12631..e1e723092 100644
--- a/test/Feature/HLSLLib/dot.int64.test
+++ b/test/Feature/HLSLLib/dot.int64.test
@@ -63,7 +63,7 @@ Buffers:
   - Name: Out0
     Format: Int64
     Stride: 8
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: Int64
     Stride: 8
@@ -71,7 +71,7 @@ Buffers:
   - Name: Out1
     Format: UInt64
     Stride: 8
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut1
     Format: UInt64
     Stride: 8
diff --git a/test/Feature/HLSLLib/dot2add.test b/test/Feature/HLSLLib/dot2add.test
index 0bf9adbee..39fe14726 100644
--- a/test/Feature/HLSLLib/dot2add.test
+++ b/test/Feature/HLSLLib/dot2add.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 4
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut
     Format: Float32
     Stride: 4
diff --git a/test/Feature/HLSLLib/dot4add.test b/test/Feature/HLSLLib/dot4add.test
index 086ee7601..e6839d359 100644
--- a/test/Feature/HLSLLib/dot4add.test
+++ b/test/Feature/HLSLLib/dot4add.test
@@ -38,7 +38,7 @@ Buffers:
   - Name: Result
     Format: Hex32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult
     Format: Hex32
     Stride: 4
diff --git a/test/Feature/HLSLLib/exp.16.test b/test/Feature/HLSLLib/exp.16.test
index fc8f95936..bb6526e63 100644
--- a/test/Feature/HLSLLib/exp.16.test
+++ b/test/Feature/HLSLLib/exp.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/exp.32.test b/test/Feature/HLSLLib/exp.32.test
index a5e27b499..eecc1c4c4 100644
--- a/test/Feature/HLSLLib/exp.32.test
+++ b/test/Feature/HLSLLib/exp.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/exp2.16.test b/test/Feature/HLSLLib/exp2.16.test
index 8abbe5f29..c05ecf1a3 100644
--- a/test/Feature/HLSLLib/exp2.16.test
+++ b/test/Feature/HLSLLib/exp2.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/exp2.32.test b/test/Feature/HLSLLib/exp2.32.test
index bf2cfee44..9aea637cf 100644
--- a/test/Feature/HLSLLib/exp2.32.test
+++ b/test/Feature/HLSLLib/exp2.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/firstbithigh.16.test b/test/Feature/HLSLLib/firstbithigh.16.test
index 8fb651d5c..49953f4cd 100644
--- a/test/Feature/HLSLLib/firstbithigh.16.test
+++ b/test/Feature/HLSLLib/firstbithigh.16.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/firstbithigh.32.test b/test/Feature/HLSLLib/firstbithigh.32.test
index 98ed8f407..95d77bc2d 100644
--- a/test/Feature/HLSLLib/firstbithigh.32.test
+++ b/test/Feature/HLSLLib/firstbithigh.32.test
@@ -43,12 +43,12 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
     # All bits set (4294967295) is returned when no bit is set on the input
-    Data: [4294967295, 3, 0, 31, 4294967295, 3, 0, 31, 4294967295, 2, 3, 4294967295] 
+    Data: [4294967295, 3, 0, 31, 4294967295, 3, 0, 31, 4294967295, 2, 3, 4294967295]
 Results:
   - Result: Test1
     Rule: BufferExact
diff --git a/test/Feature/HLSLLib/firstbithigh.64.test b/test/Feature/HLSLLib/firstbithigh.64.test
index d3c5ed917..afcc328a2 100644
--- a/test/Feature/HLSLLib/firstbithigh.64.test
+++ b/test/Feature/HLSLLib/firstbithigh.64.test
@@ -43,7 +43,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/firstbitlow.16.test b/test/Feature/HLSLLib/firstbitlow.16.test
index 02a3ab116..a6494e4ec 100644
--- a/test/Feature/HLSLLib/firstbitlow.16.test
+++ b/test/Feature/HLSLLib/firstbitlow.16.test
@@ -37,7 +37,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/firstbitlow.32.test b/test/Feature/HLSLLib/firstbitlow.32.test
index 9942dae42..441179b06 100644
--- a/test/Feature/HLSLLib/firstbitlow.32.test
+++ b/test/Feature/HLSLLib/firstbitlow.32.test
@@ -37,7 +37,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/firstbitlow.64.test b/test/Feature/HLSLLib/firstbitlow.64.test
index 0d1b503a6..fe0eb3f9b 100644
--- a/test/Feature/HLSLLib/firstbitlow.64.test
+++ b/test/Feature/HLSLLib/firstbitlow.64.test
@@ -37,7 +37,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/floor.16.test b/test/Feature/HLSLLib/floor.16.test
index 60bd39bdf..ad7045058 100644
--- a/test/Feature/HLSLLib/floor.16.test
+++ b/test/Feature/HLSLLib/floor.16.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/floor.32.test b/test/Feature/HLSLLib/floor.32.test
index 55ef9eb32..ee0f05f50 100644
--- a/test/Feature/HLSLLib/floor.32.test
+++ b/test/Feature/HLSLLib/floor.32.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/fmod.16.test b/test/Feature/HLSLLib/fmod.16.test
index a515cbc69..30594543e 100644
--- a/test/Feature/HLSLLib/fmod.16.test
+++ b/test/Feature/HLSLLib/fmod.16.test
@@ -32,7 +32,7 @@ Buffers:
   - Name: Out0
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/fmod.32.test b/test/Feature/HLSLLib/fmod.32.test
index a90f48092..ec02aef1b 100644
--- a/test/Feature/HLSLLib/fmod.32.test
+++ b/test/Feature/HLSLLib/fmod.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out0
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/frac.16.test b/test/Feature/HLSLLib/frac.16.test
index ec743cb97..57fe745e4 100644
--- a/test/Feature/HLSLLib/frac.16.test
+++ b/test/Feature/HLSLLib/frac.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/frac.32.test b/test/Feature/HLSLLib/frac.32.test
index d045e6e18..e58e06b24 100644
--- a/test/Feature/HLSLLib/frac.32.test
+++ b/test/Feature/HLSLLib/frac.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/isinf.16.test b/test/Feature/HLSLLib/isinf.16.test
index 232b49f97..d99d2ec9c 100644
--- a/test/Feature/HLSLLib/isinf.16.test
+++ b/test/Feature/HLSLLib/isinf.16.test
@@ -26,7 +26,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Bool
     Stride: 16
diff --git a/test/Feature/HLSLLib/isinf.32.test b/test/Feature/HLSLLib/isinf.32.test
index 3b3e2327b..1a02bed0e 100644
--- a/test/Feature/HLSLLib/isinf.32.test
+++ b/test/Feature/HLSLLib/isinf.32.test
@@ -26,7 +26,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Bool
     Stride: 16
diff --git a/test/Feature/HLSLLib/ldexp.16.test b/test/Feature/HLSLLib/ldexp.16.test
index f2ecdabef..f1e5a5660 100644
--- a/test/Feature/HLSLLib/ldexp.16.test
+++ b/test/Feature/HLSLLib/ldexp.16.test
@@ -41,7 +41,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/ldexp.32.test b/test/Feature/HLSLLib/ldexp.32.test
index f784f0a74..494d2da67 100644
--- a/test/Feature/HLSLLib/ldexp.32.test
+++ b/test/Feature/HLSLLib/ldexp.32.test
@@ -41,7 +41,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/length.16.test b/test/Feature/HLSLLib/length.16.test
index 2b87f7229..326d380e6 100644
--- a/test/Feature/HLSLLib/length.16.test
+++ b/test/Feature/HLSLLib/length.16.test
@@ -29,7 +29,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 2
-    ZeroInitSize: 12
+    FillSize: 12
   - Name: ExpectedOut
     Format: Float16
     Stride: 2
diff --git a/test/Feature/HLSLLib/length.32.test b/test/Feature/HLSLLib/length.32.test
index c6c39c515..780fd9981 100644
--- a/test/Feature/HLSLLib/length.32.test
+++ b/test/Feature/HLSLLib/length.32.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 4
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut
     Format: Float32
     Stride: 4
diff --git a/test/Feature/HLSLLib/lerp.16.test b/test/Feature/HLSLLib/lerp.16.test
index 426cad2af..c3a05a3aa 100644
--- a/test/Feature/HLSLLib/lerp.16.test
+++ b/test/Feature/HLSLLib/lerp.16.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/lerp.32.test b/test/Feature/HLSLLib/lerp.32.test
index ee50f67e5..a087d2a9a 100644
--- a/test/Feature/HLSLLib/lerp.32.test
+++ b/test/Feature/HLSLLib/lerp.32.test
@@ -36,7 +36,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/log.16.test b/test/Feature/HLSLLib/log.16.test
index 8cc530c84..20a038758 100644
--- a/test/Feature/HLSLLib/log.16.test
+++ b/test/Feature/HLSLLib/log.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/log.32.test b/test/Feature/HLSLLib/log.32.test
index edae3aa2b..d94683019 100644
--- a/test/Feature/HLSLLib/log.32.test
+++ b/test/Feature/HLSLLib/log.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/log10.16.test b/test/Feature/HLSLLib/log10.16.test
index 042adb931..d86d4058b 100644
--- a/test/Feature/HLSLLib/log10.16.test
+++ b/test/Feature/HLSLLib/log10.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/log10.32.test b/test/Feature/HLSLLib/log10.32.test
index 78f301529..e6c30347d 100644
--- a/test/Feature/HLSLLib/log10.32.test
+++ b/test/Feature/HLSLLib/log10.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/log2.16.test b/test/Feature/HLSLLib/log2.16.test
index 00718ba1b..89d080812 100644
--- a/test/Feature/HLSLLib/log2.16.test
+++ b/test/Feature/HLSLLib/log2.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/log2.32.test b/test/Feature/HLSLLib/log2.32.test
index fe1095e70..c2afedf00 100644
--- a/test/Feature/HLSLLib/log2.32.test
+++ b/test/Feature/HLSLLib/log2.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/mad.32.test b/test/Feature/HLSLLib/mad.32.test
index 3d1627ec3..1a2a4fd5e 100644
--- a/test/Feature/HLSLLib/mad.32.test
+++ b/test/Feature/HLSLLib/mad.32.test
@@ -21,13 +21,13 @@ void main() {
   Out0[1] = float4(mad(M0[1].xyz, A0[1].xyz, B0[1].xyz), mad(M0[1].w, A0[1].w, B0[1].w));
   Out0[2] = float4(mad(M0[2].xy, A0[2].xy, B0[2].xy), mad(M0[2].zw, A0[2].zw, B0[2].zw));
   Out0[3] = mad(float4(1.0, 1.5, 1e+38, -1e+38), float4(1.0, 10, 4, 4), float4(1.0, -5.5, 0, 0));
-  
+
   // int
   Out1[0] = mad(M1[0], A1[0], B1[0]);
   Out1[1] = int4(mad(M1[1].xyz, A1[1].xyz, B1[1].xyz), mad(M1[1].w, A1[1].w, B1[1].w));
   Out1[2] = int4(mad(M1[2].xy, A1[2].xy, B1[2].xy), mad(M1[2].zw, A1[2].zw, B1[2].zw));
   Out1[3] = mad(int4(-2147483647, -256, 2147483647, -2147483648), int4(1, -256, 1, 1), int4(0, 0, 1, -1));
-  
+
   // uint
   Out2[0] = mad(M2[0], A2[0], B2[0]);
   Out2[1] = uint4(mad(M2[1].xyz, A2[1].xyz, B2[1].xyz), mad(M2[1].w, A2[1].w, B2[1].w));
@@ -84,7 +84,7 @@ Buffers:
   - Name: Out0
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: Float32
     Stride: 16
@@ -92,7 +92,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut1
     Format: Int32
     Stride: 16
@@ -100,7 +100,7 @@ Buffers:
   - Name: Out2
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut2
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/mad.fp16.test b/test/Feature/HLSLLib/mad.fp16.test
index ea31b98e7..3c48c7dc1 100644
--- a/test/Feature/HLSLLib/mad.fp16.test
+++ b/test/Feature/HLSLLib/mad.fp16.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/mad.fp64.test b/test/Feature/HLSLLib/mad.fp64.test
index 46ee0af1f..27edd2958 100644
--- a/test/Feature/HLSLLib/mad.fp64.test
+++ b/test/Feature/HLSLLib/mad.fp64.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut
     Format: Float64
     Stride: 32
diff --git a/test/Feature/HLSLLib/mad.int16.test b/test/Feature/HLSLLib/mad.int16.test
index ef0fad8ef..daa48bce2 100644
--- a/test/Feature/HLSLLib/mad.int16.test
+++ b/test/Feature/HLSLLib/mad.int16.test
@@ -59,7 +59,7 @@ Buffers:
   - Name: Out0
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Int16
     Stride: 8
@@ -67,7 +67,7 @@ Buffers:
   - Name: Out1
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: UInt16
     Stride: 8
diff --git a/test/Feature/HLSLLib/mad.int64.test b/test/Feature/HLSLLib/mad.int64.test
index aec02acf7..e619a8147 100644
--- a/test/Feature/HLSLLib/mad.int64.test
+++ b/test/Feature/HLSLLib/mad.int64.test
@@ -59,7 +59,7 @@ Buffers:
   - Name: Out0
     Format: Int64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut0
     Format: Int64
     Stride: 32
@@ -67,7 +67,7 @@ Buffers:
   - Name: Out1
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut1
     Format: UInt64
     Stride: 32
diff --git a/test/Feature/HLSLLib/max.32.test b/test/Feature/HLSLLib/max.32.test
index 56d381390..478a4938b 100644
--- a/test/Feature/HLSLLib/max.32.test
+++ b/test/Feature/HLSLLib/max.32.test
@@ -66,7 +66,7 @@ Buffers:
   - Name: Out0
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: Float32
     Stride: 16
@@ -74,7 +74,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut1
     Format: Int32
     Stride: 16
@@ -82,7 +82,7 @@ Buffers:
   - Name: Out2
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut2
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/max.fp16.test b/test/Feature/HLSLLib/max.fp16.test
index de695c25c..37f7c5b4f 100644
--- a/test/Feature/HLSLLib/max.fp16.test
+++ b/test/Feature/HLSLLib/max.fp16.test
@@ -33,7 +33,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/max.fp64.test b/test/Feature/HLSLLib/max.fp64.test
index 1d98525b3..eb5bfd4d3 100644
--- a/test/Feature/HLSLLib/max.fp64.test
+++ b/test/Feature/HLSLLib/max.fp64.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut0
     Format: Float64
     Stride: 32
diff --git a/test/Feature/HLSLLib/max.int16.test b/test/Feature/HLSLLib/max.int16.test
index d9fb1f57c..70dc2e7a1 100644
--- a/test/Feature/HLSLLib/max.int16.test
+++ b/test/Feature/HLSLLib/max.int16.test
@@ -49,7 +49,7 @@ Buffers:
   - Name: Out0
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Int16
     Stride: 8
@@ -57,7 +57,7 @@ Buffers:
   - Name: Out1
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: UInt16
     Stride: 8
diff --git a/test/Feature/HLSLLib/max.int64.test b/test/Feature/HLSLLib/max.int64.test
index 7188c9921..524751e0c 100644
--- a/test/Feature/HLSLLib/max.int64.test
+++ b/test/Feature/HLSLLib/max.int64.test
@@ -49,7 +49,7 @@ Buffers:
   - Name: Out0
     Format: Int64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut0
     Format: Int64
     Stride: 32
@@ -57,7 +57,7 @@ Buffers:
   - Name: Out1
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut1
     Format: UInt64
     Stride: 32
diff --git a/test/Feature/HLSLLib/min.32.test b/test/Feature/HLSLLib/min.32.test
index 45c45ad8a..ddab91538 100644
--- a/test/Feature/HLSLLib/min.32.test
+++ b/test/Feature/HLSLLib/min.32.test
@@ -18,14 +18,14 @@ void main() {
   Out0[1] = float4(min(X0[1].xyz, Y0[1].xyz), min(X0[1].w, Y0[1].w));
   Out0[2] = float4(min(X0[2].xy, Y0[2].xy), min(X0[2].zw, Y0[2].zw));
   Out0[3] = min(half4(1.0, -1.0, 31408, -415), half4(-1.0, 1.0, 1.5, 129.5));
-  
+
   // int
   Out1[0] = min(X1[0], Y1[0]);
   Out1[1] = int4(min(X1[1].xyz, Y1[1].xyz), min(X1[1].w, Y1[1].w));
   Out1[2] = int4(min(X1[2].xy, Y1[2].xy), min(X1[2].zw, Y1[2].zw));
   Out1[3] = min(X1[3], Y1[3]);
   Out1[3] = min(int4(-2147483648, -10, 10, 2147483647), int4(0, 10, 10, 0));
-  
+
   // uint
   Out2[0] = min(X2[0], Y2[0]);
   Out2[1] = uint4(min(X2[1].xyz, Y2[1].xyz), min(X2[1].w, Y2[1].w));
@@ -68,7 +68,7 @@ Buffers:
   - Name: Out0
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut0
     Format: Float32
     Stride: 16
@@ -76,7 +76,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut1
     Format: Int32
     Stride: 16
@@ -84,7 +84,7 @@ Buffers:
   - Name: Out2
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut2
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/min.fp16.test b/test/Feature/HLSLLib/min.fp16.test
index e792b3164..519ec22a5 100644
--- a/test/Feature/HLSLLib/min.fp16.test
+++ b/test/Feature/HLSLLib/min.fp16.test
@@ -33,7 +33,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/min.fp64.test b/test/Feature/HLSLLib/min.fp64.test
index 2d1a7b531..304e999e7 100644
--- a/test/Feature/HLSLLib/min.fp64.test
+++ b/test/Feature/HLSLLib/min.fp64.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut0
     Format: Float64
     Stride: 32
diff --git a/test/Feature/HLSLLib/min.int16.test b/test/Feature/HLSLLib/min.int16.test
index b8d062005..10f5145c5 100644
--- a/test/Feature/HLSLLib/min.int16.test
+++ b/test/Feature/HLSLLib/min.int16.test
@@ -15,7 +15,7 @@ void main() {
   Out0[1] = int16_t4(min(X0[1].xyz, Y0[1].xyz), min(X0[1].w, Y0[1].w));
   Out0[2] = int16_t4(min(X0[2].xy, Y0[2].xy), min(X0[2].zw, Y0[2].zw));
   Out0[3] = min(int16_t4(-32768, -10, 10, 32767), int16_t4(0, 10, 15, 0));
-  
+
   // uint16_t
   Out1[0] = min(X1[0], Y1[0]);
   Out1[1] = uint16_t4(min(X1[1].xyz, Y1[1].xyz), min(X1[1].w, Y1[1].w));
@@ -49,7 +49,7 @@ Buffers:
   - Name: Out0
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut0
     Format: Int16
     Stride: 8
@@ -57,7 +57,7 @@ Buffers:
   - Name: Out1
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: UInt16
     Stride: 8
diff --git a/test/Feature/HLSLLib/min.int64.test b/test/Feature/HLSLLib/min.int64.test
index e8745948a..d244add05 100644
--- a/test/Feature/HLSLLib/min.int64.test
+++ b/test/Feature/HLSLLib/min.int64.test
@@ -15,7 +15,7 @@ void main() {
   Out0[1] = int64_t4(min(X0[1].xyz, Y0[1].xyz), min(X0[1].w, Y0[1].w));
   Out0[2] = int64_t4(min(X0[2].xy, Y0[2].xy), min(X0[2].zw, Y0[2].zw));
   Out0[3] = min(int64_t4(-9223372036854775808, -10, 10, 9223372036854775807), int64_t4(0, 10, 15, 0));
-  
+
   // uint64_t
   Out1[0] = min(X1[0], Y1[0]);
   Out1[1] = uint64_t4(min(X1[1].xyz, Y1[1].xyz), min(X1[1].w, Y1[1].w));
@@ -49,7 +49,7 @@ Buffers:
   - Name: Out0
     Format: Int64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut0
     Format: Int64
     Stride: 32
@@ -57,7 +57,7 @@ Buffers:
   - Name: Out1
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut1
     Format: UInt64
     Stride: 32
diff --git a/test/Feature/HLSLLib/normalize.16.test b/test/Feature/HLSLLib/normalize.16.test
index 9ee42d9cb..a057b6f58 100644
--- a/test/Feature/HLSLLib/normalize.16.test
+++ b/test/Feature/HLSLLib/normalize.16.test
@@ -27,7 +27,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/normalize.32.test b/test/Feature/HLSLLib/normalize.32.test
index 961c7bbd1..4370fdc2c 100644
--- a/test/Feature/HLSLLib/normalize.32.test
+++ b/test/Feature/HLSLLib/normalize.32.test
@@ -26,7 +26,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/or.test b/test/Feature/HLSLLib/or.test
index d0f0fd15f..ee3fd58a5 100644
--- a/test/Feature/HLSLLib/or.test
+++ b/test/Feature/HLSLLib/or.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Bool
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Bool
     Stride: 16
diff --git a/test/Feature/HLSLLib/pow.16.test b/test/Feature/HLSLLib/pow.16.test
index 7ca75d12f..cdc5d8eeb 100644
--- a/test/Feature/HLSLLib/pow.16.test
+++ b/test/Feature/HLSLLib/pow.16.test
@@ -33,7 +33,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/pow.32.test b/test/Feature/HLSLLib/pow.32.test
index 8d8d3f66f..c4d1e84b5 100644
--- a/test/Feature/HLSLLib/pow.32.test
+++ b/test/Feature/HLSLLib/pow.32.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/radians.16.test b/test/Feature/HLSLLib/radians.16.test
index 481373c5d..d27500f41 100644
--- a/test/Feature/HLSLLib/radians.16.test
+++ b/test/Feature/HLSLLib/radians.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/radians.32.test b/test/Feature/HLSLLib/radians.32.test
index c0fb35ee6..b075146b1 100644
--- a/test/Feature/HLSLLib/radians.32.test
+++ b/test/Feature/HLSLLib/radians.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/rcp.16.test b/test/Feature/HLSLLib/rcp.16.test
index e5306a7d9..cdba4d384 100644
--- a/test/Feature/HLSLLib/rcp.16.test
+++ b/test/Feature/HLSLLib/rcp.16.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/rcp.32.test b/test/Feature/HLSLLib/rcp.32.test
index 6b13ca382..b59a8ad99 100644
--- a/test/Feature/HLSLLib/rcp.32.test
+++ b/test/Feature/HLSLLib/rcp.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/rcp.64.test b/test/Feature/HLSLLib/rcp.64.test
index 08ae9b322..47f0b7994 100644
--- a/test/Feature/HLSLLib/rcp.64.test
+++ b/test/Feature/HLSLLib/rcp.64.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: ExpectedOut # The result we expect
     Format: Float64
     Stride: 32
diff --git a/test/Feature/HLSLLib/reflect.16.test b/test/Feature/HLSLLib/reflect.16.test
index 6dad6687f..5902d3d26 100644
--- a/test/Feature/HLSLLib/reflect.16.test
+++ b/test/Feature/HLSLLib/reflect.16.test
@@ -76,7 +76,7 @@ Buffers:
   - Name: Result2D
     Format: Float16
     Stride: 4
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: ExpectedResult2D
     Format: Float16
     Stride: 4
@@ -85,7 +85,7 @@ Buffers:
   - Name: Result3D
     Format: Float16
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult3D
     Format: Float16
     Stride: 8
@@ -94,7 +94,7 @@ Buffers:
   - Name: Result4D
     Format: Float16
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult4D
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/reflect.32.test b/test/Feature/HLSLLib/reflect.32.test
index 967f532ae..4044f31e5 100644
--- a/test/Feature/HLSLLib/reflect.32.test
+++ b/test/Feature/HLSLLib/reflect.32.test
@@ -72,7 +72,7 @@ Buffers:
   - Name: Result2D
     Format: Float32
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult2D
     Format: Float32
     Stride: 8
@@ -81,7 +81,7 @@ Buffers:
   - Name: Result3D
     Format: Float32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult3D
     Format: Float32
     Stride: 16
@@ -90,7 +90,7 @@ Buffers:
   - Name: Result4D
     Format: Float32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult4D
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/refract.16.test b/test/Feature/HLSLLib/refract.16.test
index f14c91104..f9b314480 100644
--- a/test/Feature/HLSLLib/refract.16.test
+++ b/test/Feature/HLSLLib/refract.16.test
@@ -77,7 +77,7 @@ Buffers:
   - Name: Result2D
     Format: Float16
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult2D
     Format: Float16
     Stride: 4
@@ -86,7 +86,7 @@ Buffers:
   - Name: Result3D
     Format: Float16
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult3D
     Format: Float16
     Stride: 8
@@ -95,7 +95,7 @@ Buffers:
   - Name: Result4D
     Format: Float16
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult4D
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/refract.32.test b/test/Feature/HLSLLib/refract.32.test
index 517f2f6a4..b52bc5a1c 100644
--- a/test/Feature/HLSLLib/refract.32.test
+++ b/test/Feature/HLSLLib/refract.32.test
@@ -72,7 +72,7 @@ Buffers:
   - Name: Result2D
     Format: Float32
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult2D
     Format: Float32
     Stride: 8
@@ -80,7 +80,7 @@ Buffers:
   - Name: Result3D
     Format: Float32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult3D
     Format: Float32
     Stride: 16
@@ -88,7 +88,7 @@ Buffers:
   - Name: Result4D
     Format: Float32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult4D
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/reversebits.16.test b/test/Feature/HLSLLib/reversebits.16.test
index 38f31629f..cac17e6bb 100644
--- a/test/Feature/HLSLLib/reversebits.16.test
+++ b/test/Feature/HLSLLib/reversebits.16.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: UInt16
     Stride: 8
diff --git a/test/Feature/HLSLLib/reversebits.32.test b/test/Feature/HLSLLib/reversebits.32.test
index 7f80855a4..f6de68b29 100644
--- a/test/Feature/HLSLLib/reversebits.32.test
+++ b/test/Feature/HLSLLib/reversebits.32.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: UInt32
     Stride: 16
diff --git a/test/Feature/HLSLLib/reversebits.64.test b/test/Feature/HLSLLib/reversebits.64.test
index ddcf210fc..f82eee00b 100644
--- a/test/Feature/HLSLLib/reversebits.64.test
+++ b/test/Feature/HLSLLib/reversebits.64.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 96
+    FillSize: 96
   - Name: ExpectedOut # The result we expect
     Format: UInt64
     Stride: 32
diff --git a/test/Feature/HLSLLib/round.16.test b/test/Feature/HLSLLib/round.16.test
index 0d89c1d3e..1505fb7cd 100644
--- a/test/Feature/HLSLLib/round.16.test
+++ b/test/Feature/HLSLLib/round.16.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/round.32.test b/test/Feature/HLSLLib/round.32.test
index c113a84de..1acc16cfc 100644
--- a/test/Feature/HLSLLib/round.32.test
+++ b/test/Feature/HLSLLib/round.32.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/rsqrt.16.test b/test/Feature/HLSLLib/rsqrt.16.test
index a17b88a9d..e2e60abc7 100644
--- a/test/Feature/HLSLLib/rsqrt.16.test
+++ b/test/Feature/HLSLLib/rsqrt.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/rsqrt.32.test b/test/Feature/HLSLLib/rsqrt.32.test
index 1639ce2b4..e519e5dff 100644
--- a/test/Feature/HLSLLib/rsqrt.32.test
+++ b/test/Feature/HLSLLib/rsqrt.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/saturate.16.test b/test/Feature/HLSLLib/saturate.16.test
index 5e4232311..18e66b7b4 100644
--- a/test/Feature/HLSLLib/saturate.16.test
+++ b/test/Feature/HLSLLib/saturate.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/saturate.32.test b/test/Feature/HLSLLib/saturate.32.test
index 20d74c2fe..f1c702ccf 100644
--- a/test/Feature/HLSLLib/saturate.32.test
+++ b/test/Feature/HLSLLib/saturate.32.test
@@ -26,7 +26,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/HLSLLib/select.32.test b/test/Feature/HLSLLib/select.32.test
index f95836ef5..a5f8c755e 100644
--- a/test/Feature/HLSLLib/select.32.test
+++ b/test/Feature/HLSLLib/select.32.test
@@ -144,7 +144,7 @@ Buffers:
   - Name: Out0
     Format: Float32
     Stride: 16
-    ZeroInitSize: 160
+    FillSize: 160
   - Name: ExpectedOut0
     Format: Float32
     Stride: 16
@@ -156,7 +156,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 160
+    FillSize: 160
   - Name: ExpectedOut1
     Format: Int32
     Stride: 16
@@ -168,7 +168,7 @@ Buffers:
   - Name: Out2
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 160
+    FillSize: 160
   - Name: ExpectedOut2
     Format: UInt32
     Stride: 16
@@ -180,7 +180,7 @@ Buffers:
   - Name: Out3
     Format: Bool
     Stride: 16
-    ZeroInitSize: 160
+    FillSize: 160
   - Name: ExpectedOut3
     Format: Bool
     Stride: 16
diff --git a/test/Feature/HLSLLib/select.fp16.test b/test/Feature/HLSLLib/select.fp16.test
index c2972be33..41ce44c29 100644
--- a/test/Feature/HLSLLib/select.fp16.test
+++ b/test/Feature/HLSLLib/select.fp16.test
@@ -63,7 +63,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 80
+    FillSize: 80
   - Name: ExpectedOut
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/select.fp64.test b/test/Feature/HLSLLib/select.fp64.test
index 648cab67d..bfc356743 100644
--- a/test/Feature/HLSLLib/select.fp64.test
+++ b/test/Feature/HLSLLib/select.fp64.test
@@ -61,7 +61,7 @@ Buffers:
   - Name: Out
     Format: Float64
     Stride: 32
-    ZeroInitSize: 320
+    FillSize: 320
   - Name: ExpectedOut
     Format: Float64
     Stride: 32
diff --git a/test/Feature/HLSLLib/select.int16.test b/test/Feature/HLSLLib/select.int16.test
index 92d57edd4..8c324e12e 100644
--- a/test/Feature/HLSLLib/select.int16.test
+++ b/test/Feature/HLSLLib/select.int16.test
@@ -88,7 +88,7 @@ Buffers:
   - Name: Out0
     Format: Int16
     Stride: 8
-    ZeroInitSize: 80
+    FillSize: 80
   - Name: ExpectedOut0
     Format: Int16
     Stride: 8
@@ -100,7 +100,7 @@ Buffers:
   - Name: Out1
     Format: Int16
     Stride: 8
-    ZeroInitSize: 80
+    FillSize: 80
   - Name: ExpectedOut1
     Format: Int16
     Stride: 8
diff --git a/test/Feature/HLSLLib/select.int64.test b/test/Feature/HLSLLib/select.int64.test
index b0aea9e55..96d0cfe87 100644
--- a/test/Feature/HLSLLib/select.int64.test
+++ b/test/Feature/HLSLLib/select.int64.test
@@ -88,7 +88,7 @@ Buffers:
   - Name: Out0
     Format: Int64
     Stride: 32
-    ZeroInitSize: 320
+    FillSize: 320
   - Name: ExpectedOut0
     Format: Int64
     Stride: 32
@@ -100,7 +100,7 @@ Buffers:
   - Name: Out1
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 320
+    FillSize: 320
   - Name: ExpectedOut1
     Format: UInt64
     Stride: 32
diff --git a/test/Feature/HLSLLib/select.struct.test b/test/Feature/HLSLLib/select.struct.test
index c3aca9850..01bfd2bda 100644
--- a/test/Feature/HLSLLib/select.struct.test
+++ b/test/Feature/HLSLLib/select.struct.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut
     Format: Float32
     Stride: 8
diff --git a/test/Feature/HLSLLib/sign.32.test b/test/Feature/HLSLLib/sign.32.test
index cb10d846b..c625d4e99 100644
--- a/test/Feature/HLSLLib/sign.32.test
+++ b/test/Feature/HLSLLib/sign.32.test
@@ -66,7 +66,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut1 # The result we expect
     Format: Int32
     Stride: 16
@@ -74,7 +74,7 @@ Buffers:
   - Name: Out2
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut2 # The result we expect
     Format: Int32
     Stride: 16
@@ -82,7 +82,7 @@ Buffers:
   - Name: Out3
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut3 # The result we expect
     Format: Int32
     Stride: 16
@@ -90,7 +90,7 @@ Buffers:
   - Name: Out4
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut4
     Format: UInt32
     Stride: 4
diff --git a/test/Feature/HLSLLib/sign.fp16.test b/test/Feature/HLSLLib/sign.fp16.test
index 4ce0c34d0..d5608d2ca 100644
--- a/test/Feature/HLSLLib/sign.fp16.test
+++ b/test/Feature/HLSLLib/sign.fp16.test
@@ -38,15 +38,15 @@ Buffers:
   - Name: In2 # special values where the result might differ based on platform or compiler
     Format: Float16
     Stride: 2
-    Data: [0x7e00, 0xfe00, 0x0001, 0x8001] # nan, -nan, denorm, -denorm 
+    Data: [0x7e00, 0xfe00, 0x0001, 0x8001] # nan, -nan, denorm, -denorm
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: Out2
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut1 # The result we expect
     Format: Int32
     Stride: 16
diff --git a/test/Feature/HLSLLib/sign.fp64.test b/test/Feature/HLSLLib/sign.fp64.test
index d908b0597..b9446e7bd 100644
--- a/test/Feature/HLSLLib/sign.fp64.test
+++ b/test/Feature/HLSLLib/sign.fp64.test
@@ -41,7 +41,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut1 # The result we expect
     Format: Int32
     Stride: 16
@@ -49,7 +49,7 @@ Buffers:
   - Name: Out2
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut2
     Format: UInt32
     Stride: 4
diff --git a/test/Feature/HLSLLib/sign.int16.test b/test/Feature/HLSLLib/sign.int16.test
index 1be5bb796..df5aa07cc 100644
--- a/test/Feature/HLSLLib/sign.int16.test
+++ b/test/Feature/HLSLLib/sign.int16.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut1 # The result we expect
     Format: Int32
     Stride: 16
@@ -47,7 +47,7 @@ Buffers:
   - Name: Out2
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48 
+    FillSize: 48
   - Name: ExpectedOut2 # The result we expect
     Format: Int32
     Stride: 16
diff --git a/test/Feature/HLSLLib/sign.int64.test b/test/Feature/HLSLLib/sign.int64.test
index 7b2e8ab50..1deee7c1d 100644
--- a/test/Feature/HLSLLib/sign.int64.test
+++ b/test/Feature/HLSLLib/sign.int64.test
@@ -39,7 +39,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut1 # The result we expect
     Format: Int32
     Stride: 16
@@ -47,7 +47,7 @@ Buffers:
   - Name: Out2
     Format: Int32
     Stride: 16
-    ZeroInitSize: 48 
+    FillSize: 48
   - Name: ExpectedOut2 # The result we expect
     Format: Int32
     Stride: 16
diff --git a/test/Feature/HLSLLib/sin.16.test b/test/Feature/HLSLLib/sin.16.test
index 98babac1a..1ff9f8520 100644
--- a/test/Feature/HLSLLib/sin.16.test
+++ b/test/Feature/HLSLLib/sin.16.test
@@ -32,7 +32,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 40
+    FillSize: 40
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/sin.32.test b/test/Feature/HLSLLib/sin.32.test
index a3d90306a..3fa57f000 100644
--- a/test/Feature/HLSLLib/sin.32.test
+++ b/test/Feature/HLSLLib/sin.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/sinh.16.test b/test/Feature/HLSLLib/sinh.16.test
index 07b16c2f2..ae834e568 100644
--- a/test/Feature/HLSLLib/sinh.16.test
+++ b/test/Feature/HLSLLib/sinh.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/sinh.32.test b/test/Feature/HLSLLib/sinh.32.test
index 58b86beb5..d38e91b27 100644
--- a/test/Feature/HLSLLib/sinh.32.test
+++ b/test/Feature/HLSLLib/sinh.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/smoothstep.16.test b/test/Feature/HLSLLib/smoothstep.16.test
index 40f35d295..65ca060d1 100644
--- a/test/Feature/HLSLLib/smoothstep.16.test
+++ b/test/Feature/HLSLLib/smoothstep.16.test
@@ -99,7 +99,7 @@ Buffers:
   - Name: Result2D
     Format: Float16
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult2D
     Format: Float16
     Stride: 4
@@ -108,7 +108,7 @@ Buffers:
   - Name: Result3D
     Format: Float16
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult3D
     Format: Float16
     Stride: 8
@@ -117,7 +117,7 @@ Buffers:
   - Name: Result4D
     Format: Float16
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedResult4D
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/smoothstep.32.test b/test/Feature/HLSLLib/smoothstep.32.test
index 0e5340a30..f710c795f 100644
--- a/test/Feature/HLSLLib/smoothstep.32.test
+++ b/test/Feature/HLSLLib/smoothstep.32.test
@@ -90,7 +90,7 @@ Buffers:
   - Name: Result2D
     Format: Float32
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult2D
     Format: Float32
     Stride: 8
@@ -98,7 +98,7 @@ Buffers:
   - Name: Result3D
     Format: Float32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult3D
     Format: Float32
     Stride: 16
@@ -106,7 +106,7 @@ Buffers:
   - Name: Result4D
     Format: Float32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedResult4D
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/sqrt.16.test b/test/Feature/HLSLLib/sqrt.16.test
index 66704c4d9..104a4bd0f 100644
--- a/test/Feature/HLSLLib/sqrt.16.test
+++ b/test/Feature/HLSLLib/sqrt.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/sqrt.32.test b/test/Feature/HLSLLib/sqrt.32.test
index 2aaeabef5..19c5756fd 100644
--- a/test/Feature/HLSLLib/sqrt.32.test
+++ b/test/Feature/HLSLLib/sqrt.32.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/step.16.test b/test/Feature/HLSLLib/step.16.test
index 6223facf6..16636b9df 100644
--- a/test/Feature/HLSLLib/step.16.test
+++ b/test/Feature/HLSLLib/step.16.test
@@ -33,7 +33,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/step.32.test b/test/Feature/HLSLLib/step.32.test
index de450c66f..e5fa52b9d 100644
--- a/test/Feature/HLSLLib/step.32.test
+++ b/test/Feature/HLSLLib/step.32.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/tanh.16.test b/test/Feature/HLSLLib/tanh.16.test
index 013380140..4d0a030cc 100644
--- a/test/Feature/HLSLLib/tanh.16.test
+++ b/test/Feature/HLSLLib/tanh.16.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 24
+    FillSize: 24
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/tanh.32.test b/test/Feature/HLSLLib/tanh.32.test
index b803e8773..7b45e607d 100644
--- a/test/Feature/HLSLLib/tanh.32.test
+++ b/test/Feature/HLSLLib/tanh.32.test
@@ -29,7 +29,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/HLSLLib/trunc.16.test b/test/Feature/HLSLLib/trunc.16.test
index cedc76446..df2be4068 100644
--- a/test/Feature/HLSLLib/trunc.16.test
+++ b/test/Feature/HLSLLib/trunc.16.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/Feature/HLSLLib/trunc.32.test b/test/Feature/HLSLLib/trunc.32.test
index 2673d0bd1..98c36cffd 100644
--- a/test/Feature/HLSLLib/trunc.32.test
+++ b/test/Feature/HLSLLib/trunc.32.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOut # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/Feature/ImplicitBindings/all-implicit.test b/test/Feature/ImplicitBindings/all-implicit.test
index 66b86ca05..808cda345 100644
--- a/test/Feature/ImplicitBindings/all-implicit.test
+++ b/test/Feature/ImplicitBindings/all-implicit.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: BufC
     Format: Int32
     Stride: 4
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: CB
     Format: Int32
     Data: [ 100 ]
diff --git a/test/Feature/ResourceArrays/array-global.test b/test/Feature/ResourceArrays/array-global.test
index 5dc3b336d..bbc07f061 100644
--- a/test/Feature/ResourceArrays/array-global.test
+++ b/test/Feature/ResourceArrays/array-global.test
@@ -48,7 +48,7 @@ Buffers:
   - Name: BufB
     Format: Int32
     ArraySize: 4
-    ZeroInitSize: 32
+    FillSize: 32
 
   - Name: ExpectedBufB
     Format: Int32
@@ -62,7 +62,7 @@ Buffers:
   - Name: BufC
     Format: Int32
     ArraySize: 2
-    ZeroInitSize: 32
+    FillSize: 32
 
   - Name: ExpectedBufC
     Format: Int32
@@ -74,7 +74,7 @@ Buffers:
   - Name: BufD
     Format: Float32
     ArraySize: 2
-    ZeroInitSize: 32
+    FillSize: 32
 
   - Name: ExpectedBufD
     Format: Float32
diff --git a/test/Feature/ResourceArrays/array-local.test b/test/Feature/ResourceArrays/array-local.test
index 0746edfdb..5d78ea462 100644
--- a/test/Feature/ResourceArrays/array-local.test
+++ b/test/Feature/ResourceArrays/array-local.test
@@ -40,7 +40,7 @@ Buffers:
 
   - Name: BufOut
     Format: Float32
-    ZeroInitSize: 32
+    FillSize: 32
 
   - Name: ExpectedOut
     Format: Float32
diff --git a/test/Feature/ResourceArrays/array-local2.test b/test/Feature/ResourceArrays/array-local2.test
index c5d56c673..8967405c2 100644
--- a/test/Feature/ResourceArrays/array-local2.test
+++ b/test/Feature/ResourceArrays/array-local2.test
@@ -30,11 +30,11 @@ Shaders:
 Buffers:
   - Name: BufX
     Format: Int32
-    ZeroInitSize: 16
+    FillSize: 16
 
   - Name: BufY
     Format: Int32
-    ZeroInitSize: 16
+    FillSize: 16
 
   - Name: ExpectedX
     Format: Int32
diff --git a/test/Feature/ResourceArrays/array-of-constant-buffers.test b/test/Feature/ResourceArrays/array-of-constant-buffers.test
index a9cd27638..3418de22c 100644
--- a/test/Feature/ResourceArrays/array-of-constant-buffers.test
+++ b/test/Feature/ResourceArrays/array-of-constant-buffers.test
@@ -35,7 +35,7 @@ Buffers:
   - Name: BufOut
     Format: Int32
     Stride: 16
-    ZeroInitSize: 16
+    FillSize: 16
 
   - Name: ExpectedBufOut
     Format: Int32
diff --git a/test/Feature/ResourceArrays/multi-dim-array-global.test b/test/Feature/ResourceArrays/multi-dim-array-global.test
index 123195ad0..cb4f5820b 100644
--- a/test/Feature/ResourceArrays/multi-dim-array-global.test
+++ b/test/Feature/ResourceArrays/multi-dim-array-global.test
@@ -35,7 +35,7 @@ Buffers:
   - Name: BufOut
     Format: Int32
     ArraySize: 6
-    ZeroInitSize: 16
+    FillSize: 16
 
   - Name: ExpectedBufOut
     Format: Int32
diff --git a/test/Feature/ResourceArrays/multi-dim-array-local.test b/test/Feature/ResourceArrays/multi-dim-array-local.test
index 153c4c4cb..1be42933e 100644
--- a/test/Feature/ResourceArrays/multi-dim-array-local.test
+++ b/test/Feature/ResourceArrays/multi-dim-array-local.test
@@ -43,7 +43,7 @@ Buffers:
 
   - Name: BufOut
     Format: Float32
-    ZeroInitSize: 32
+    FillSize: 32
 
   - Name: ExpectedOut
     Format: Float32
diff --git a/test/Feature/ResourceArrays/multi-dim-array-subset-nuri.test b/test/Feature/ResourceArrays/multi-dim-array-subset-nuri.test
index 302dbc8f7..87a9e24a4 100644
--- a/test/Feature/ResourceArrays/multi-dim-array-subset-nuri.test
+++ b/test/Feature/ResourceArrays/multi-dim-array-subset-nuri.test
@@ -37,7 +37,7 @@ Buffers:
 
   - Name: BufOut
     Format: Float32
-    ZeroInitSize: 16
+    FillSize: 16
 
   - Name: ExpectedOut
     Format: Float32
diff --git a/test/Feature/RootSignatures/Defaults.test b/test/Feature/RootSignatures/Defaults.test
index 9dfbd62d6..fa4666516 100644
--- a/test/Feature/RootSignatures/Defaults.test
+++ b/test/Feature/RootSignatures/Defaults.test
@@ -62,11 +62,11 @@ Buffers:
   - Name: Out1
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Out2
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/RootSignatures/DescriptorTables.test b/test/Feature/RootSignatures/DescriptorTables.test
index 5a277afc8..e31d491a1 100644
--- a/test/Feature/RootSignatures/DescriptorTables.test
+++ b/test/Feature/RootSignatures/DescriptorTables.test
@@ -29,11 +29,11 @@ Buffers:
   - Name: Out1
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Out2
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/RootSignatures/Flags.test b/test/Feature/RootSignatures/Flags.test
index 60e265fd0..0823f6311 100644
--- a/test/Feature/RootSignatures/Flags.test
+++ b/test/Feature/RootSignatures/Flags.test
@@ -62,11 +62,11 @@ Buffers:
   - Name: Out1
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Out2
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/RootSignatures/ManualDescriptors.test b/test/Feature/RootSignatures/ManualDescriptors.test
index 022baad2e..42cf5c4d3 100644
--- a/test/Feature/RootSignatures/ManualDescriptors.test
+++ b/test/Feature/RootSignatures/ManualDescriptors.test
@@ -58,11 +58,11 @@ Buffers:
   - Name: Out1
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Out2
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/RootSignatures/NumberParameters.test b/test/Feature/RootSignatures/NumberParameters.test
index cdad4e1fc..354422afb 100644
--- a/test/Feature/RootSignatures/NumberParameters.test
+++ b/test/Feature/RootSignatures/NumberParameters.test
@@ -67,11 +67,11 @@ Buffers:
   - Name: Out1
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Out2
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/RootSignatures/ParameterInsensitivity.test b/test/Feature/RootSignatures/ParameterInsensitivity.test
index 9ee9aab60..9dff4e1d9 100644
--- a/test/Feature/RootSignatures/ParameterInsensitivity.test
+++ b/test/Feature/RootSignatures/ParameterInsensitivity.test
@@ -59,7 +59,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/RootSignatures/RootConstants.test b/test/Feature/RootSignatures/RootConstants.test
index c6b5c5072..0639ba514 100644
--- a/test/Feature/RootSignatures/RootConstants.test
+++ b/test/Feature/RootSignatures/RootConstants.test
@@ -40,7 +40,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/RootSignatures/RootDescriptorAndTables.test b/test/Feature/RootSignatures/RootDescriptorAndTables.test
index 26420b756..09c597f05 100644
--- a/test/Feature/RootSignatures/RootDescriptorAndTables.test
+++ b/test/Feature/RootSignatures/RootDescriptorAndTables.test
@@ -50,7 +50,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/RootSignatures/RootDescriptors.test b/test/Feature/RootSignatures/RootDescriptors.test
index d2d94f0bc..c65e25fdb 100644
--- a/test/Feature/RootSignatures/RootDescriptors.test
+++ b/test/Feature/RootSignatures/RootDescriptors.test
@@ -53,7 +53,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets: []
 ...
 #--- end
diff --git a/test/Feature/RootSignatures/StaticSamplers.test b/test/Feature/RootSignatures/StaticSamplers.test
index b375883e4..635be1bc9 100644
--- a/test/Feature/RootSignatures/StaticSamplers.test
+++ b/test/Feature/RootSignatures/StaticSamplers.test
@@ -56,7 +56,7 @@ Buffers:
   - Name: DefaultOut
     Format: Float32
     Channels: 4
-    ZeroInitSize: 64
+    FillSize: 64
     OutputProps:
       Height: 2
       Width: 2
@@ -64,7 +64,7 @@ Buffers:
   - Name: SpecifiedOut
     Format: Float32
     Channels: 4
-    ZeroInitSize: 64
+    FillSize: 64
     OutputProps:
       Height: 2
       Width: 2
diff --git a/test/Feature/RootSignatures/TwoDescriptorTables.test b/test/Feature/RootSignatures/TwoDescriptorTables.test
index e6ef374ae..b3b554306 100644
--- a/test/Feature/RootSignatures/TwoDescriptorTables.test
+++ b/test/Feature/RootSignatures/TwoDescriptorTables.test
@@ -29,11 +29,11 @@ Buffers:
   - Name: Out1
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Out2
     Format: Float32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/StructuredBuffer/GetDimensions.test b/test/Feature/StructuredBuffer/GetDimensions.test
index ac0b6151a..91eccd31d 100644
--- a/test/Feature/StructuredBuffer/GetDimensions.test
+++ b/test/Feature/StructuredBuffer/GetDimensions.test
@@ -74,7 +74,7 @@ Buffers:
 
   - Name: Out
     Format: Int32
-    ZeroInitSize: 32
+    FillSize: 32
 
   - Name: ExpectedOut
     Format: Int32
diff --git a/test/Feature/StructuredBuffer/dec_counter.test b/test/Feature/StructuredBuffer/dec_counter.test
index 49662533b..24889237b 100644
--- a/test/Feature/StructuredBuffer/dec_counter.test
+++ b/test/Feature/StructuredBuffer/dec_counter.test
@@ -19,7 +19,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 4
-    ZeroInitSize: 4
+    FillSize: 4
 DescriptorSets:
   - Resources:
     - Name: Out
diff --git a/test/Feature/StructuredBuffer/inc_counter.test b/test/Feature/StructuredBuffer/inc_counter.test
index fbfe111dd..2b1ab16fd 100644
--- a/test/Feature/StructuredBuffer/inc_counter.test
+++ b/test/Feature/StructuredBuffer/inc_counter.test
@@ -19,7 +19,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 4
-    ZeroInitSize: 4
+    FillSize: 4
 DescriptorSets:
   - Resources:
     - Name: Out
diff --git a/test/Feature/StructuredBuffer/inc_counter_array.test b/test/Feature/StructuredBuffer/inc_counter_array.test
index fb4d036d4..c9f7b7367 100644
--- a/test/Feature/StructuredBuffer/inc_counter_array.test
+++ b/test/Feature/StructuredBuffer/inc_counter_array.test
@@ -24,7 +24,7 @@ Buffers:
     Format: Hex32
     Stride: 4
     ArraySize: 4
-    ZeroInitSize: 4
+    FillSize: 4
 
 DescriptorSets:
   - Resources:
diff --git a/test/Feature/StructuredBuffer/inc_counter_array_imm_idx.test b/test/Feature/StructuredBuffer/inc_counter_array_imm_idx.test
index a1381ff6d..5d5545369 100644
--- a/test/Feature/StructuredBuffer/inc_counter_array_imm_idx.test
+++ b/test/Feature/StructuredBuffer/inc_counter_array_imm_idx.test
@@ -33,7 +33,7 @@ Buffers:
     Format: Hex32
     Stride: 4
     ArraySize: 4
-    ZeroInitSize: 4
+    FillSize: 4
 
 DescriptorSets:
   - Resources:
diff --git a/test/Feature/StructuredBuffer/layout.test b/test/Feature/StructuredBuffer/layout.test
index 9a0ef80cf..fe0530e7d 100644
--- a/test/Feature/StructuredBuffer/layout.test
+++ b/test/Feature/StructuredBuffer/layout.test
@@ -45,15 +45,15 @@ Buffers:
   - Name: BufA
     Format: Float32
     Stride: 12
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: BufB
     Format: Float32
     Stride: 12
-    ZeroInitSize: 48
+    FillSize: 48
   - Name: BufC
     Format: Float32
     Stride: 12
-    ZeroInitSize: 48
+    FillSize: 48
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/StructuredBuffer/simple.test b/test/Feature/StructuredBuffer/simple.test
index d20fbd716..e043c5c9b 100644
--- a/test/Feature/StructuredBuffer/simple.test
+++ b/test/Feature/StructuredBuffer/simple.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 32
-    ZeroInitSize: 32
+    FillSize: 32
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/StructuredBuffer/srv.test b/test/Feature/StructuredBuffer/srv.test
index f731ca5b8..0ac224fd8 100644
--- a/test/Feature/StructuredBuffer/srv.test
+++ b/test/Feature/StructuredBuffer/srv.test
@@ -24,7 +24,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 16
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/StructuredBuffer/stride.test b/test/Feature/StructuredBuffer/stride.test
index e839bcb0a..17a7ae8ad 100644
--- a/test/Feature/StructuredBuffer/stride.test
+++ b/test/Feature/StructuredBuffer/stride.test
@@ -24,7 +24,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Stride: 16
-    ZeroInitSize: 32
+    FillSize: 32
 DescriptorSets:
   - Resources:
     - Name: In
diff --git a/test/Feature/Textures/SRVToUAV-array.test b/test/Feature/Textures/SRVToUAV-array.test
index 3573bbc1f..296f7a594 100644
--- a/test/Feature/Textures/SRVToUAV-array.test
+++ b/test/Feature/Textures/SRVToUAV-array.test
@@ -40,7 +40,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 64
+    FillSize: 64
     ArraySize: 2
     OutputProps:
       Height: 2
diff --git a/test/Feature/Textures/SRVToUAV.test.yaml b/test/Feature/Textures/SRVToUAV.test.yaml
index f9fe72f35..80c024cc7 100644
--- a/test/Feature/Textures/SRVToUAV.test.yaml
+++ b/test/Feature/Textures/SRVToUAV.test.yaml
@@ -30,7 +30,7 @@ Buffers:
   - Name: Out
     Format: Float32
     Channels: 4
-    ZeroInitSize: 64
+    FillSize: 64
     OutputProps:
       Height: 2
       Width: 2
diff --git a/test/Feature/TypedBuffer/GetDimensions.test b/test/Feature/TypedBuffer/GetDimensions.test
index ae577f26a..54a2c2514 100644
--- a/test/Feature/TypedBuffer/GetDimensions.test
+++ b/test/Feature/TypedBuffer/GetDimensions.test
@@ -39,7 +39,7 @@ Buffers:
 
   - Name: Out
     Format: Int32
-    ZeroInitSize: 8
+    FillSize: 8
 
   - Name: ExpectedOut
     Format: Int32
diff --git a/test/Feature/WaveOps/WaveActiveAllTrue.test b/test/Feature/WaveOps/WaveActiveAllTrue.test
index 4f8518476..b38d6de01 100644
--- a/test/Feature/WaveOps/WaveActiveAllTrue.test
+++ b/test/Feature/WaveOps/WaveActiveAllTrue.test
@@ -34,7 +34,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: UInt32
     Stride: 4
diff --git a/test/Feature/WaveOps/WaveActiveAnyTrue.test b/test/Feature/WaveOps/WaveActiveAnyTrue.test
index 07af08c1d..019599923 100644
--- a/test/Feature/WaveOps/WaveActiveAnyTrue.test
+++ b/test/Feature/WaveOps/WaveActiveAnyTrue.test
@@ -33,7 +33,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: UInt32
     Stride: 4
diff --git a/test/Feature/WaveOps/WaveActiveCountBits.test b/test/Feature/WaveOps/WaveActiveCountBits.test
index a8e289c92..a816064b7 100644
--- a/test/Feature/WaveOps/WaveActiveCountBits.test
+++ b/test/Feature/WaveOps/WaveActiveCountBits.test
@@ -35,7 +35,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 28
+    FillSize: 28
   - Name: ExpectedOut
     Format: UInt32
     Stride: 4
diff --git a/test/Feature/WaveOps/WaveGetLaneIndex.test b/test/Feature/WaveOps/WaveGetLaneIndex.test
index 4efa3752c..c523fe72c 100644
--- a/test/Feature/WaveOps/WaveGetLaneIndex.test
+++ b/test/Feature/WaveOps/WaveGetLaneIndex.test
@@ -17,7 +17,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: UInt32
     Stride: 4
diff --git a/test/Feature/WaveOps/WaveIsFirstLane.test b/test/Feature/WaveOps/WaveIsFirstLane.test
index b3d4ec097..1176d8b78 100644
--- a/test/Feature/WaveOps/WaveIsFirstLane.test
+++ b/test/Feature/WaveOps/WaveIsFirstLane.test
@@ -36,7 +36,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Stride: 4
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut
     Format: UInt32
     Stride: 4
diff --git a/test/Graphics/SimpleTriangle.test b/test/Graphics/SimpleTriangle.test
index 179906bde..93ab7424b 100644
--- a/test/Graphics/SimpleTriangle.test
+++ b/test/Graphics/SimpleTriangle.test
@@ -44,7 +44,7 @@ Buffers:
   - Name: Output
     Format: Float32
     Channels: 4
-    ZeroInitSize: 1048576 # 256x256 @ 16 bytes per pixel
+    FillSize: 1048576 # 256x256 @ 16 bytes per pixel
     OutputProps:
       Height: 256
       Width: 256
diff --git a/test/Tools/Offloader/BufferExact-error-array.test b/test/Tools/Offloader/BufferExact-error-array.test
index e7c934747..7d38b5db2 100644
--- a/test/Tools/Offloader/BufferExact-error-array.test
+++ b/test/Tools/Offloader/BufferExact-error-array.test
@@ -20,7 +20,7 @@ Buffers:
   - Name: OutArray
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
     ArraySize: 2
   - Name: ExpectedOutArray
     Format: Int32
diff --git a/test/Tools/Offloader/BufferExact-error.test b/test/Tools/Offloader/BufferExact-error.test
index 306f8a76b..4e975a199 100644
--- a/test/Tools/Offloader/BufferExact-error.test
+++ b/test/Tools/Offloader/BufferExact-error.test
@@ -21,7 +21,7 @@ Buffers:
   - Name: Out
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Expected1
     Format: Int32
     Stride: 4
diff --git a/test/Tools/Offloader/BufferExact.test b/test/Tools/Offloader/BufferExact.test
index 1bdda6ad2..2da32816b 100644
--- a/test/Tools/Offloader/BufferExact.test
+++ b/test/Tools/Offloader/BufferExact.test
@@ -24,7 +24,7 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Expected1
     Format: Int32
     Stride: 4
@@ -32,7 +32,7 @@ Buffers:
   - Name: Out2
     Format: Float32
     Stride: 4
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: Expected2
     Format: Float32
     Stride: 4
diff --git a/test/Tools/Offloader/BufferFloat-16bit.test b/test/Tools/Offloader/BufferFloat-16bit.test
index 8e36e5f12..5867aab02 100644
--- a/test/Tools/Offloader/BufferFloat-16bit.test
+++ b/test/Tools/Offloader/BufferFloat-16bit.test
@@ -26,7 +26,7 @@ Buffers:
   - Name: Out1
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected1
     Format: Float16
     Stride: 2
@@ -34,7 +34,7 @@ Buffers:
   - Name: Out2
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected2
     Format: Float16
     Stride: 2
@@ -42,7 +42,7 @@ Buffers:
   - Name: Out3
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected3
     Format: Float16
     Stride: 2
@@ -50,7 +50,7 @@ Buffers:
   - Name: Out4
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected4
     Format: Float16
     Stride: 2
@@ -58,7 +58,7 @@ Buffers:
   - Name: Out5
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected5
     Format: Float16
     Stride: 2
diff --git a/test/Tools/Offloader/BufferFloat-64bit.test b/test/Tools/Offloader/BufferFloat-64bit.test
index 31d1713d0..d702b536e 100644
--- a/test/Tools/Offloader/BufferFloat-64bit.test
+++ b/test/Tools/Offloader/BufferFloat-64bit.test
@@ -24,7 +24,7 @@ Buffers:
   - Name: Out1
     Format: Float64
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: Expected1
     Format: Float64
     Stride: 8
@@ -32,7 +32,7 @@ Buffers:
   - Name: Out2
     Format: Float64
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: Expected2
     Format: Float64
     Stride: 8
@@ -40,7 +40,7 @@ Buffers:
   - Name: Out3
     Format: Float64
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: Expected3
     Format: Float64
     Stride: 8
@@ -48,7 +48,7 @@ Buffers:
   - Name: Out4
     Format: Float64
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: Expected4
     Format: Float64
     Stride: 8
diff --git a/test/Tools/Offloader/BufferFloat-error-16bit.test b/test/Tools/Offloader/BufferFloat-error-16bit.test
index bcb027be3..e688f6597 100644
--- a/test/Tools/Offloader/BufferFloat-error-16bit.test
+++ b/test/Tools/Offloader/BufferFloat-error-16bit.test
@@ -21,7 +21,7 @@ Buffers:
   - Name: Out1
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected1
     Format: Float16
     Stride: 2
@@ -29,7 +29,7 @@ Buffers:
   - Name: Out2
     Format: Float16
     Stride: 2
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected2
     Format: Float16
     Stride: 2
diff --git a/test/Tools/Offloader/BufferFloat-error-64bit.test b/test/Tools/Offloader/BufferFloat-error-64bit.test
index 5f7094bab..f4650ac12 100644
--- a/test/Tools/Offloader/BufferFloat-error-64bit.test
+++ b/test/Tools/Offloader/BufferFloat-error-64bit.test
@@ -23,7 +23,7 @@ Buffers:
   - Name: Out1
     Format: Float64
     Stride: 8
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: Expected1
     Format: Float64
     Stride: 8
@@ -31,11 +31,11 @@ Buffers:
   - Name: Out2
     Format: Float64
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: Out3
     Format: Float64
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: Expected2
     Format: Float64
     Stride: 8
diff --git a/test/Tools/Offloader/BufferFloat-error.test b/test/Tools/Offloader/BufferFloat-error.test
index d161ee333..9476f52e4 100644
--- a/test/Tools/Offloader/BufferFloat-error.test
+++ b/test/Tools/Offloader/BufferFloat-error.test
@@ -21,7 +21,7 @@ Buffers:
   - Name: Out1
     Format: Float32
     Stride: 4
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: Expected1
     Format: Float32
     Stride: 4
@@ -29,7 +29,7 @@ Buffers:
   - Name: Out2
     Format: Float32
     Stride: 4
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected2
     Format: Float32
     Stride: 4
diff --git a/test/Tools/Offloader/BufferFloat.test b/test/Tools/Offloader/BufferFloat.test
index 4ad999df0..d7ec59c00 100644
--- a/test/Tools/Offloader/BufferFloat.test
+++ b/test/Tools/Offloader/BufferFloat.test
@@ -24,7 +24,7 @@ Buffers:
   - Name: Out1
     Format: Float32
     Stride: 4
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected1
     Format: Float32
     Stride: 4
@@ -32,7 +32,7 @@ Buffers:
   - Name: Out2
     Format: Float32
     Stride: 4
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected2
     Format: Float32
     Stride: 4
@@ -40,7 +40,7 @@ Buffers:
   - Name: Out3
     Format: Float32
     Stride: 4
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected3
     Format: Float32
     Stride: 4
@@ -48,7 +48,7 @@ Buffers:
   - Name: Out4
     Format: Float32
     Stride: 4
-    ZeroInitSize: 4
+    FillSize: 4
   - Name: Expected4
     Format: Float32
     Stride: 4
diff --git a/test/Tools/Offloader/array-in-root-descriptor.test b/test/Tools/Offloader/array-in-root-descriptor.test
index d4f9dedd6..7ad0fd31b 100644
--- a/test/Tools/Offloader/array-in-root-descriptor.test
+++ b/test/Tools/Offloader/array-in-root-descriptor.test
@@ -31,7 +31,7 @@ Buffers:
   - Name: BufArray
     Format: Int32
     ArraySize: 2
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: BufArray
diff --git a/test/Tools/Offloader/missing-counter-binding.test b/test/Tools/Offloader/missing-counter-binding.test
index dda3a268b..a26f56c90 100644
--- a/test/Tools/Offloader/missing-counter-binding.test
+++ b/test/Tools/Offloader/missing-counter-binding.test
@@ -17,7 +17,7 @@ Buffers:
   - Name: Out
     Format: Hex32
     Stride: 4
-    ZeroInitSize: 4
+    FillSize: 4
 DescriptorSets:
   - Resources:
     - Name: Out
diff --git a/test/UseCase/particle-life.test b/test/UseCase/particle-life.test
index a8793abe4..6a09e9f81 100644
--- a/test/UseCase/particle-life.test
+++ b/test/UseCase/particle-life.test
@@ -220,7 +220,7 @@ Buffers:
   - Name: NewParticles
     Format: Float32
     Stride: 20
-    ZeroInitSize: 640
+    FillSize: 640
   - Name: ExpectedParticles
     Format: Float32
     Stride: 20
@@ -261,7 +261,7 @@ Buffers:
   - Name: Vertices
     Format: Float32
     Stride: 12
-    ZeroInitSize: 384
+    FillSize: 384
   - Name: ExpectedVertices
     Format: Float32
     Stride: 20
diff --git a/test/WaveOps/ComponentAccumulationDataRace.test b/test/WaveOps/ComponentAccumulationDataRace.test
index 555acc17a..e273978d0 100644
--- a/test/WaveOps/ComponentAccumulationDataRace.test
+++ b/test/WaveOps/ComponentAccumulationDataRace.test
@@ -37,7 +37,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut
     Format: UInt32
     Channels: 4
diff --git a/test/WaveOps/ComponentDataRace.test b/test/WaveOps/ComponentDataRace.test
index b8904cb0a..3225f3bed 100644
--- a/test/WaveOps/ComponentDataRace.test
+++ b/test/WaveOps/ComponentDataRace.test
@@ -28,7 +28,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Channels: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut
     Format: UInt32
     Channels: 4
diff --git a/test/WaveOps/GSFlag.test b/test/WaveOps/GSFlag.test
index b7b51c922..a8009d2c4 100644
--- a/test/WaveOps/GSFlag.test
+++ b/test/WaveOps/GSFlag.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: Output
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
 DescriptorSets:
   - Resources:
     - Name: Output
diff --git a/test/WaveOps/GroupMemoryBarrierWithGroupSync.test b/test/WaveOps/GroupMemoryBarrierWithGroupSync.test
index 1dc8b3f38..ffae8d2f8 100644
--- a/test/WaveOps/GroupMemoryBarrierWithGroupSync.test
+++ b/test/WaveOps/GroupMemoryBarrierWithGroupSync.test
@@ -51,7 +51,7 @@ Buffers:
   - Name: Out
     Format: UInt32
     Channels: 1
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: ExpectedOut
     Format: UInt32
     Channels: 1
diff --git a/test/WaveOps/WaveActiveSum.fp16.test b/test/WaveOps/WaveActiveSum.fp16.test
index be7f1d039..e306203f4 100644
--- a/test/WaveOps/WaveActiveSum.fp16.test
+++ b/test/WaveOps/WaveActiveSum.fp16.test
@@ -62,23 +62,23 @@ Buffers:
   - Name: Out1
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32  
+    FillSize: 32  
   - Name: Out2
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: Out3
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: Out4
     Format: Float16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: Out5
     Format: Float16
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: ExpectedOut1
     Format: Float16
     Stride: 8
diff --git a/test/WaveOps/WaveActiveSum.fp32.test b/test/WaveOps/WaveActiveSum.fp32.test
index a6d509848..0e53d7bd0 100644
--- a/test/WaveOps/WaveActiveSum.fp32.test
+++ b/test/WaveOps/WaveActiveSum.fp32.test
@@ -62,23 +62,23 @@ Buffers:
   - Name: Out1
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64  
+    FillSize: 64  
   - Name: Out2
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: Out3
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: Out4
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: Out5
     Format: Float32
     Stride: 16
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut1
     Format: Float32
     Stride: 16
@@ -173,4 +173,4 @@ DescriptorSets:
 
 # RUN: split-file %s %t
 # RUN: %dxc_target -T cs_6_5 -Fo %t.o %t/source.hlsl
-# RUN: %offloader %t/pipeline.yaml %t.o 
+# RUN: %offloader %t/pipeline.yaml %t.o
diff --git a/test/WaveOps/WaveActiveSum.fp64.test b/test/WaveOps/WaveActiveSum.fp64.test
index 7cce755d5..10cefcbc6 100644
--- a/test/WaveOps/WaveActiveSum.fp64.test
+++ b/test/WaveOps/WaveActiveSum.fp64.test
@@ -62,23 +62,23 @@ Buffers:
   - Name: Out1
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128  
+    FillSize: 128  
   - Name: Out2
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: Out3
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: Out4
     Format: Float64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: Out5
     Format: Float64
     Stride: 32
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: Float64
     Stride: 32
diff --git a/test/WaveOps/WaveActiveSum.int16.test b/test/WaveOps/WaveActiveSum.int16.test
index a3f7b0f25..3be398b54 100644
--- a/test/WaveOps/WaveActiveSum.int16.test
+++ b/test/WaveOps/WaveActiveSum.int16.test
@@ -108,23 +108,23 @@ Buffers:
   - Name: Out1
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32  
+    FillSize: 32  
   - Name: Out2
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: Out3
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: Out4
     Format: Int16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: Out5
     Format: Int16
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: ExpectedOut1
     Format: Int16
     Stride: 8
@@ -152,23 +152,23 @@ Buffers:
   - Name: UOut1
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32  
+    FillSize: 32  
   - Name: UOut2
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: UOut3
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: UOut4
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: UOut5
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 8
+    FillSize: 8
   - Name: UExpectedOut1
     Format: UInt16
     Stride: 8
diff --git a/test/WaveOps/WaveActiveSum.int32.test b/test/WaveOps/WaveActiveSum.int32.test
index 513f1baf8..1532ec518 100644
--- a/test/WaveOps/WaveActiveSum.int32.test
+++ b/test/WaveOps/WaveActiveSum.int32.test
@@ -107,23 +107,23 @@ Buffers:
   - Name: Out1
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64  
+    FillSize: 64  
   - Name: Out2
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: Out3
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: Out4
     Format: Int32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: Out5
     Format: Int32
     Stride: 16
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOut1
     Format: Int32
     Stride: 16
@@ -151,23 +151,23 @@ Buffers:
   - Name: UOut1
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64 
+    FillSize: 64 
   - Name: UOut2
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: UOut3
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: UOut4
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: UOut5
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: UExpectedOut1
     Format: UInt32
     Stride: 16
diff --git a/test/WaveOps/WaveActiveSum.int64.test b/test/WaveOps/WaveActiveSum.int64.test
index 52d780149..eec48746d 100644
--- a/test/WaveOps/WaveActiveSum.int64.test
+++ b/test/WaveOps/WaveActiveSum.int64.test
@@ -108,23 +108,23 @@ Buffers:
   - Name: Out1
     Format: Int64
     Stride: 32
-    ZeroInitSize: 128  
+    FillSize: 128  
   - Name: Out2
     Format: Int64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: Out3
     Format: Int64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: Out4
     Format: Int64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: Out5
     Format: Int64
     Stride: 32
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: ExpectedOut1
     Format: Int64
     Stride: 32
@@ -152,23 +152,23 @@ Buffers:
   - Name: UOut1
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 128  
+    FillSize: 128  
   - Name: UOut2
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: UOut3
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: UOut4
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 128
+    FillSize: 128
   - Name: UOut5
     Format: UInt64
     Stride: 32
-    ZeroInitSize: 32
+    FillSize: 32
   - Name: UExpectedOut1
     Format: UInt64
     Stride: 32
diff --git a/test/WaveOps/WaveReadLaneAt.16.test b/test/WaveOps/WaveReadLaneAt.16.test
index a2189d208..8e536f54b 100644
--- a/test/WaveOps/WaveReadLaneAt.16.test
+++ b/test/WaveOps/WaveReadLaneAt.16.test
@@ -47,7 +47,7 @@ Buffers:
   - Name: OutInt
     Format: Int16
     Stride: 8
-    ZeroInitSize: 72
+    FillSize: 72
   - Name: ExpectedOutInt # The result we expect
     Format: Int16
     Stride: 8
@@ -59,7 +59,7 @@ Buffers:
   - Name: OutUInt
     Format: UInt16
     Stride: 8
-    ZeroInitSize: 72
+    FillSize: 72
   - Name: ExpectedOutUInt # The result we expect
     Format: UInt16
     Stride: 8
@@ -71,7 +71,7 @@ Buffers:
   - Name: OutFloat
     Format: Float16
     Stride: 8
-    ZeroInitSize: 72
+    FillSize: 72
   - Name: ExpectedOutFloat # The result we expect
     Format: Float16
     Stride: 8
diff --git a/test/WaveOps/WaveReadLaneAt.32.test b/test/WaveOps/WaveReadLaneAt.32.test
index 8de27ca07..efc3793d8 100644
--- a/test/WaveOps/WaveReadLaneAt.32.test
+++ b/test/WaveOps/WaveReadLaneAt.32.test
@@ -54,7 +54,7 @@ Buffers:
   - Name: OutInt
     Format: Int32
     Stride: 16
-    ZeroInitSize: 144
+    FillSize: 144
   - Name: ExpectedOutInt # The result we expect
     Format: Int32
     Stride: 16
@@ -66,7 +66,7 @@ Buffers:
   - Name: OutUInt
     Format: UInt32
     Stride: 16
-    ZeroInitSize: 144
+    FillSize: 144
   - Name: ExpectedOutUInt # The result we expect
     Format: UInt32
     Stride: 16
@@ -78,7 +78,7 @@ Buffers:
   - Name: OutFloat
     Format: Float32
     Stride: 16
-    ZeroInitSize: 144
+    FillSize: 144
   - Name: ExpectedOutFloat # The result we expect
     Format: Float32
     Stride: 16
@@ -90,7 +90,7 @@ Buffers:
   - Name: OutEdgeFloat
     Format: Float32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOutEdgeFloat # The result we expect
     Format: Float32
     Stride: 4
diff --git a/test/WaveOps/WaveReadLaneAt.Bool.test b/test/WaveOps/WaveReadLaneAt.Bool.test
index 67d1d5e62..62ce833fe 100644
--- a/test/WaveOps/WaveReadLaneAt.Bool.test
+++ b/test/WaveOps/WaveReadLaneAt.Bool.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: OutBool
     Format: Bool
     Stride: 16
-    ZeroInitSize: 144
+    FillSize: 144
   - Name: ExpectedOutBool # The result we expect
     Format: Bool
     Stride: 16
diff --git a/test/WaveOps/WaveReadLaneAt.Float.64.test b/test/WaveOps/WaveReadLaneAt.Float.64.test
index caae81445..1f12dd222 100644
--- a/test/WaveOps/WaveReadLaneAt.Float.64.test
+++ b/test/WaveOps/WaveReadLaneAt.Float.64.test
@@ -30,7 +30,7 @@ Buffers:
   - Name: OutFloat
     Format: Float64
     Stride: 16
-    ZeroInitSize: 288
+    FillSize: 288
   - Name: ExpectedOutFloat # The result we expect
     Format: Float64
     Stride: 16
diff --git a/test/WaveOps/WaveReadLaneAt.Int.64.test b/test/WaveOps/WaveReadLaneAt.Int.64.test
index fe50d97f1..ddf4dcbe0 100644
--- a/test/WaveOps/WaveReadLaneAt.Int.64.test
+++ b/test/WaveOps/WaveReadLaneAt.Int.64.test
@@ -38,7 +38,7 @@ Buffers:
   - Name: OutInt
     Format: Int64
     Stride: 16
-    ZeroInitSize: 288
+    FillSize: 288
   - Name: ExpectedOutInt # The result we expect
     Format: Int64
     Stride: 16
@@ -50,7 +50,7 @@ Buffers:
   - Name: OutUInt
     Format: UInt64
     Stride: 16
-    ZeroInitSize: 288
+    FillSize: 288
   - Name: ExpectedOutUInt # The result we expect
     Format: UInt64
     Stride: 16
diff --git a/test/WaveOps/WaveReadLaneAt.divergent.test b/test/WaveOps/WaveReadLaneAt.divergent.test
index 65b60e52d..93f029cae 100644
--- a/test/WaveOps/WaveReadLaneAt.divergent.test
+++ b/test/WaveOps/WaveReadLaneAt.divergent.test
@@ -35,7 +35,7 @@ Buffers:
   - Name: OutInt
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOutInt
     Format: Int32
     Stride: 4
diff --git a/test/WaveOps/WaveReadLaneAt.index.test b/test/WaveOps/WaveReadLaneAt.index.test
index 4c2027b9f..e36b394fe 100644
--- a/test/WaveOps/WaveReadLaneAt.index.test
+++ b/test/WaveOps/WaveReadLaneAt.index.test
@@ -48,7 +48,7 @@ Buffers:
   - Name: OutBroadcast
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOutBroadcast # The result we expect
     Format: Int32
     Stride: 4
@@ -56,7 +56,7 @@ Buffers:
   - Name: OutShift
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOutShift # The result we expect
     Format: Int32
     Stride: 4
@@ -64,7 +64,7 @@ Buffers:
   - Name: OutMix
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOutMix # The result we expect
     Format: Int32
     Stride: 4
diff --git a/test/WaveOps/WaveReadLaneAt.mtx.test b/test/WaveOps/WaveReadLaneAt.mtx.test
index e8526e527..eb8048d43 100644
--- a/test/WaveOps/WaveReadLaneAt.mtx.test
+++ b/test/WaveOps/WaveReadLaneAt.mtx.test
@@ -29,7 +29,7 @@ Buffers:
   - Name: OutMatrix
     Format: Float32
     Stride: 16
-    ZeroInitSize: 64
+    FillSize: 64
   - Name: ExpectedOutMatrix # The result we expect
     Format: Float32
     Stride: 16
diff --git a/test/WaveOps/WaveReadLaneAt.udt.test b/test/WaveOps/WaveReadLaneAt.udt.test
index 902493381..832b89141 100644
--- a/test/WaveOps/WaveReadLaneAt.udt.test
+++ b/test/WaveOps/WaveReadLaneAt.udt.test
@@ -30,11 +30,11 @@ Buffers:
   - Name: OutInt
     Format: Int32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: OutFloat
     Format: Float32
     Stride: 4
-    ZeroInitSize: 16
+    FillSize: 16
   - Name: ExpectedOutInt # The result we expect
     Format: Int32
     Stride: 4