From c78c0801392e149f6675592a48aa75ba0e27157d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Desbiens?=
 <frederic.desbiens@eclipse-foundation.org>
Date: Tue, 11 Aug 2026 16:20:48 -0400
Subject: [PATCH] Made the ARMv8-A debug launch configurations name their own
 core (#602)

Two identifiers in the Arm Development Studio launch configurations still said
A35 in every AArch64 port, because the generator's patch table could not reach
them.

The config database taxonomy id is spelt in lower case in the launch files,
/platform/armfvp/base_a35x4, but the search string read base_A35x4. Both
generators are case sensitive here, sed in update.sh and -creplace in
update.ps1, so the rule matched nothing and all 27 ports kept the A35 taxonomy
id while the platform name and model beside it named the right core. That the
rule exists at all shows the substitution was intended, and the ARMv7-A
generator does the same thing correctly, which is why its ports carry a per-core
ve_cortex_a<n>x1 id.

The SMP launch files name the activity "Cortex-A35x4 SMP" where the ThreadX ones
say "Debug Cortex-A35", so the existing activity rule reached the ThreadX ports
only and every SMP port advertised an A35 activity. Add a rule that matches the
" SMP" suffix, which also keeps it from rewriting the FVP model name that the
line above already handles.

Both changes are mirrored in update.ps1, which stays equivalent to update.sh.

Verified by regenerating: 50 launch files change and nothing else, 100 lines of
taxonomy id across 24 ThreadX and 26 SMP files, and 52 lines of activity name
across the 26 SMP files. No other attribute in those files moves, so the new
" SMP" rule does not touch the model name. The two Cortex-A35 ports are
untouched, as they must be, since substituting A35 for A35 is a no-op.
scripts/check_ports.sh passes, so the result is reproducible.

This cannot be exercised here: confirming that Arm Development Studio resolves
the per-core taxonomy ids needs Arm Development Studio. The change rests on the
platform name and model already naming the core, on the patch rule's existence,
and on the ARMv7-A ports having shipped per-core ids all along.

Assisted-by: Claude Code (Opus 5) <noreply@anthropic.com>
---
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 .../sample_threadx/sample_threadx.launch        |  2 +-
 ports_arch/ARMv8-A/update.ps1                   | 17 +++++++++++++----
 ports_arch/ARMv8-A/update.sh                    | 13 ++++++++++++-
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 .../sample_threadx/sample_threadx.launch        |  4 ++--
 52 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/ports/cortex_a34/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a34/ac6/example_build/sample_threadx/sample_threadx.launch
index c65a2969..218de433 100644
--- a/ports/cortex_a34/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a34/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A34x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a34x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A34x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a34/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a34/gnu/example_build/sample_threadx/sample_threadx.launch
index dd70fe94..de607ea5 100644
--- a/ports/cortex_a34/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a34/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A34x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a34x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a53/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a53/ac6/example_build/sample_threadx/sample_threadx.launch
index f55da65f..1711f12e 100644
--- a/ports/cortex_a53/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a53/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A53x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a53x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A53x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a53/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a53/gnu/example_build/sample_threadx/sample_threadx.launch
index a2971cdf..2a11b81b 100644
--- a/ports/cortex_a53/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a53/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A53x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a53x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a55/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a55/ac6/example_build/sample_threadx/sample_threadx.launch
index c5238ecd..26c99d5a 100644
--- a/ports/cortex_a55/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a55/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A55x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a55x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A55x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a55/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a55/gnu/example_build/sample_threadx/sample_threadx.launch
index 925ddb4c..165a076b 100644
--- a/ports/cortex_a55/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a55/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A55x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a55x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a57/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a57/ac6/example_build/sample_threadx/sample_threadx.launch
index afa62aef..a751d88b 100644
--- a/ports/cortex_a57/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a57/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A57x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a57x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A57x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a57/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a57/gnu/example_build/sample_threadx/sample_threadx.launch
index 688d47e3..2b13f07c 100644
--- a/ports/cortex_a57/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a57/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A57x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a57x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a65/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a65/ac6/example_build/sample_threadx/sample_threadx.launch
index 71866b51..f16a0a7a 100644
--- a/ports/cortex_a65/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a65/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A65x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a65x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A65x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a65/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a65/gnu/example_build/sample_threadx/sample_threadx.launch
index 14f4ed2a..de714ae4 100644
--- a/ports/cortex_a65/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a65/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A65x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a65x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a65ae/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a65ae/ac6/example_build/sample_threadx/sample_threadx.launch
index 711e1a98..215f0c3e 100644
--- a/ports/cortex_a65ae/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a65ae/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A65AEx1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a65aex1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A65AEx1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a65ae/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a65ae/gnu/example_build/sample_threadx/sample_threadx.launch
index ca99098e..74b6d27b 100644
--- a/ports/cortex_a65ae/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a65ae/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A65AEx1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a65aex1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a72/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a72/ac6/example_build/sample_threadx/sample_threadx.launch
index 65870ac4..36a33353 100644
--- a/ports/cortex_a72/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a72/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A72x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a72x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A72x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a72/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a72/gnu/example_build/sample_threadx/sample_threadx.launch
index 2b75e0ee..9216a1ae 100644
--- a/ports/cortex_a72/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a72/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A72x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a72x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a73/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a73/ac6/example_build/sample_threadx/sample_threadx.launch
index 98380962..6142b567 100644
--- a/ports/cortex_a73/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a73/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A73x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a73x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A73x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a73/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a73/gnu/example_build/sample_threadx/sample_threadx.launch
index 5dbb6ebb..8eaee39b 100644
--- a/ports/cortex_a73/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a73/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A73x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a73x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a75/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a75/ac6/example_build/sample_threadx/sample_threadx.launch
index 7313e0a7..6c3cff2f 100644
--- a/ports/cortex_a75/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a75/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A75x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a75x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A75x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a75/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a75/gnu/example_build/sample_threadx/sample_threadx.launch
index 845e250d..0c07c011 100644
--- a/ports/cortex_a75/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a75/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A75x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a75x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a76/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a76/ac6/example_build/sample_threadx/sample_threadx.launch
index edb564a7..2b572ab3 100644
--- a/ports/cortex_a76/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a76/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A76x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a76x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A76x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a76/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a76/gnu/example_build/sample_threadx/sample_threadx.launch
index 5aeb827f..505914aa 100644
--- a/ports/cortex_a76/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a76/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A76x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a76x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a76ae/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a76ae/ac6/example_build/sample_threadx/sample_threadx.launch
index fff22f43..82b60b76 100644
--- a/ports/cortex_a76ae/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a76ae/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A76AEx1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a76aex1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A76AEx1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a76ae/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a76ae/gnu/example_build/sample_threadx/sample_threadx.launch
index 8610641d..ad8f674d 100644
--- a/ports/cortex_a76ae/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a76ae/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A76AEx1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a76aex1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports/cortex_a77/ac6/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a77/ac6/example_build/sample_threadx/sample_threadx.launch
index 4153312a..6c4daf8a 100644
--- a/ports/cortex_a77/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a77/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -232,7 +232,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A77x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a77x1"/>
     <stringAttribute key="config_file" value="CDB://../../Arm FVP/Base_A77x1/iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports/cortex_a77/gnu/example_build/sample_threadx/sample_threadx.launch b/ports/cortex_a77/gnu/example_build/sample_threadx/sample_threadx.launch
index 394f6715..4fd73126 100644
--- a/ports/cortex_a77/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports/cortex_a77/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -239,7 +239,7 @@
     <stringAttribute key="config_db_platform_name" value="Arm FVP (Installed with Arm DS) - Base_A77x1"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a35x1"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp_installedwitharmds_/base_a77x1"/>
     <stringAttribute key="config_file" value="CDB://cadi_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <listAttribute key="debugger.view.DisassemblyView:current">
diff --git a/ports_arch/ARMv8-A/update.ps1 b/ports_arch/ARMv8-A/update.ps1
index e6dd9ade..98ba818d 100644
--- a/ports_arch/ARMv8-A/update.ps1
+++ b/ports_arch/ARMv8-A/update.ps1
@@ -94,17 +94,26 @@ $patches = (
         (('value="cortex-a35"'), ('value="cortex-$($core_short_lower)"')),
         (('Cortex-A35.AArch64.ARMv8.Neon.Crypto'), ('Cortex-$($core_short_upper).AArch64.ARMv8.Neon.Crypto'))
     )),
