diff --git a/AutomatedTesting/Gem/Code/CMakeLists.txt b/AutomatedTesting/Gem/Code/CMakeLists.txt
index 9315bf8397..548aa51ad1 100644
--- a/AutomatedTesting/Gem/Code/CMakeLists.txt
+++ b/AutomatedTesting/Gem/Code/CMakeLists.txt
@@ -28,6 +28,12 @@ ly_add_target(
             Gem::Atom_AtomBridge.Static
 )
 
+# if enabled, AutomatedTesting is used by all kinds of applications
+ly_create_alias(NAME AutomatedTesting.Builders NAMESPACE Gem TARGETS Gem::AutomatedTesting)
+ly_create_alias(NAME AutomatedTesting.Tools    NAMESPACE Gem TARGETS Gem::AutomatedTesting)
+ly_create_alias(NAME AutomatedTesting.Clients  NAMESPACE Gem TARGETS Gem::AutomatedTesting)
+ly_create_alias(NAME AutomatedTesting.Servers  NAMESPACE Gem TARGETS Gem::AutomatedTesting)
+
 ################################################################################
 # Gem dependencies
 ################################################################################
diff --git a/Templates/DefaultProject/Template/Code/CMakeLists.txt b/Templates/DefaultProject/Template/Code/CMakeLists.txt
index b116fb2044..43459b1606 100644
--- a/Templates/DefaultProject/Template/Code/CMakeLists.txt
+++ b/Templates/DefaultProject/Template/Code/CMakeLists.txt
@@ -33,7 +33,7 @@ endif()
 # in ${pal_dir}/${NameLower}_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
 ly_add_target(
     NAME ${Name}.Static STATIC
-    NAMESPACE Project
+    NAMESPACE Gem
     FILES_CMAKE
         ${NameLower}_files.cmake
         ${pal_dir}/${NameLower}_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
@@ -48,7 +48,7 @@ ly_add_target(
 
 ly_add_target(
     NAME ${Name} ${PAL_TRAIT_MONOLITHIC_DRIVEN_MODULE_TYPE}
-    NAMESPACE Project
+    NAMESPACE Gem
     FILES_CMAKE
         ${NameLower}_shared_files.cmake
         ${pal_dir}/${NameLower}_shared_${PAL_PLATFORM_NAME_LOWERCASE}_files.cmake
@@ -57,10 +57,16 @@ ly_add_target(
             Include
     BUILD_DEPENDENCIES
         PRIVATE
-            Project::${Name}.Static
+            Gem::${Name}.Static
             AZ::AzCore
 )
 
+# if enabled, ${Name} is used by all kinds of applications
+ly_create_alias(NAME ${Name}.Builders NAMESPACE Gem TARGETS Gem::${Name})
+ly_create_alias(NAME ${Name}.Tools    NAMESPACE Gem TARGETS Gem::${Name})
+ly_create_alias(NAME ${Name}.Clients  NAMESPACE Gem TARGETS Gem::${Name})
+ly_create_alias(NAME ${Name}.Servers  NAMESPACE Gem TARGETS Gem::${Name})
+
 ################################################################################
 # Gem dependencies
 ################################################################################