diff --git a/model/css-rde1edge.sh b/model/css-rde1edge.sh
index 7b0dbd2..580f1f3 100644
--- a/model/css-rde1edge.sh
+++ b/model/css-rde1edge.sh
@@ -8,16 +8,16 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/11.17/29/models/$model_flavour/FVP_RD_E1_edge"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_0.start_port=5000
--C board.terminal_1.start_port=5001
--C css.mcp.terminal_uart0.start_port=5002
--C css.mcp.terminal_uart1.start_port=5003
--C css.scp.terminal_uart_aon.start_port=5004
--C css.terminal_uart1_ap.start_port=5005
--C css.terminal_uart_ap.start_port=5006
+-C css.scp.terminal_uart_aon.start_port=5000
+-C css.mcp.terminal_uart0.start_port=5001
+-C css.mcp.terminal_uart1.start_port=5002
+-C css.terminal_uart_ap.start_port=5003
+-C css.terminal_uart1_ap.start_port=5004
+-C soc.terminal_s0.start_port=5005
+-C soc.terminal_s1.start_port=5006
 -C soc.terminal_mcp.start_port=5007
--C soc.terminal_s0.start_port=5008
--C soc.terminal_s1.start_port=5009
+-C board.terminal_0.start_port=5008
+-C board.terminal_1.start_port=5009
 
 -C board.flashloader0.fname=$fip_bin
 -C css.cmn600.force_rnsam_internal=false
diff --git a/model/css-rdn1edge.sh b/model/css-rdn1edge.sh
index 6402ba8..fde5089 100644
--- a/model/css-rdn1edge.sh
+++ b/model/css-rdn1edge.sh
@@ -8,16 +8,16 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_RD_N1_edge"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_0.start_port=5000
--C board.terminal_1.start_port=5001
--C css.mcp.terminal_uart0.start_port=5002
--C css.mcp.terminal_uart1.start_port=5003
--C css.scp.terminal_uart_aon.start_port=5004
--C css.terminal_uart1_ap.start_port=5005
--C css.terminal_uart_ap.start_port=5006
+-C css.scp.terminal_uart_aon.start_port=5000
+-C css.mcp.terminal_uart0.start_port=5001
+-C css.mcp.terminal_uart1.start_port=5002
+-C css.terminal_uart_ap.start_port=5003
+-C css.terminal_uart1_ap.start_port=5004
+-C soc.terminal_s0.start_port=5005
+-C soc.terminal_s1.start_port=5006
 -C soc.terminal_mcp.start_port=5007
--C soc.terminal_s0.start_port=5008
--C soc.terminal_s1.start_port=5009
+-C board.terminal_0.start_port=5008
+-C board.terminal_1.start_port=5009
 
 -C board.flashloader0.fname=$fip_bin
 -C board.virtioblockdevice.image_path=$busybox_bin
diff --git a/model/css-rdn1edgex2.sh b/model/css-rdn1edgex2.sh
index 62e1919..9fdfe38 100644
--- a/model/css-rdn1edgex2.sh
+++ b/model/css-rdn1edgex2.sh
@@ -8,26 +8,26 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_RD_N1_edge_dual"
 
 cat <<EOF >"$model_param_file"
--C board0.terminal_0.start_port=5000
--C board0.terminal_1.start_port=5001
--C board1.terminal_0.start_port=5002
--C board1.terminal_1.start_port=5003
--C css0.mcp.terminal_uart0.start_port=5004
--C css0.mcp.terminal_uart1.start_port=5005
--C css0.scp.terminal_uart_aon.start_port=5006
--C css0.terminal_uart1_ap.start_port=5007
--C css0.terminal_uart_ap.start_port=5008
--C css1.mcp.terminal_uart0.start_port=5009
--C css1.mcp.terminal_uart1.start_port=5010
--C css1.scp.terminal_uart_aon.start_port=5011
--C css1.terminal_uart1_ap.start_port=5012
--C css1.terminal_uart_ap.start_port=5013
--C soc0.terminal_mcp.start_port=5014
--C soc0.terminal_s0.start_port=5015
--C soc0.terminal_s1.start_port=5016
+-C css0.scp.terminal_uart_aon.start_port=5000
+-C css0.mcp.terminal_uart0.start_port=5001
+-C css0.mcp.terminal_uart1.start_port=5002
+-C css0.terminal_uart_ap.start_port=5003
+-C css0.terminal_uart1_ap.start_port=5004
+-C css1.scp.terminal_uart_aon.start_port=5005
+-C css1.mcp.terminal_uart0.start_port=5006
+-C css1.mcp.terminal_uart1.start_port=5007
+-C css1.terminal_uart_ap.start_port=5008
+-C css1.terminal_uart1_ap.start_port=5009
+-C soc0.terminal_s0.start_port=5010
+-C soc0.terminal_s1.start_port=5011
+-C soc0.terminal_mcp.start_port=5012
+-C board0.terminal_0.start_port=5013
+-C board0.terminal_1.start_port=5014
+-C soc1.terminal_s0.start_port=5015
+-C soc1.terminal_s1.start_port=5016
 -C soc1.terminal_mcp.start_port=5017
