diff --git a/devito/xdsl_core/xdsl_gpu.py b/devito/xdsl_core/xdsl_gpu.py
index 41bd08e084..9f281015b3 100644
--- a/devito/xdsl_core/xdsl_gpu.py
+++ b/devito/xdsl_core/xdsl_gpu.py
@@ -140,7 +140,7 @@ def _jit_compile(self):
 
 def generate_XDSL_GPU_PIPELINE():
     passes = [
-        "stencil-shape-inference",
+        "shape-inference",
         "convert-stencil-to-ll-mlir",
         "reconcile-unrealized-casts",
         "printf-to-llvm",
diff --git a/tests/filecheck/.lit_test_times.txt b/tests/filecheck/.lit_test_times.txt
index 4d1f2a8c89..84be361be3 100644
--- a/tests/filecheck/.lit_test_times.txt
+++ b/tests/filecheck/.lit_test_times.txt
@@ -1,9 +1,9 @@
--8.160377e-02 shape_inference.mlir
-8.171344e-02 version.mlir
--1.473970e-01 xdsl_mpi_pipeline.mlir
--1.490667e-01 xdsl_mpi_pipeline_b.mlir
--1.464252e-01 xdsl_mpi_pipeline_c.mlir
--1.516540e-01 xdsl_mpi_pipeline_d.mlir
--1.704619e-01 xdsl_mpi_pipeline_e.mlir
--1.000817e-01 xdsl_pipeline.mlir
--1.596556e-01 xdsl_pipeline_openmp.mlir
+1.627717e-01 shape_inference.mlir
+9.103966e-02 version.mlir
+-1.920681e-01 xdsl_mpi_pipeline.mlir
+-1.922677e-01 xdsl_mpi_pipeline_b.mlir
+-1.886339e-01 xdsl_mpi_pipeline_c.mlir
+-2.020643e-01 xdsl_mpi_pipeline_d.mlir
+-2.121959e-01 xdsl_mpi_pipeline_e.mlir
+-2.791779e-01 xdsl_pipeline.mlir
+-1.644087e-01 xdsl_pipeline_openmp.mlir
diff --git a/tests/filecheck/shape_inference.mlir b/tests/filecheck/shape_inference.mlir
index 77194b9944..764541d970 100644
--- a/tests/filecheck/shape_inference.mlir
+++ b/tests/filecheck/shape_inference.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p stencil-shape-inference %s | filecheck %s
+// RUN: xdsl-opt -p shape-inference %s | filecheck %s
 
 builtin.module {
   func.func @Kernel(%f2_vec0 : !stencil.field<[-2,5]x[-2,5]xf32>, %f2_vec1 : !stencil.field<[-2,5]x[-2,5]xf32>, %timers : !llvm.ptr) {
@@ -64,7 +64,7 @@ builtin.module {
         %47 = arith.mulf %46, %dt_1 : f32
         stencil.return %47 : f32
       }
-      %f2_t1_temp_1 = stencil.store %f2_t1_temp to %f2_t1 ([0, 0] : [3, 3]) : !stencil.temp<?x?xf32> to !stencil.field<[-2,5]x[-2,5]xf32> with_halo : !stencil.temp<?x?xf32>
+      stencil.store %f2_t1_temp to %f2_t1(<[0, 0], [3, 3]>)  : !stencil.temp<?x?xf32> to !stencil.field<[-2,5]x[-2,5]xf32>
       scf.yield %f2_t1, %f2_t0 : !stencil.field<[-2,5]x[-2,5]xf32>, !stencil.field<[-2,5]x[-2,5]xf32>
     }
     %5 = func.call @timer_end(%0) : (f64) -> f64
@@ -139,7 +139,7 @@ builtin.module {
 // CHECK-NEXT:          %47 = arith.mulf %46, %dt_1 : f32
 // CHECK-NEXT:          stencil.return %47 : f32
 // CHECK-NEXT:        }
-// CHECK-NEXT:        %f2_t1_temp_1 = stencil.store %f2_t1_temp to %f2_t1 ([0, 0] : [3, 3]) : !stencil.temp<[0,3]x[0,3]xf32> to !stencil.field<[-2,5]x[-2,5]xf32> with_halo : !stencil.temp<?x?xf32>
+// CHECK-NEXT:        stencil.store %f2_t1_temp to %f2_t1(<[0, 0], [3, 3]>)  : !stencil.temp<[0,3]x[0,3]xf32> to !stencil.field<[-2,5]x[-2,5]xf32>
 // CHECK-NEXT:        scf.yield %f2_t1, %f2_t0 : !stencil.field<[-2,5]x[-2,5]xf32>, !stencil.field<[-2,5]x[-2,5]xf32>
 // CHECK-NEXT:      }
 // CHECK-NEXT:      %5 = func.call @timer_end(%0) : (f64) -> f64
diff --git a/tests/filecheck/xdsl_mpi_pipeline.mlir b/tests/filecheck/xdsl_mpi_pipeline.mlir
index c651e5a984..d4c986a0b1 100644
--- a/tests/filecheck/xdsl_mpi_pipeline.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline.mlir
@@ -94,7 +94,7 @@ builtin.module {
         %73 = arith.mulf %7, %72 : f32
         stencil.return %73 : f32
       }
-      %u_t1_temp_1 = stencil.store %u_t1_temp to %u_t1 ([0, 0, 0] : [51, 101, 101]) : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32> with_halo : !stencil.temp<?x?x?xf32>
+      stencil.store %u_t1_temp to %u_t1(<[0, 0, 0], [51, 101, 101]>)  : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
       scf.yield %u_t1, %u_t2, %u_t0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
     }
     %6 = func.call @timer_end(%0) : (f64) -> f64
@@ -202,7 +202,7 @@ builtin.module {
 // CHECK-NEXT:          %73 = arith.mulf %7, %72 : f32
 // CHECK-NEXT:          stencil.return %73 : f32
 // CHECK-NEXT:        }
-// CHECK-NEXT:        %u_t1_temp_1 = stencil.store %u_t1_temp to %u_t1 ([0, 0, 0] : [51, 101, 101]) : !stencil.temp<[0,51]x[0,101]x[0,101]xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32> with_halo : !stencil.temp<?x?x?xf32>
+// CHECK-NEXT:        stencil.store %u_t1_temp to %u_t1(<[0, 0, 0], [51, 101, 101]>)  : !stencil.temp<[0,51]x[0,101]x[0,101]xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
 // CHECK-NEXT:        scf.yield %u_t1, %u_t2, %u_t0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
 // CHECK-NEXT:      }
 // CHECK-NEXT:      %6 = func.call @timer_end(%0) : (f64) -> f64
diff --git a/tests/filecheck/xdsl_mpi_pipeline_b.mlir b/tests/filecheck/xdsl_mpi_pipeline_b.mlir
index 035c313aa2..b27625d132 100644
--- a/tests/filecheck/xdsl_mpi_pipeline_b.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline_b.mlir
@@ -94,7 +94,7 @@ builtin.module {
         %73 = arith.mulf %7, %72 : f32
         stencil.return %73 : f32
       }
-      %u_t1_temp_1 = stencil.store %u_t1_temp to %u_t1 ([0, 0, 0] : [51, 101, 101]) : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32> with_halo : !stencil.temp<?x?x?xf32>
+      stencil.store %u_t1_temp to %u_t1(<[0, 0, 0], [51, 101, 101]>)  : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
       scf.yield %u_t1, %u_t2, %u_t0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
     }
     %6 = func.call @timer_end(%0) : (f64) -> f64
@@ -201,7 +201,7 @@ builtin.module {
 // CHECK-NEXT:          %73 = arith.mulf %7, %72 : f32
 // CHECK-NEXT:          stencil.return %73 : f32
 // CHECK-NEXT:        }
-// CHECK-NEXT:        %u_t1_temp_1 = stencil.store %u_t1_temp to %u_t1 ([0, 0, 0] : [51, 101, 101]) : !stencil.temp<[0,51]x[0,101]x[0,101]xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32> with_halo : !stencil.temp<?x?x?xf32>
+// CHECK-NEXT:        stencil.store %u_t1_temp to %u_t1(<[0, 0, 0], [51, 101, 101]>)  : !stencil.temp<[0,51]x[0,101]x[0,101]xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
 // CHECK-NEXT:        scf.yield %u_t1, %u_t2, %u_t0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
 // CHECK-NEXT:      }
 // CHECK-NEXT:      %6 = func.call @timer_end(%0) : (f64) -> f64
diff --git a/tests/filecheck/xdsl_mpi_pipeline_c.mlir b/tests/filecheck/xdsl_mpi_pipeline_c.mlir
index d4eca46f97..93ba65c468 100644
--- a/tests/filecheck/xdsl_mpi_pipeline_c.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline_c.mlir
@@ -94,7 +94,7 @@ builtin.module {
         %73 = arith.mulf %7, %72 : f32
         stencil.return %73 : f32
       }
-      %u_t1_temp_1 = stencil.store %u_t1_temp to %u_t1 ([0, 0, 0] : [51, 101, 101]) : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32> with_halo : !stencil.temp<?x?x?xf32>
+      stencil.store %u_t1_temp to %u_t1(<[0, 0, 0], [51, 101, 101]>)  : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
       scf.yield %u_t1, %u_t2, %u_t0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
     }
     %6 = func.call @timer_end(%0) : (f64) -> f64
diff --git a/tests/filecheck/xdsl_mpi_pipeline_d.mlir b/tests/filecheck/xdsl_mpi_pipeline_d.mlir
index 08f3f92b2f..b02f1d4baf 100644
--- a/tests/filecheck/xdsl_mpi_pipeline_d.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline_d.mlir
@@ -94,7 +94,7 @@ builtin.module {
         %73 = arith.mulf %7, %72 : f32
         stencil.return %73 : f32
       }
-      %u_t1_temp_1 = stencil.store %u_t1_temp to %u_t1 ([0, 0, 0] : [51, 101, 101]) : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32> with_halo : !stencil.temp<?x?x?xf32>
+      stencil.store %u_t1_temp to %u_t1(<[0, 0, 0], [51, 101, 101]>)  : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
       scf.yield %u_t1, %u_t2, %u_t0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
     }
     %6 = func.call @timer_end(%0) : (f64) -> f64
diff --git a/tests/filecheck/xdsl_mpi_pipeline_e.mlir b/tests/filecheck/xdsl_mpi_pipeline_e.mlir
index 82793b8062..3c230e1125 100644
--- a/tests/filecheck/xdsl_mpi_pipeline_e.mlir
+++ b/tests/filecheck/xdsl_mpi_pipeline_e.mlir
@@ -94,7 +94,7 @@ builtin.module {
         %73 = arith.mulf %7, %72 : f32
         stencil.return %73 : f32
       }
-      %u_t1_temp_1 = stencil.store %u_t1_temp to %u_t1 ([0, 0, 0] : [51, 101, 101]) : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32> with_halo : !stencil.temp<?x?x?xf32>
+      stencil.store %u_t1_temp to %u_t1(<[0, 0, 0], [51, 101, 101]>)  : !stencil.temp<?x?x?xf32> to !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
       scf.yield %u_t1, %u_t2, %u_t0 : !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>, !stencil.field<[-2,53]x[-2,103]x[-2,103]xf32>
     }
     %6 = func.call @timer_end(%0) : (f64) -> f64
