diff --git a/cmake/compiler/xcc-clang/compiler_flags.cmake b/cmake/compiler/xt-clang/compiler_flags.cmake
similarity index 100%
rename from cmake/compiler/xcc-clang/compiler_flags.cmake
rename to cmake/compiler/xt-clang/compiler_flags.cmake
diff --git a/cmake/compiler/xcc-clang/generic.cmake b/cmake/compiler/xt-clang/generic.cmake
similarity index 100%
rename from cmake/compiler/xcc-clang/generic.cmake
rename to cmake/compiler/xt-clang/generic.cmake
diff --git a/cmake/compiler/xcc-clang/target.cmake b/cmake/compiler/xt-clang/target.cmake
similarity index 100%
rename from cmake/compiler/xcc-clang/target.cmake
rename to cmake/compiler/xt-clang/target.cmake
diff --git a/cmake/modules/FindDeprecated.cmake b/cmake/modules/FindDeprecated.cmake
index a48fe547ac2..6296c1701a8 100644
--- a/cmake/modules/FindDeprecated.cmake
+++ b/cmake/modules/FindDeprecated.cmake
@@ -47,8 +47,13 @@ if("XCC_USE_CLANG" IN_LIST Deprecated_FIND_COMPONENTS)
 
   if ("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc"
       AND "$ENV{XCC_USE_CLANG}" STREQUAL "1")
-    set(ZEPHYR_TOOLCHAIN_VARIANT xcc-clang CACHE STRING "Zephyr toolchain variant" FORCE)
-    message(DEPRECATION "XCC_USE_CLANG is deprecated. Please set ZEPHYR_TOOLCHAIN_VARIANT to 'xcc-clang'")
+    set(ZEPHYR_TOOLCHAIN_VARIANT xt-clang CACHE STRING "Zephyr toolchain variant" FORCE)
+    message(DEPRECATION "XCC_USE_CLANG is deprecated. Please set ZEPHYR_TOOLCHAIN_VARIANT to 'xt-clang'")
+  endif()
+
+  if("${ZEPHYR_TOOLCHAIN_VARIANT}" STREQUAL "xcc-clang")
+    set(ZEPHYR_TOOLCHAIN_VARIANT xt-clang CACHE STRING "Zephyr toolchain variant" FORCE)
+    message(DEPRECATION "ZEPHYR_TOOLCHAIN_VARIANT 'xcc-clang' is deprecated. Please set ZEPHYR_TOOLCHAIN_VARIANT to 'xt-clang'")
   endif()
 endif()
 
diff --git a/cmake/toolchain/xcc-clang/generic.cmake b/cmake/toolchain/xt-clang/generic.cmake
similarity index 57%
rename from cmake/toolchain/xcc-clang/generic.cmake
rename to cmake/toolchain/xt-clang/generic.cmake
index a8c8685ccbc..ec86ee1dbce 100644
--- a/cmake/toolchain/xcc-clang/generic.cmake
+++ b/cmake/toolchain/xt-clang/generic.cmake
@@ -2,8 +2,8 @@
 
 include(${ZEPHYR_BASE}/cmake/toolchain/xcc/common.cmake)
 
-set(COMPILER xcc-clang)
+set(COMPILER xt-clang)
 set(CC clang)
 set(C++ clang++)
 
-message(STATUS "Found toolchain: xcc-clang (${XTENSA_TOOLCHAIN_PATH})")
+message(STATUS "Found toolchain: xt-clang (${XTENSA_TOOLCHAIN_PATH})")
diff --git a/cmake/toolchain/xcc-clang/target.cmake b/cmake/toolchain/xt-clang/target.cmake
similarity index 100%
rename from cmake/toolchain/xcc-clang/target.cmake
rename to cmake/toolchain/xt-clang/target.cmake
diff --git a/doc/develop/toolchains/cadence_xcc.rst b/doc/develop/toolchains/cadence_xcc.rst
index 5a2e7cea8d0..5778c542068 100644
--- a/doc/develop/toolchains/cadence_xcc.rst
+++ b/doc/develop/toolchains/cadence_xcc.rst
@@ -28,7 +28,7 @@ Cadence Tensilica Xtensa C/C++ Compiler (XCC)
 
 #. :ref:`Set these environment variables <env_vars>`:
 
-   * Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc`` or ``xcc-clang``.
+   * Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc`` or ``xt-clang``.
    * Set :envvar:`XTENSA_TOOLCHAIN_PATH` to the toolchain installation
      directory.
    * Set :envvar:`XTENSA_CORE` to the SoC ID where application is being
@@ -49,7 +49,7 @@ Cadence Tensilica Xtensa C/C++ Compiler (XCC)
 
 #. To use Clang-based compiler:
 
-   * Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc-clang``.
+   * Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xt-clang``.
 
    * Note that the Clang-based compiler may contain an old LLVM bug which
      results in the following error:
@@ -71,4 +71,4 @@ Cadence Tensilica Xtensa C/C++ Compiler (XCC)
 
    * Also note that setting :envvar:`XCC_USE_CLANG` to ``1`` and
      :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc`` is deprecated.
-     Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xcc-clang`` instead.
+     Set :envvar:`ZEPHYR_TOOLCHAIN_VARIANT` to ``xt-clang`` instead.
diff --git a/soc/xtensa/intel_adsp/ace/Kconfig.series b/soc/xtensa/intel_adsp/ace/Kconfig.series
index 155367bc042..8b4f8e61436 100644
--- a/soc/xtensa/intel_adsp/ace/Kconfig.series
+++ b/soc/xtensa/intel_adsp/ace/Kconfig.series
@@ -5,7 +5,7 @@ config SOC_SERIES_INTEL_ACE
 	bool "Intel ACE"
 	select SOC_FAMILY_INTEL_ADSP
 	select XTENSA
-	select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc-clang"))
+	select XTENSA_HAL if (("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc") && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang"))
 	select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"
 	select ARCH_HAS_COHERENCE
 	select SCHED_IPI_SUPPORTED
diff --git a/soc/xtensa/intel_adsp/cavs/Kconfig.series b/soc/xtensa/intel_adsp/cavs/Kconfig.series
index a627dce362c..1f398025eb4 100644
--- a/soc/xtensa/intel_adsp/cavs/Kconfig.series
+++ b/soc/xtensa/intel_adsp/cavs/Kconfig.series
@@ -5,7 +5,7 @@ config SOC_SERIES_INTEL_ADSP_CAVS
 	bool "Intel CAVS"
 	select SOC_FAMILY_INTEL_ADSP
 	select XTENSA
-	select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc-clang"))
+	select XTENSA_HAL if ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc" && ("$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xt-clang"))
 	select XTENSA_RESET_VECTOR
 	select XTENSA_USE_CORE_CRT1
 	select ATOMIC_OPERATIONS_BUILTIN if "$(ZEPHYR_TOOLCHAIN_VARIANT)" != "xcc"