--C soc1.terminal_s0.start_port=5018
--C soc1.terminal_s1.start_port=5019
+-C board1.terminal_0.start_port=5018
+-C board1.terminal_1.start_port=5019
 
 -C board0.flashloader0.fname=$fip_bin
 -C board0.virtioblockdevice.image_path=$busybox_bin
diff --git a/model/css-rdv1.sh b/model/css-rdv1.sh
index c8fdf44..c7a79ab 100644
--- a/model/css-rdv1.sh
+++ b/model/css-rdv1.sh
@@ -8,16 +8,16 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/11.17/29/models/$model_flavour/FVP_RD_V1"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_0.start_port=5000
--C board.terminal_1.start_port=5001
--C css.mcp.terminal_uart0.start_port=5002
--C css.mcp.terminal_uart1.start_port=5003
--C css.scp.terminal_uart_aon.start_port=5004
--C css.terminal_uart1_ap.start_port=5005
--C css.terminal_uart_ap.start_port=5006
+-C css.scp.terminal_uart_aon.start_port=5000
+-C css.mcp.terminal_uart0.start_port=5001
+-C css.mcp.terminal_uart1.start_port=5002
+-C css.terminal_uart_ap.start_port=5003
+-C css.terminal_uart1_ap.start_port=5004
+-C soc.terminal_s0.start_port=5005
+-C soc.terminal_s1.start_port=5006
 -C soc.terminal_mcp.start_port=5007
--C soc.terminal_s0.start_port=5008
--C soc.terminal_s1.start_port=5009
+-C board.terminal_0.start_port=5008
+-C board.terminal_1.start_port=5009
 
 -C board.flashloader0.fname=$fip_bin
 -C board.virtioblockdevice.image_path=$busybox_bin
diff --git a/model/css-sgi575.sh b/model/css-sgi575.sh
index f6521f2..06c278b 100644
--- a/model/css-sgi575.sh
+++ b/model/css-sgi575.sh
@@ -8,16 +8,16 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/11.15/26/models/Linux64_GCC-6.4/FVP_CSS_SGI-575"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_0.start_port=5000
--C board.terminal_1.start_port=5001
--C css.mcp.terminal_uart0.start_port=5002
--C css.mcp.terminal_uart1.start_port=5003
--C css.scp.terminal_uart_aon.start_port=5004
--C css.terminal_uart1_ap.start_port=5005
--C css.terminal_uart_ap.start_port=5006
+-C css.scp.terminal_uart_aon.start_port=5000
+-C css.mcp.terminal_uart0.start_port=5001
+-C css.mcp.terminal_uart1.start_port=5002
+-C css.terminal_uart_ap.start_port=5003
+-C css.terminal_uart1_ap.start_port=5004
+-C soc.terminal_s0.start_port=5005
+-C soc.terminal_s1.start_port=5006
 -C soc.terminal_mcp.start_port=5007
--C soc.terminal_s0.start_port=5008
--C soc.terminal_s1.start_port=5009
+-C board.terminal_0.start_port=5008
+-C board.terminal_1.start_port=5009
 
 -C board.flashloader0.fname=$fip_bin
 -C board.virtioblockdevice.image_path=$busybox_bin