diff --git a/tests/filecheck/xdsl_pipeline.mlir b/tests/filecheck/xdsl_pipeline.mlir
index 5243a3ca7c..726f57e097 100644
--- a/tests/filecheck/xdsl_pipeline.mlir
+++ b/tests/filecheck/xdsl_pipeline.mlir
@@ -1,4 +1,4 @@
-// RUN: xdsl-opt -p stencil-shape-inference,convert-stencil-to-ll-mlir,scf-parallel-loop-tiling{parallel-loop-tile-sizes=64,0},printf-to-llvm,canonicalize %s | filecheck %s
+// RUN: xdsl-opt -p shape-inference,convert-stencil-to-ll-mlir,scf-parallel-loop-tiling{parallel-loop-tile-sizes=64,0},printf-to-llvm,canonicalize %s | filecheck %s
 
 builtin.module {
   func.func @Kernel(%f2_vec0 : !stencil.field<[-2,5]x[-2,5]xf32>, %f2_vec1 : !stencil.field<[-2,5]x[-2,5]xf32>, %timers : !llvm.ptr) {
@@ -64,7 +64,7 @@ builtin.module {
         %47 = arith.mulf %46, %dt_1 : f32
         stencil.return %47 : f32
       }
-      %f2_t1_temp_1 = stencil.store %f2_t1_temp to %f2_t1 ([0, 0] : [3, 3]) : !stencil.temp<?x?xf32> to !stencil.field<[-2,5]x[-2,5]xf32> with_halo : !stencil.temp<?x?xf32>
+      stencil.store %f2_t1_temp to %f2_t1(<[0, 0], [3, 3]>)  : !stencil.temp<?x?xf32> to !stencil.field<[-2,5]x[-2,5]xf32>
       scf.yield %f2_t1, %f2_t0 : !stencil.field<[-2,5]x[-2,5]xf32>, !stencil.field<[-2,5]x[-2,5]xf32>
     }
     %5 = func.call @timer_end(%0) : (f64) -> f64