diff --git a/model/css-rdinfra-ports.awk b/model/css-rdinfra-ports.awk
index 908af60..4829a76 100644
--- a/model/css-rdinfra-ports.awk
+++ b/model/css-rdinfra-ports.awk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2020, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2022, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-/terminal_s0/ { ports[0] = $NF }
-/terminal_s1/ { ports[1] = $NF }
+/terminal_uart1_ap/ { ports[0] = $NF }
+/terminal_uart_ap/ { ports[1] = $NF }
 
 # SCP uart window title
 /terminal_uart_aon/ { uart_aon[$NF]++ }
diff --git a/model/css-sgi575-ports.awk b/model/css-sgi575-ports.awk
index 4a59a46..953f34f 100644
--- a/model/css-sgi575-ports.awk
+++ b/model/css-sgi575-ports.awk
@@ -1,11 +1,11 @@
 #
-# Copyright (c) 2019-2020 Arm Limited. All rights reserved.
+# Copyright (c) 2019-2022 Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
-/terminal_s0/ { ports[0] = $NF }
-/terminal_s1/ { ports[1] = $NF }
+/terminal_uart1_ap/ { ports[0] = $NF }
+/terminal_uart_ap/ { ports[1] = $NF }
 /terminal_uart_aon/ { ports[2] = $NF }
 END {
 	for (i = 0; i < num_uarts; i++) {