+    # The base_a35x<n> entries are the config database taxonomy id, which is
+    # spelt in lower case in the launch files. They used to read base_A35x<n>,
+    # which -creplace never matched, leaving every port pointing at the A35
+    # platform. The Cortex-A35x<n> SMP entries are the activity name the SMP
+    # launch files use in place of "Debug Cortex-A35"; matching the " SMP"
+    # suffix keeps them from also rewriting the FVP model name.
     ('example_build\sample_threadx\sample_threadx.launch', (
         ('Debug Cortex-A35', 'Debug Cortex-$($core_short_upper)'),
         ('Base_A35x1', 'Base_$($core_short_upper)x1'),
-        ('base_A35x1', 'base_$($core_short_lower)x1'),
+        ('base_a35x1', 'base_$($core_short_lower)x1'),
         ('FVP_Base_Cortex-A35x1', 'FVP_Base_Cortex-$($core_short_upper)x1'),
+        ('Cortex-A35x1 SMP', 'Cortex-$($core_short_upper)x1 SMP'),
         ('Base_A35x2', 'Base_$($core_short_upper)x2'),
-        ('base_A35x2', 'base_$($core_short_lower)x2'),
+        ('base_a35x2', 'base_$($core_short_lower)x2'),
         ('FVP_Base_Cortex-A35x2', 'FVP_Base_Cortex-$($core_short_upper)x2'),
+        ('Cortex-A35x2 SMP', 'Cortex-$($core_short_upper)x2 SMP'),
         ('Base_A35x4', 'Base_$($core_short_upper)x4'),
-        ('base_A35x4', 'base_$($core_short_lower)x4'),
-        ('FVP_Base_Cortex-A35x4', 'FVP_Base_Cortex-$($core_short_upper)x4')
+        ('base_a35x4', 'base_$($core_short_lower)x4'),
+        ('FVP_Base_Cortex-A35x4', 'FVP_Base_Cortex-$($core_short_upper)x4'),
+        ('Cortex-A35x4 SMP', 'Cortex-$($core_short_upper)x4 SMP')
     ))
 )
 