diff --git a/model/morello.sh b/model/morello.sh
index c68c540..eb41d93 100644
--- a/model/morello.sh
+++ b/model/morello.sh
@@ -9,13 +9,14 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/$model_version/$model_build/models/$model_flavour/FVP_Morello"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_uart0_board.start_port=5000
--C board.terminal_uart1_board.start_port=5001
--C css.mcp.terminal_uart0.start_port=5002
--C css.mcp.terminal_uart1.start_port=5003
--C css.scp.terminal_uart_aon.start_port=5004
--C css.terminal_uart1_ap.start_port=5005
--C css.terminal_uart_ap.start_port=5006
+-C css.scp.terminal_uart_aon.start_port=5000
+-C css.mcp.terminal_uart0.start_port=5001
+-C css.mcp.terminal_uart1.start_port=5002
+-C css.terminal_uart_ap.start_port=5003
+-C css.terminal_uart1_ap.start_port=5004
+-C css.terminal_sec_uart_ap.start_port=5005
+-C board.terminal_uart0_board.start_port=5006
+-C board.terminal_uart1_board.start_port=5007
 
 --data Morello_Top.css.scp.armcortexm7ct=$scp_rom_bin@0x0
 --data Morello_Top.css.mcp.armcortexm7ct=$mcp_rom_bin@0x0
diff --git a/model/tc0.sh b/model/tc0.sh
index 59db4d3..415ebd9 100644
--- a/model/tc0.sh
+++ b/model/tc0.sh
@@ -8,12 +8,12 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/11.17/18/models/$model_flavour/FVP_TC0"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_0.start_port=5000
--C board.terminal_1.start_port=5001
--C css.terminal_uart1_ap.start_port=5002
--C css.terminal_uart_ap.start_port=5003
--C soc.terminal_s0.start_port=5004
--C soc.terminal_s1.start_port=5005
+-C css.terminal_uart_ap.start_port=5000
+-C css.terminal_uart1_ap.start_port=5001
+-C soc.terminal_s0.start_port=5002
+-C soc.terminal_s1.start_port=5003
+-C board.terminal_0.start_port=5004
+-C board.terminal_1.start_port=5005
 
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
 ${scp_rom_bin+-C css.scp.ROMloader.fname=$scp_rom_bin}
diff --git a/model/tc1.sh b/model/tc1.sh
index 89fa456..0bb1b1d 100644
--- a/model/tc1.sh
+++ b/model/tc1.sh
@@ -8,12 +8,12 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/11.17/33/models/$model_flavour/FVP_TC1"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_0.start_port=5000
--C board.terminal_1.start_port=5001
--C css.terminal_uart1_ap.start_port=5002
--C css.terminal_uart_ap.start_port=5003
--C soc.terminal_s0.start_port=5004
--C soc.terminal_s1.start_port=5005
+-C css.terminal_uart_ap.start_port=5000
+-C css.terminal_uart1_ap.start_port=5001
+-C soc.terminal_s0.start_port=5002
+-C soc.terminal_s1.start_port=5003
+-C board.terminal_0.start_port=5004
+-C board.terminal_1.start_port=5005
 
 ${bl1_bin+-C css.trustedBootROMloader.fname=$bl1_bin}
 ${scp_rom_bin+-C css.scp.ROMloader.fname=$scp_rom_bin}
diff --git a/model/tc2.sh b/model/tc2.sh
index 21202bf..588d36c 100644
--- a/model/tc2.sh
+++ b/model/tc2.sh
@@ -8,12 +8,12 @@
 set_model_path "$warehouse/SysGen/SubSystemModels/11.18/28/models/$model_flavour/FVP_TC2"
 
 cat <<EOF >"$model_param_file"
--C board.terminal_0.start_port=5000
--C board.terminal_1.start_port=5001
--C css.terminal_uart1_ap.start_port=5002
--C css.terminal_uart_ap.start_port=5003
--C soc.terminal_s0.start_port=5004
--C soc.terminal_s1.start_port=5005
+-C css.terminal_uart_ap.start_port=5000
+-C css.terminal_uart1_ap.start_port=5001
+-C soc.terminal_s0.start_port=5002
+-C soc.terminal_s1.start_port=5003
+-C board.terminal_0.start_port=5004
+-C board.terminal_1.start_port=5005
 
 ${fip_bin+-C board.flashloader0.fname=$fip_bin}
 ${initrd_bin+--data board.dram=$initrd_bin@${initrd_addr:?}}