[#59524] ArmGicRedistributorRegistration: Rename arguments
diff --git a/platforms/cpus/cortex-a53-gicv3.repl b/platforms/cpus/cortex-a53-gicv3.repl
index 89b16d3..c1b2e12 100644
--- a/platforms/cpus/cortex-a53-gicv3.repl
+++ b/platforms/cpus/cortex-a53-gicv3.repl
@@ -12,7 +12,7 @@
 
 gic: IRQControllers.ARM_GenericInterruptController @ {
         sysbus new Bus.BusMultiRegistration { address: 0x8000000; size: 0x010000; region: "distributor" };
-        sysbus new IRQControllers.ArmGicRedistributorRegistration { address: 0x80a0000; cpu: cpu }
+        sysbus new IRQControllers.ArmGicRedistributorRegistration { attachedCPU: cpu; address: 0x80a0000 }
     }
     [0-1] -> cpu@[0-1]
     architectureVersion: IRQControllers.ARM_GenericInterruptControllerVersion.GICv3
diff --git a/platforms/cpus/cortex-a78.repl b/platforms/cpus/cortex-a78.repl
index cb302a0..007c998 100644
--- a/platforms/cpus/cortex-a78.repl
+++ b/platforms/cpus/cortex-a78.repl
@@ -12,7 +12,7 @@
 
 gic: IRQControllers.ARM_GenericInterruptController @ {
         sysbus new Bus.BusMultiRegistration { address: 0x8000000; size: 0x010000; region: "distributor" };
-        sysbus new IRQControllers.ArmGicRedistributorRegistration { address: 0x80a0000; cpu: cpu }
+        sysbus new IRQControllers.ArmGicRedistributorRegistration { attachedCPU: cpu; address: 0x80a0000 }
     }
     [0-1] -> cpu@[0-1]
     architectureVersion: IRQControllers.ARM_GenericInterruptControllerVersion.GICv4
diff --git a/platforms/cpus/cortex-r52.repl b/platforms/cpus/cortex-r52.repl
index 20d7f26..9a6927c 100644
--- a/platforms/cpus/cortex-r52.repl
+++ b/platforms/cpus/cortex-r52.repl
@@ -5,7 +5,7 @@
 
 gic: IRQControllers.ARM_GenericInterruptController @ {
         sysbus new Bus.BusMultiRegistration { address: 0xAF000000; size: 0x10000; region: "distributor" };
-        sysbus new IRQControllers.ArmGicRedistributorRegistration { address: 0xAF100000; cpu: cpu }
+        sysbus new IRQControllers.ArmGicRedistributorRegistration { attachedCPU: cpu; address: 0xAF100000 }
     }
     [0-3] -> cpu@[0-3]
     supportsTwoSecurityStates: false
diff --git a/platforms/cpus/cortex-r52_smp.repl b/platforms/cpus/cortex-r52_smp.repl
index 15081eb..3d5d14a 100644
--- a/platforms/cpus/cortex-r52_smp.repl
+++ b/platforms/cpus/cortex-r52_smp.repl
@@ -7,8 +7,8 @@
 
 gic: @ {
         sysbus new Bus.BusMultiRegistration { address: 0xAF000000; size: 0x10000; region: "distributor" };
-        sysbus new IRQControllers.ArmGicRedistributorRegistration { address: 0xAF100000; cpu: cpu };
-        sysbus new IRQControllers.ArmGicRedistributorRegistration { address: 0xAF120000; cpu: cpu1 }
+        sysbus new IRQControllers.ArmGicRedistributorRegistration { attachedCPU: cpu;  address: 0xAF100000 };
+        sysbus new IRQControllers.ArmGicRedistributorRegistration { attachedCPU: cpu1; address: 0xAF120000 }
     }
     [4-7] -> cpu1@[0-3]
 
diff --git a/platforms/cpus/renesas_rz_t2m.repl b/platforms/cpus/renesas_rz_t2m.repl
index 70d3cc8..3e6a97a 100644
--- a/platforms/cpus/renesas_rz_t2m.repl
+++ b/platforms/cpus/renesas_rz_t2m.repl
@@ -4,7 +4,7 @@
 
 gic: IRQControllers.ARM_GenericInterruptController @ {
         sysbus new Bus.BusMultiRegistration { address: 0x94000000; size: 0x10000; region: "distributor" };
-        sysbus new IRQControllers.ArmGicRedistributorRegistration { address: 0x94100000; cpu: cpu }
+        sysbus new IRQControllers.ArmGicRedistributorRegistration { attachedCPU: cpu; address: 0x94100000 }
     }
     [0,1] -> cpu@[0,1]
     supportsTwoSecurityStates: false
diff --git a/src/Infrastructure b/src/Infrastructure
index d99df0b..3387046 160000
--- a/src/Infrastructure
+++ b/src/Infrastructure
@@ -1 +1 @@
-Subproject commit d99df0b09f46389b61f647de974668c8a9e672d4
+Subproject commit 338704699c70666eb1938e041c8b05faff4703bc
diff --git a/tests/unit-tests/ARMv8R_TCM.robot b/tests/unit-tests/ARMv8R_TCM.robot
index e728175..67e982d 100644
--- a/tests/unit-tests/ARMv8R_TCM.robot
+++ b/tests/unit-tests/ARMv8R_TCM.robot
@@ -18,7 +18,7 @@
 ...
 ...                                 gic: IRQControllers.ARM_GenericInterruptController @ {
 ...                                 ${SPACE*4}${SPACE*4}sysbus new Bus.BusMultiRegistration { address: 0x6E00000; size: 0x10000; region: \"distributor\" };
-...                                 ${SPACE*4}${SPACE*4}sysbus new IRQControllers.ArmGicRedistributorRegistration { address: 0x6E10000; cpu: cpu }
+...                                 ${SPACE*4}${SPACE*4}sysbus new IRQControllers.ArmGicRedistributorRegistration { attachedCPU: cpu; address: 0x6E10000 }
 ...                                 ${SPACE*4}}
 ...                                 ${SPACE*4}\[0-1] -> cpu@[0-1]
 ...                                 ${SPACE*4}supportsTwoSecurityStates: false
diff --git a/tools/dts2repl b/tools/dts2repl
index a5048fc..8dbb947 160000
--- a/tools/dts2repl
+++ b/tools/dts2repl
@@ -1 +1 @@
-Subproject commit a5048fcbb662b44138ee3c3089a0fda78a20b5ca
+Subproject commit 8dbb9472db1ddf65b77d7c22e152fca3c6fe5915