diff --git a/tests/filecheck/dialects/aie/device_op.mlir b/tests/filecheck/dialects/aie/device_op.mlir
index 09da1e7..3529876 100644
--- a/tests/filecheck/dialects/aie/device_op.mlir
+++ b/tests/filecheck/dialects/aie/device_op.mlir
@@ -72,40 +72,40 @@ aie.device(npu2) {
 // CHECK-NEXT: }
 
 // CHECK-GENERIC:      "builtin.module"() ({
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 1 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 1 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 2 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 2 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 3 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 3 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 4 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 4 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 5 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 5 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 6 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 6 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 7 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 7 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 8 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 8 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 9 : i32}> ({
-// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{{{["]?}}value{{["]?}} = 1 : i32}> : () -> i32
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 9 : i32}> ({
+// CHECK-GENERIC-NEXT:     %{{.*}} = "arith.constant"() <{value = 1 : i32}> : () -> i32
 // CHECK-GENERIC-NEXT:     "aie.end"() : () -> ()
 // CHECK-GENERIC-NEXT:   }) : () -> ()
 // CHECK-GENERIC-NEXT: }) : () -> ()
diff --git a/tests/filecheck/dialects/aie/ops.mlir b/tests/filecheck/dialects/aie/ops.mlir
index 358aec9..fc51b02 100644
--- a/tests/filecheck/dialects/aie/ops.mlir
+++ b/tests/filecheck/dialects/aie/ops.mlir
@@ -10,7 +10,7 @@ aie.device(npu1) {
 // CHECK-NEXT:   aie.device(npu1) {
 
 // CHECK-GENERIC:      "builtin.module"() ({
-// CHECK-GENERIC-NEXT:   "aie.device"() <{{{["]?}}device{{["]?}} = 4 : i32}> ({
+// CHECK-GENERIC-NEXT:   "aie.device"() <{device = 4 : i32}> ({
 
 
 %1 = aie.tile(0, 1)
@@ -21,36 +21,36 @@ aie.device(npu1) {
 // CHECK-NEXT:     %{{.*}} = aie.tile(0, 2)
 
 
-// CHECK-GENERIC-NEXT:     %{{.*}} = "aie.tile"() <{{{["]?}}col{{["]?}} = 0 : i32, {{["]?}}row{{["]?}} = 1 : i32}> : () -> index
-// CHECK-GENERIC-NEXT:     %{{.*}} = "aie.tile"() <{{{["]?}}col{{["]?}} = 0 : i32, {{["]?}}row{{["]?}} = 2 : i32}> : () -> index
+// CHECK-GENERIC-NEXT:     %{{.*}} = "aie.tile"() <{col = 0 : i32, row = 1 : i32}> : () -> index
+// CHECK-GENERIC-NEXT:     %{{.*}} = "aie.tile"() <{col = 0 : i32, row = 2 : i32}> : () -> index
 
 
 aie.objectfifo @of1 (%1, { %2 }, 4 : i32) : !aie.objectfifo<memref<16xi32>>
 
 // CHECK-NEXT:     aie.objectfifo @of1(%{{.*}}, {%{{.*}}}, 4 : i32) : !aie.objectfifo<memref<16xi32>>
   
-// CHECK-GENERIC-NEXT:     "aie.objectfifo"(%0, %1) <{{{["]?}}dimensionsFromStreamPerConsumer{{["]?}} = #aie<bd_dim_layout_array_array[[]]>, {{["]?}}dimensionsToStream{{["]?}} = #aie<bd_dim_layout_array[]>, {{["]?}}disable_synchronization{{["]?}} = false, {{["]?}}elemNumber{{["]?}} = 4 : i32, {{["]?}}elemType{{["]?}} = !aie.objectfifo<memref<16xi32>>, {{["]?}}plio{{["]?}} = false, {{["]?}}sym_name{{["]?}} = "of1", {{["]?}}via_DMA{{["]?}} = false}> : (index, index) -> ()
+// CHECK-GENERIC-NEXT:     "aie.objectfifo"(%0, %1) <{dimensionsFromStreamPerConsumer = #aie<bd_dim_layout_array_array[[]]>, dimensionsToStream = #aie<bd_dim_layout_array[]>, disable_synchronization = false, elemNumber = 4 : i32, elemType = !aie.objectfifo<memref<16xi32>>, plio = false, sym_name = "of1", via_DMA = false}> : (index, index) -> ()
 
 
 %3 = aie.core(%2) {
 
 // CHECK-NEXT: %{{.*}} = aie.core(%{{.*}}) {
-// CHECK-GENERIC-NEXT: %{{.*}} = "aie.core"(%{{.*}}) <{{{["]?}}stack_size{{["]?}} = 1024 : i32}> ({
+// CHECK-GENERIC-NEXT: %{{.*}} = "aie.core"(%{{.*}}) <{stack_size = 1024 : i32}> ({
 
 %4 = aie.objectfifo.acquire @of1(Consume, 1) : !aie.objectfifosubview<memref<16xi32>>
 
 // CHECK-NEXT: %{{.*}} = aie.objectfifo.acquire @of1(Consume, 1) : !aie.objectfifosubview<memref<16xi32>>
-// CHECK-GENERIC-NEXT: %{{.*}} = "aie.objectfifo.acquire"() <{{{["]?}}objFifo_name{{["]?}} = @of1, {{["]?}}port{{["]?}} = 1 : i32, {{["]?}}size{{["]?}} = 1 : i32}> : () -> !aie.objectfifosubview<memref<16xi32>>
+// CHECK-GENERIC-NEXT: %{{.*}} = "aie.objectfifo.acquire"() <{objFifo_name = @of1, port = 1 : i32, size = 1 : i32}> : () -> !aie.objectfifosubview<memref<16xi32>>
 
 %5 = aie.objectfifo.subview.access %4[0] : !aie.objectfifosubview<memref<16xi32>> -> memref<16xi32>
 
 // CHECK-NEXT: %{{.*}} = aie.objectfifo.subview.access %{{.*}}[0] : !aie.objectfifosubview<memref<16xi32>> -> memref<16xi32>
-// CHECK-GENERIC-NEXT: %{{.*}} = "aie.objectfifo.subview.access"(%3) <{{{["]?}}index{{["]?}} = 0 : i32}> : (!aie.objectfifosubview<memref<16xi32>>) -> memref<16xi32>
+// CHECK-GENERIC-NEXT: %{{.*}} = "aie.objectfifo.subview.access"(%3) <{index = 0 : i32}> : (!aie.objectfifosubview<memref<16xi32>>) -> memref<16xi32>
 
 aie.objectfifo.release @of1(Consume, 1)
 
 // CHECK-NEXT: aie.objectfifo.release @of1(Consume, 1)
-// CHECK-GENERIC-NEXT: "aie.objectfifo.release"() <{{{["]?}}objFifo_name{{["]?}} = @of1, {{["]?}}port{{["]?}} = 1 : i32, {{["]?}}size{{["]?}} = 1 : i32}> : () -> ()
+// CHECK-GENERIC-NEXT: "aie.objectfifo.release"() <{objFifo_name = @of1, port = 1 : i32, size = 1 : i32}> : () -> ()
 
 aie.end