diff --git a/ports_arch/ARMv8-A/update.sh b/ports_arch/ARMv8-A/update.sh
index da99e2cb..4084d33f 100755
--- a/ports_arch/ARMv8-A/update.sh
+++ b/ports_arch/ARMv8-A/update.sh
@@ -169,8 +169,19 @@ for port_set in ${port_sets}; do
                 patch_file "${launch}" 'Debug Cortex-A35' "Debug Cortex-${core_short_upper}"
                 for count in 1 2 4; do
                     patch_file "${launch}" "Base_A35x${count}"             "Base_${core_short_upper}x${count}"
-                    patch_file "${launch}" "base_A35x${count}"             "base_${core_short_lower}x${count}"
+                    # The config database taxonomy id is spelt in lower case in
+                    # the launch files, so the search string must be too. It
+                    # used to read base_A35x, which matched nothing and left
+                    # every port pointing at the A35 platform. The ARMv7-A
+                    # generator gets this right, which is why its ports carry a
+                    # per-core ve_cortex_a<n>x1 id.
+                    patch_file "${launch}" "base_a35x${count}"             "base_${core_short_lower}x${count}"
                     patch_file "${launch}" "FVP_Base_Cortex-A35x${count}"  "FVP_Base_Cortex-${core_short_upper}x${count}"
+                    # The SMP launch files name the activity "Cortex-A35x4 SMP"
+                    # rather than "Debug Cortex-A35", so the rule above does not
+                    # reach them. Match the " SMP" suffix so this cannot also
+                    # rewrite the FVP model name handled on the line above.
+                    patch_file "${launch}" "Cortex-A35x${count} SMP"       "Cortex-${core_short_upper}x${count} SMP"
                 done
             fi
         done
diff --git a/ports_smp/cortex_a34_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a34_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index ff8d9267..0504845c 100644
--- a/ports_smp/cortex_a34_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a34_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A34x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A34x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a34x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a34_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a34_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index a6b66c23..c3bb4246 100644
--- a/ports_smp/cortex_a34_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a34_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A34x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A34x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a34x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a53_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a53_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index 27743868..67c1a927 100644
--- a/ports_smp/cortex_a53_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a53_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A53x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A53x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a53x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a53_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a53_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index d0fd074c..045ffa6d 100644
--- a/ports_smp/cortex_a53_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a53_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A53x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A53x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a53x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a55_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a55_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index f642a3e4..be0cec08 100644
--- a/ports_smp/cortex_a55_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a55_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A55x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A55x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a55x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a55_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a55_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index 2f22ba75..ff796555 100644
--- a/ports_smp/cortex_a55_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a55_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A55x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A55x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a55x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a57_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a57_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index 674e9663..e931d1ef 100644
--- a/ports_smp/cortex_a57_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a57_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A57x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A57x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a57x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a57_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a57_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index 17c737ee..5c4635d6 100644
--- a/ports_smp/cortex_a57_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a57_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A57x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A57x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a57x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a65_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a65_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index 35b90705..b9860a7c 100644
--- a/ports_smp/cortex_a65_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a65_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A65x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A65x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a65x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a65_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a65_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index bc7dcad0..2a46fcb7 100644
--- a/ports_smp/cortex_a65_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a65_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A65x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A65x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a65x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a65ae_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a65ae_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index 09d5f09b..b03142d9 100644
--- a/ports_smp/cortex_a65ae_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a65ae_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A65AEx4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A65AEx4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a65aex4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a65ae_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a65ae_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index 0ffed216..4fc222e4 100644
--- a/ports_smp/cortex_a65ae_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a65ae_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A65AEx4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A65AEx4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a65aex4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a72_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a72_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index 354f9ea7..139b1f06 100644
--- a/ports_smp/cortex_a72_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a72_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A72x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A72x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a72x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a72_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a72_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index 6a746fbc..838e2649 100644
--- a/ports_smp/cortex_a72_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a72_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A72x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A72x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a72x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a73_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a73_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index d9e3d93f..f13939f4 100644
--- a/ports_smp/cortex_a73_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a73_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A73x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A73x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a73x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a73_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a73_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index 1cc749ae..4154e537 100644
--- a/ports_smp/cortex_a73_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a73_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A73x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A73x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a73x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a75_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a75_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index 28c5aab8..fe933d06 100644
--- a/ports_smp/cortex_a75_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a75_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A75x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A75x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a75x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a75_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a75_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index 76a6ad45..9ee277a9 100644
--- a/ports_smp/cortex_a75_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a75_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A75x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A75x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a75x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a76_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a76_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index a665e8c3..b95a77e9 100644
--- a/ports_smp/cortex_a76_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a76_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A76x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A76x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a76x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a76_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a76_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index 58967dca..7120ad67 100644
--- a/ports_smp/cortex_a76_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a76_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A76x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A76x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a76x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a76ae_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a76ae_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index f261e124..97f33086 100644
--- a/ports_smp/cortex_a76ae_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a76ae_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A76AEx4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A76AEx4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a76aex4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a76ae_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a76ae_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index 8108d076..6f2e230f 100644
--- a/ports_smp/cortex_a76ae_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a76ae_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A76AEx4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A76AEx4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a76aex4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a77_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a77_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index 8d2fe10c..4acbbf6a 100644
--- a/ports_smp/cortex_a77_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a77_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A77x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A77x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a77x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a77_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a77_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index a7f12edc..a23df1b0 100644
--- a/ports_smp/cortex_a77_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a77_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A77x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A77x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a77x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a78_smp/ac6/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a78_smp/ac6/example_build/sample_threadx/sample_threadx.launch
index e602406f..88ea5a1e 100644
--- a/ports_smp/cortex_a78_smp/ac6/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a78_smp/ac6/example_build/sample_threadx/sample_threadx.launch
@@ -316,13 +316,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A78x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A78x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a78x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>
diff --git a/ports_smp/cortex_a78_smp/gnu/example_build/sample_threadx/sample_threadx.launch b/ports_smp/cortex_a78_smp/gnu/example_build/sample_threadx/sample_threadx.launch
index b8adaa19..13eca790 100644
--- a/ports_smp/cortex_a78_smp/gnu/example_build/sample_threadx/sample_threadx.launch
+++ b/ports_smp/cortex_a78_smp/gnu/example_build/sample_threadx/sample_threadx.launch
@@ -345,13 +345,13 @@
     <listAttribute key="com.arm.debugger.views.common.AddressTracker.debugger.view.DisassemblyView.ranges">
         <listEntry value="100"/>
     </listAttribute>
-    <stringAttribute key="config_db_activity_name" value="Cortex-A35x4 SMP"/>
+    <stringAttribute key="config_db_activity_name" value="Cortex-A78x4 SMP"/>
     <stringAttribute key="config_db_connection_keys" value="dtsl_config dtsl_tracecapture_option connect_existing_model dtsl_config_script model_params model_iris config_file model_connection_address setup TCP_KILL_ON_EXIT TCP_DISABLE_EXTENDED_MODE"/>
     <stringAttribute key="config_db_connection_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_platform_name" value="Arm FVP - Base_A78x4"/>
     <stringAttribute key="config_db_project_type" value="Bare Metal Debug"/>
     <stringAttribute key="config_db_project_type_id" value="BARE_METAL"/>
-    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a35x4"/>
+    <stringAttribute key="config_db_taxonomy_id" value="/platform/armfvp/base_a78x4"/>
     <stringAttribute key="config_file" value="CDB://iris_config.xml"/>
     <booleanAttribute key="connectOnly" value="false"/>
     <stringAttribute key="connect_existing_model" value="false"/>