Update usages of AZ_CRC macro with 1 parameter

Signed-off-by: Markus Prettner <[email protected]>

AutomatedTesting/Gem/Code/Source/AutomatedTestingSystemComponent.cpp

@@ -38,12 +38,12 @@ namespace AutomatedTesting
 
     void AutomatedTestingSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("AutomatedTestingService"));
+        provided.push_back(AZ_CRC_CE("AutomatedTestingService"));
     }
 
     void AutomatedTestingSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("AutomatedTestingService"));
+        incompatible.push_back(AZ_CRC_CE("AutomatedTestingService"));
     }
 
     void AutomatedTestingSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Code/Editor/Plugins/ComponentEntityEditorPlugin/UI/AssetCatalogModel.cpp

@@ -157,7 +157,7 @@ AssetCatalogModel::AssetCatalogModel(QObject* parent)
 
                     if (!assetType.IsNull())
                     {
-                        const AZ::Edit::Attribute* iconAttribute = element->FindAttribute(AZ_CRC("Icon"));
+                        const AZ::Edit::Attribute* iconAttribute = element->FindAttribute(AZ_CRC_CE("Icon"));
                         if (iconAttribute)
                         {
                             auto* iconAttributeData = azdynamic_cast<const AZ::Edit::AttributeData<const char*>*>(iconAttribute);

Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_common.h

@@ -16,26 +16,26 @@ namespace ProjectSettingsTool
 {
     namespace Attributes
     {
-        static const AZ::Crc32 FuncValidator = AZ_CRC("FuncValidator");
-        static const AZ::Crc32 SelectFunction = AZ_CRC("SelectFunction");
-        static const AZ::Crc32 LinkOptional = AZ_CRC("LinkOptional");
-        static const AZ::Crc32 Obfuscated = AZ_CRC("ObfuscatedText");
+        static const AZ::Crc32 FuncValidator = AZ_CRC_CE("FuncValidator");
+        static const AZ::Crc32 SelectFunction = AZ_CRC_CE("SelectFunction");
+        static const AZ::Crc32 LinkOptional = AZ_CRC_CE("LinkOptional");
+        static const AZ::Crc32 Obfuscated = AZ_CRC_CE("ObfuscatedText");
         // Used as a tooltip and for distinguising linked properties
-        static const AZ::Crc32 PropertyIdentfier = AZ_CRC("PropertyIdentfier");
-        static const AZ::Crc32 DefaultPath = AZ_CRC("DefaultPath");
-        static const AZ::Crc32 DefaultImagePreview = AZ_CRC("DefaultImagePreview");
-        static const AZ::Crc32 ObfuscatedText = AZ_CRC("ObfuscatedText");
-        static const AZ::Crc32 ClearButton = AZ_CRC("ClearButton");
-        static const AZ::Crc32 RemovableReadOnly = AZ_CRC("RemovableReadOnly");
+        static const AZ::Crc32 PropertyIdentfier = AZ_CRC_CE("PropertyIdentfier");
+        static const AZ::Crc32 DefaultPath = AZ_CRC_CE("DefaultPath");
+        static const AZ::Crc32 DefaultImagePreview = AZ_CRC_CE("DefaultImagePreview");
+        static const AZ::Crc32 ObfuscatedText = AZ_CRC_CE("ObfuscatedText");
+        static const AZ::Crc32 ClearButton = AZ_CRC_CE("ClearButton");
+        static const AZ::Crc32 RemovableReadOnly = AZ_CRC_CE("RemovableReadOnly");
     } // namespace Attributes
 
     namespace Handlers
     {
-        static const AZ::Crc32 ImagePreview = AZ_CRC("ImagePreview");
-        static const AZ::Crc32 LinkedLineEdit = AZ_CRC("LinkedLineEdit");
-        static const AZ::Crc32 FileSelect = AZ_CRC("FileSelect");
-        static const AZ::Crc32 QValidatedLineEdit = AZ_CRC("QValLineEdit");
-        static const AZ::Crc32 QValidatedBrowseEdit = AZ_CRC("QValBrowseEdit");
+        static const AZ::Crc32 ImagePreview = AZ_CRC_CE("ImagePreview");
+        static const AZ::Crc32 LinkedLineEdit = AZ_CRC_CE("LinkedLineEdit");
+        static const AZ::Crc32 FileSelect = AZ_CRC_CE("FileSelect");
+        static const AZ::Crc32 QValidatedLineEdit = AZ_CRC_CE("QValLineEdit");
+        static const AZ::Crc32 QValidatedBrowseEdit = AZ_CRC_CE("QValBrowseEdit");
     } // namespace Handlers
 
     namespace Identfiers

Code/Framework/AzCore/AzCore/Serialization/EditContextConstants.inl

@@ -134,7 +134,7 @@ namespace AZ
             //! Allow or disallow clearing the asset
             const static AZ::Crc32 AllowClearAsset = AZ_CRC_CE("AllowClearAsset");
             // Show the name of the asset that was produced from the source asset
-            const static AZ::Crc32 ShowProductAssetFileName = AZ_CRC("ShowProductAssetFileName");
+            const static AZ::Crc32 ShowProductAssetFileName = AZ_CRC_CE("ShowProductAssetFileName");
             //! Regular expression pattern filter for source files
             const static AZ::Crc32 SourceAssetFilterPattern = AZ_CRC_CE("SourceAssetFilterPattern");
 

Code/Framework/AzCore/Tests/Components.cpp

@@ -442,8 +442,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceG")); }
-        static void GetRequiredServices(ComponentDescriptor::DependencyArrayType& required) { required.push_back(AZ_CRC("ServiceH")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceG")); }
+        static void GetRequiredServices(ComponentDescriptor::DependencyArrayType& required) { required.push_back(AZ_CRC_CE("ServiceH")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -459,8 +459,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceH")); }
-        static void GetRequiredServices(ComponentDescriptor::DependencyArrayType& required) { required.push_back(AZ_CRC("ServiceG")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceH")); }
+        static void GetRequiredServices(ComponentDescriptor::DependencyArrayType& required) { required.push_back(AZ_CRC_CE("ServiceG")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -476,8 +476,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceI")); }
-        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceI")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceI")); }
+        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceI")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -493,7 +493,7 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceJ")); provided.push_back(AZ_CRC("ServiceJ")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceJ")); provided.push_back(AZ_CRC_CE("ServiceJ")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -509,8 +509,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceK")); }
-        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC("ServiceJ")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceK")); }
+        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC_CE("ServiceJ")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -526,8 +526,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceL")); }
-        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC("ServiceA")); dependent.push_back(AZ_CRC("ServiceA")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceL")); }
+        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC_CE("ServiceA")); dependent.push_back(AZ_CRC_CE("ServiceA")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -543,9 +543,9 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceM")); }
-        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC("ServiceA")); }
-        static void GetRequiredServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC("ServiceA")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceM")); }
+        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC_CE("ServiceA")); }
+        static void GetRequiredServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC_CE("ServiceA")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -561,8 +561,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceN")); }
-        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceA")); provided.push_back(AZ_CRC("ServiceA")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceN")); }
+        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceA")); provided.push_back(AZ_CRC_CE("ServiceA")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -578,8 +578,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceO")); }
-        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceO")); provided.push_back(AZ_CRC("ServiceO")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceO")); }
+        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceO")); provided.push_back(AZ_CRC_CE("ServiceO")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -1825,7 +1825,7 @@ namespace UnitTest
     TEST_F(Components, RemoveDuplicateServicesOfAndAfterIterator_OnlyOneService_ReturnsFalse)
     {
         AZ::ComponentDescriptor::DependencyArrayType dependencyList;
-        dependencyList.push_back(AZ_CRC("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
 
         const ComponentDescriptor::DependencyArrayType::iterator dependencyIter = dependencyList.begin();
         const bool servicesRemoved = EntityUtils::RemoveDuplicateServicesOfAndAfterIterator(dependencyIter, dependencyList, nullptr);
@@ -1836,9 +1836,9 @@ namespace UnitTest
     TEST_F(Components, RemoveDuplicateServicesOfAndAfterIterator_NoDuplicates_ReturnsFalse)
     {
         AZ::ComponentDescriptor::DependencyArrayType dependencyList;
-        dependencyList.push_back(AZ_CRC("SomeService"));
-        dependencyList.push_back(AZ_CRC("AnotherService"));
-        dependencyList.push_back(AZ_CRC("YetAnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("AnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("YetAnotherService"));
 
         for (ComponentDescriptor::DependencyArrayType::iterator dependencyIter = dependencyList.begin();
             dependencyIter != dependencyList.end();
@@ -1849,18 +1849,18 @@ namespace UnitTest
         }
         // Make sure no services were removed.
         EXPECT_EQ(dependencyList.size(), 3);
-        EXPECT_EQ(dependencyList[0], AZ_CRC("SomeService"));
-        EXPECT_EQ(dependencyList[1], AZ_CRC("AnotherService"));
-        EXPECT_EQ(dependencyList[2], AZ_CRC("YetAnotherService"));
+        EXPECT_EQ(dependencyList[0], AZ_CRC_CE("SomeService"));
+        EXPECT_EQ(dependencyList[1], AZ_CRC_CE("AnotherService"));
+        EXPECT_EQ(dependencyList[2], AZ_CRC_CE("YetAnotherService"));
     }
 
     TEST_F(Components, RemoveDuplicateServicesOfAndAfterIterator_DuplicateAfterIterator_ReturnsTrueClearsDuplicates)
     {
         AZ::ComponentDescriptor::DependencyArrayType dependencyList;
-        dependencyList.push_back(AZ_CRC("SomeService"));
-        dependencyList.push_back(AZ_CRC("AnotherService"));
-        dependencyList.push_back(AZ_CRC("YetAnotherService"));
-        dependencyList.push_back(AZ_CRC("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("AnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("YetAnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
 
         ComponentDescriptor::DependencyArrayType::iterator dependencyIter = dependencyList.begin();
         EXPECT_TRUE(EntityUtils::RemoveDuplicateServicesOfAndAfterIterator(dependencyIter, dependencyList, nullptr));
@@ -1872,19 +1872,19 @@ namespace UnitTest
         EXPECT_EQ(dependencyIter, dependencyList.end());
         // Make sure the service was removed.
         EXPECT_EQ(dependencyList.size(), 3);
-        EXPECT_EQ(dependencyList[0], AZ_CRC("SomeService"));
-        EXPECT_EQ(dependencyList[1], AZ_CRC("AnotherService"));
-        EXPECT_EQ(dependencyList[2], AZ_CRC("YetAnotherService"));
+        EXPECT_EQ(dependencyList[0], AZ_CRC_CE("SomeService"));
+        EXPECT_EQ(dependencyList[1], AZ_CRC_CE("AnotherService"));
+        EXPECT_EQ(dependencyList[2], AZ_CRC_CE("YetAnotherService"));
     }
 
     TEST_F(Components, RemoveDuplicateServicesOfAndAfterIterator_2DuplicatesAfterIterator_ReturnsTrueClearsDuplicates)
     {
         AZ::ComponentDescriptor::DependencyArrayType dependencyList;
-        dependencyList.push_back(AZ_CRC("SomeService"));
-        dependencyList.push_back(AZ_CRC("AnotherService"));
-        dependencyList.push_back(AZ_CRC("SomeService"));
-        dependencyList.push_back(AZ_CRC("YetAnotherService"));
-        dependencyList.push_back(AZ_CRC("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("AnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("YetAnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
 
         ComponentDescriptor::DependencyArrayType::iterator dependencyIter = dependencyList.begin();
         EXPECT_TRUE(EntityUtils::RemoveDuplicateServicesOfAndAfterIterator(dependencyIter, dependencyList, nullptr));
@@ -1896,9 +1896,9 @@ namespace UnitTest
         EXPECT_EQ(dependencyIter, dependencyList.end());
         // Make sure the service was removed.
         EXPECT_EQ(dependencyList.size(), 3);
-        EXPECT_EQ(dependencyList[0], AZ_CRC("SomeService"));
-        EXPECT_EQ(dependencyList[1], AZ_CRC("AnotherService"));
-        EXPECT_EQ(dependencyList[2], AZ_CRC("YetAnotherService"));
+        EXPECT_EQ(dependencyList[0], AZ_CRC_CE("SomeService"));
+        EXPECT_EQ(dependencyList[1], AZ_CRC_CE("AnotherService"));
+        EXPECT_EQ(dependencyList[2], AZ_CRC_CE("YetAnotherService"));
     }
 
     // The duplicate check logic only checks after the current iterator for performance reasons.
@@ -1906,10 +1906,10 @@ namespace UnitTest
     TEST_F(Components, RemoveDuplicateServicesOfAndAfterIterator_DuplicateBeforeIterator_ReturnsFalseDuplicateRemains)
     {
         AZ::ComponentDescriptor::DependencyArrayType dependencyList;
-        dependencyList.push_back(AZ_CRC("SomeService"));
-        dependencyList.push_back(AZ_CRC("AnotherService"));
-        dependencyList.push_back(AZ_CRC("YetAnotherService"));
-        dependencyList.push_back(AZ_CRC("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("AnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("YetAnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
 
         ComponentDescriptor::DependencyArrayType::iterator dependencyIter = dependencyList.begin();
         // Skip the first element to leave a duplicate before the iterator.
@@ -1923,20 +1923,20 @@ namespace UnitTest
         EXPECT_EQ(dependencyIter, dependencyList.end());
         // Make sure the service was not removed.
         EXPECT_EQ(dependencyList.size(), 4);
-        EXPECT_EQ(dependencyList[0], AZ_CRC("SomeService"));
-        EXPECT_EQ(dependencyList[1], AZ_CRC("AnotherService"));
-        EXPECT_EQ(dependencyList[2], AZ_CRC("YetAnotherService"));
-        EXPECT_EQ(dependencyList[3], AZ_CRC("SomeService"));
+        EXPECT_EQ(dependencyList[0], AZ_CRC_CE("SomeService"));
+        EXPECT_EQ(dependencyList[1], AZ_CRC_CE("AnotherService"));
+        EXPECT_EQ(dependencyList[2], AZ_CRC_CE("YetAnotherService"));
+        EXPECT_EQ(dependencyList[3], AZ_CRC_CE("SomeService"));
     }
 
     TEST_F(Components, RemoveDuplicateServicesOfAndAfterIterator_DuplicateBeforeAndAfterIterator_ReturnsTrueListUpdated)
     {
         AZ::ComponentDescriptor::DependencyArrayType dependencyList;
-        dependencyList.push_back(AZ_CRC("SomeService"));
-        dependencyList.push_back(AZ_CRC("AnotherService"));
-        dependencyList.push_back(AZ_CRC("SomeService"));
-        dependencyList.push_back(AZ_CRC("YetAnotherService"));
-        dependencyList.push_back(AZ_CRC("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("AnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
+        dependencyList.push_back(AZ_CRC_CE("YetAnotherService"));
+        dependencyList.push_back(AZ_CRC_CE("SomeService"));
 
         ComponentDescriptor::DependencyArrayType::iterator dependencyIter = dependencyList.begin();
         // Skip the first element to leave a duplicate before the iterator.
@@ -1950,10 +1950,10 @@ namespace UnitTest
         EXPECT_EQ(dependencyIter, dependencyList.end());
         // Make sure one service was removed, and another not removed.
         EXPECT_EQ(dependencyList.size(), 4);
-        EXPECT_EQ(dependencyList[0], AZ_CRC("SomeService"));
-        EXPECT_EQ(dependencyList[1], AZ_CRC("AnotherService"));
-        EXPECT_EQ(dependencyList[2], AZ_CRC("SomeService"));
-        EXPECT_EQ(dependencyList[3], AZ_CRC("YetAnotherService"));
+        EXPECT_EQ(dependencyList[0], AZ_CRC_CE("SomeService"));
+        EXPECT_EQ(dependencyList[1], AZ_CRC_CE("AnotherService"));
+        EXPECT_EQ(dependencyList[2], AZ_CRC_CE("SomeService"));
+        EXPECT_EQ(dependencyList[3], AZ_CRC_CE("YetAnotherService"));
     }
 
     class ComponentDeclImpl

Code/Framework/AzCore/Tests/EntityTests.cpp

@@ -39,7 +39,7 @@ namespace UnitTest
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("SortOrderTestFirstService"));
+            services.push_back(AZ_CRC_CE("SortOrderTestFirstService"));
         }
     };
 
@@ -66,7 +66,7 @@ namespace UnitTest
         }
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("SortOrderTestSecondService"));
+            services.push_back(AZ_CRC_CE("SortOrderTestSecondService"));
         }
     };
 
@@ -93,7 +93,7 @@ namespace UnitTest
         }
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("SortOrderTestThirdService"));
+            services.push_back(AZ_CRC_CE("SortOrderTestThirdService"));
         }
     };
 
@@ -122,7 +122,7 @@ namespace UnitTest
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("SortOrderTestFirstService"));
+            services.push_back(AZ_CRC_CE("SortOrderTestFirstService"));
         }
     };
 
@@ -151,7 +151,7 @@ namespace UnitTest
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("SortOrderTestSecondService"));
+            services.push_back(AZ_CRC_CE("SortOrderTestSecondService"));
         }
     };
 
@@ -180,8 +180,8 @@ namespace UnitTest
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("SortOrderTestThirdService"));
-            services.push_back(AZ_CRC("SortOrderTestSecondService"));
+            services.push_back(AZ_CRC_CE("SortOrderTestThirdService"));
+            services.push_back(AZ_CRC_CE("SortOrderTestSecondService"));
         }
     };
 
@@ -270,7 +270,7 @@ namespace UnitTest
         // here to wrap components that provide services.
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("TestWrapperService"));
+            services.push_back(AZ_CRC_CE("TestWrapperService"));
         }
     private:
         AZ::Component* m_wrappedComponent = nullptr;
@@ -376,8 +376,8 @@ namespace UnitTest
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("DuplicatedService"));
-            services.push_back(AZ_CRC("DuplicatedService"));
+            services.push_back(AZ_CRC_CE("DuplicatedService"));
+            services.push_back(AZ_CRC_CE("DuplicatedService"));
         }
     };
 
@@ -406,7 +406,7 @@ namespace UnitTest
 
         static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("DuplicatedService"));
+            services.push_back(AZ_CRC_CE("DuplicatedService"));
         }
     };
 
@@ -435,7 +435,7 @@ namespace UnitTest
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("DuplicatedService"));
+            services.push_back(AZ_CRC_CE("DuplicatedService"));
         }
     };
 

Code/Framework/AzCore/Tests/Patching.cpp

@@ -1267,7 +1267,7 @@ namespace UnitTest
             ObjectToPatch targetObj;
 
             DataPatch::AddressType forceOverrideAddress;
-            forceOverrideAddress.emplace_back(AZ_CRC("m_intValue"));
+            forceOverrideAddress.emplace_back(AZ_CRC_CE("m_intValue"));
 
             DataPatch::FlagsMap sourceFlagsMap;
 
@@ -1285,7 +1285,7 @@ namespace UnitTest
             ObjectToPatch targetObj;
 
             DataPatch::AddressType forceOverrideAddress;
-            forceOverrideAddress.emplace_back(AZ_CRC("m_intValue"));
+            forceOverrideAddress.emplace_back(AZ_CRC_CE("m_intValue"));
 
             DataPatch::FlagsMap sourceFlagsMap;
 
@@ -1309,7 +1309,7 @@ namespace UnitTest
             targetObj.m_intValue = 43;
 
             DataPatch::AddressType forceOverrideAddress;
-            forceOverrideAddress.emplace_back(AZ_CRC("m_intValue"));
+            forceOverrideAddress.emplace_back(AZ_CRC_CE("m_intValue"));
 
             DataPatch::FlagsMap sourceFlagsMap;
             sourceFlagsMap.emplace(forceOverrideAddress, DataPatch::Flag::PreventOverrideSet);
@@ -1336,7 +1336,7 @@ namespace UnitTest
 
             // create flags that prevent m_intValue from being patched
             DataPatch::AddressType forceOverrideAddress;
-            forceOverrideAddress.emplace_back(AZ_CRC("m_intValue"));
+            forceOverrideAddress.emplace_back(AZ_CRC_CE("m_intValue"));
 
             DataPatch::FlagsMap sourceFlagsMap;
             sourceFlagsMap.emplace(forceOverrideAddress, DataPatch::Flag::PreventOverrideSet);
@@ -1362,7 +1362,7 @@ namespace UnitTest
 
             // create flags that prevent m_intValue from being patched, but put them on the target instead of source
             DataPatch::AddressType forceOverrideAddress;
-            forceOverrideAddress.emplace_back(AZ_CRC("m_intValue"));
+            forceOverrideAddress.emplace_back(AZ_CRC_CE("m_intValue"));
 
             DataPatch::FlagsMap sourceFlagsMap;
 
@@ -2656,14 +2656,14 @@ namespace UnitTest
                     if (rootElement.GetVersion() < 2)
                     {
                         AZStd::string stringField;
-                        if (!rootElement.GetChildData(AZ_CRC("InnerBaseStringField"), stringField))
+                        if (!rootElement.GetChildData(AZ_CRC_CE("InnerBaseStringField"), stringField))
                         {
                             AZ_Error("PatchingTest", false, "Unable to retrieve 'InnerBaseStringField' data for %u version of the InnerObjectFieldConverterClass",
                                 rootElement.GetVersion());
                             return false;
                         }
 
-                        rootElement.RemoveElementByName(AZ_CRC("InnerBaseStringField"));
+                        rootElement.RemoveElementByName(AZ_CRC_CE("InnerBaseStringField"));
                         rootElement.AddElementWithData(context, "InnerBaseIntField", static_cast<int64_t>(stringField.size()));
                     }
 

Code/Framework/AzCore/Tests/Platform/Windows/Tests/Serialization_Windows.cpp

@@ -43,7 +43,7 @@ namespace UnitTest
             {
                 // Create SerializeContext ClassElement for a uint32_t type that is not a pointer
                 m_classElement.m_name = "Test";
-                m_classElement.m_nameCrc = AZ_CRC("Test");
+                m_classElement.m_nameCrc = AZ_CRC_CE("Test");
                 m_classElement.m_typeId = azrtti_typeid<uint32_t>();
                 m_classElement.m_dataSize = sizeof(uint32_t);
                 m_classElement.m_offset = 0;

Code/Framework/AzCore/Tests/Serialization.cpp

@@ -861,11 +861,11 @@ namespace SerializeTestClasses
                     else if (elementNode.GetName() == AZ_CRC_CE("emptyInitTextData")
                             || elementNode.GetName() == AZ_CRC_CE("listInt")
                             || elementNode.GetName() == AZ_CRC_CE("setInt")
-                            || elementNode.GetName() == AZ_CRC("usetInt")
-                            || elementNode.GetName() == AZ_CRC("umultisetInt")
+                            || elementNode.GetName() == AZ_CRC_CE("usetInt")
+                            || elementNode.GetName() == AZ_CRC_CE("umultisetInt")
                             || elementNode.GetName() == AZ_CRC_CE("mapIntFloat")
-                            || elementNode.GetName() == AZ_CRC("umapIntFloat")
-                            || elementNode.GetName() == AZ_CRC("umultimapIntFloat")
+                            || elementNode.GetName() == AZ_CRC_CE("umapIntFloat")
+                            || elementNode.GetName() == AZ_CRC_CE("umultimapIntFloat")
                             || elementNode.GetName() == AZ_CRC_CE("byteStream")
                             || elementNode.GetName() == AZ_CRC_CE("bitSet")
                             || elementNode.GetName() == AZ_CRC_CE("sharedPtr")
@@ -873,7 +873,7 @@ namespace SerializeTestClasses
                             || elementNode.GetName() == AZ_CRC_CE("uniquePtr")
                             || elementNode.GetName() == AZ_CRC_CE("forwardListInt")
                             || elementNode.GetName() == AZ_CRC_CE("fixedVectorInt")
-                            || elementNode.GetName() == AZ_CRC("vectorEnum"))
+                            || elementNode.GetName() == AZ_CRC_CE("vectorEnum"))
                     {
                         classElement.RemoveElement(i);
                     }
@@ -3671,7 +3671,7 @@ TEST_F(SerializeBasicTest, BasicTypeTest_Succeed)
             {
                 // Create SerializeContext ClassElement for a int32_t type that is not a pointer
                 m_classElement.m_name = "Test";
-                m_classElement.m_nameCrc = AZ_CRC("Test");
+                m_classElement.m_nameCrc = AZ_CRC_CE("Test");
                 m_classElement.m_typeId = azrtti_typeid<int32_t>();
                 m_classElement.m_dataSize = sizeof(int32_t);
                 m_classElement.m_offset = 0;
@@ -4606,13 +4606,13 @@ namespace UnitTest
         {
             if (classElement.GetVersion() == 0)
             {
-                auto entityIdElements = AZ::Utils::FindDescendantElements(sc, classElement, AZStd::vector<AZ::Crc32>({ AZ_CRC("m_data"), AZ_CRC("element"), AZ_CRC("Id"), AZ_CRC("id") }));
+                auto entityIdElements = AZ::Utils::FindDescendantElements(sc, classElement, AZStd::vector<AZ::Crc32>({ AZ_CRC_CE("m_data"), AZ_CRC_CE("element"), AZ_CRC_CE("Id"), AZ_CRC_CE("id") }));
                 EXPECT_EQ(1, entityIdElements.size());
                 AZ::u64 id1;
                 EXPECT_TRUE(entityIdElements.front()->GetData(id1));
                 EXPECT_EQ(47, id1);
 
-                auto vector2Elements = AZ::Utils::FindDescendantElements(sc, classElement, AZStd::vector<AZ::Crc32>({ AZ_CRC("m_positions"), AZ_CRC("element") }));
+                auto vector2Elements = AZ::Utils::FindDescendantElements(sc, classElement, AZStd::vector<AZ::Crc32>({ AZ_CRC_CE("m_positions"), AZ_CRC_CE("element") }));
                 EXPECT_EQ(2, vector2Elements.size());
                 AZ::Vector2 position;
                 EXPECT_TRUE(vector2Elements[0]->GetData(position));
@@ -4738,7 +4738,7 @@ namespace UnitTest
         {
             if (rootElement.GetVersion() == 0)
             {
-                int entityIndex = rootElement.FindElement(AZ_CRC("m_entity"));
+                int entityIndex = rootElement.FindElement(AZ_CRC_CE("m_entity"));
                 EXPECT_NE(-1, entityIndex);
 
                 AZ::SerializeContext::DataElementNode& entityElement = rootElement.GetSubElement(entityIndex);
@@ -4766,18 +4766,18 @@ namespace UnitTest
         {
             if (rootElement.GetVersion() == 0)
             {
-                int removedSetIndex = rootElement.FindElement(AZ_CRC("m_removedSet"));
+                int removedSetIndex = rootElement.FindElement(AZ_CRC_CE("m_removedSet"));
                 EXPECT_NE(-1, removedSetIndex);
 
-                int changedVectorIndex = rootElement.FindElement(AZ_CRC("m_changedVector"));
+                int changedVectorIndex = rootElement.FindElement(AZ_CRC_CE("m_changedVector"));
                 EXPECT_NE(-1, changedVectorIndex);
 
-                auto changedVectorInts = AZ::Utils::FindDescendantElements(sc, rootElement.GetSubElement(changedVectorIndex), { AZ_CRC("element") });
+                auto changedVectorInts = AZ::Utils::FindDescendantElements(sc, rootElement.GetSubElement(changedVectorIndex), { AZ_CRC_CE("element") });
                 EXPECT_EQ(2, changedVectorInts.size());
                 EXPECT_TRUE(changedVectorInts[0]->SetData(sc, 75));
                 EXPECT_TRUE(changedVectorInts[1]->SetData(sc, 50));
 
-                int addedVectorIndex = rootElement.FindElement(AZ_CRC("m_addedVector"));
+                int addedVectorIndex = rootElement.FindElement(AZ_CRC_CE("m_addedVector"));
                 EXPECT_EQ(-1, addedVectorIndex);
 
                 ContainerTest containerTest;
@@ -4805,7 +4805,7 @@ namespace UnitTest
 
                 rootElement.GetSubElement(addedStringIndex).SetData(sc, newString); // Set string element data
                 rootElement.AddElementWithData(sc, "m_addedVector", newInts); // Add the addedVector vector<int> with initialized data
-                AZ::SerializeContext::DataElementNode* changedVectorElementNode = rootElement.FindSubElement(AZ_CRC("m_changedVector"));
+                AZ::SerializeContext::DataElementNode* changedVectorElementNode = rootElement.FindSubElement(AZ_CRC_CE("m_changedVector"));
                 EXPECT_NE(nullptr, changedVectorElementNode);
                 changedVectorElementNode->RemoveElement(0);
 
@@ -4830,7 +4830,7 @@ namespace UnitTest
         {
             if (rootElement.GetVersion() == 0)
             {
-                int entityContainerIndex = rootElement.FindElement(AZ_CRC("m_entitySet"));
+                int entityContainerIndex = rootElement.FindElement(AZ_CRC_CE("m_entitySet"));
                 EXPECT_NE(-1, entityContainerIndex);
 
                 AZ::SerializeContext::DataElementNode& entityContainerElement = rootElement.GetSubElement(entityContainerIndex);
@@ -4849,7 +4849,7 @@ namespace UnitTest
         {
             if (rootElement.GetVersion() == 0)
             {
-                int stringIntMapIndex = rootElement.FindElement(AZ_CRC("m_stringIntMap"));
+                int stringIntMapIndex = rootElement.FindElement(AZ_CRC_CE("m_stringIntMap"));
                 EXPECT_NE(-1, stringIntMapIndex);
 
                 UnorderedMapContainerTest containerTest;
@@ -5126,7 +5126,7 @@ namespace UnitTest
                 EXPECT_FALSE(rootElement.GetData(reflectionWrapper));
 
                 // Drop the m_tempReflectedElement from the ReflectionWrapper
-                EXPECT_TRUE(rootElement.RemoveElementByName(AZ_CRC("m_tempReflected")));
+                EXPECT_TRUE(rootElement.RemoveElementByName(AZ_CRC_CE("m_tempReflected")));
 
                 EXPECT_TRUE(rootElement.GetData(reflectionWrapper));
             }
@@ -5654,7 +5654,7 @@ namespace UnitTest
 
     TEST_F(Serialization, AttributeTest)
     {
-        const AZ::Crc32 attributeCrc = AZ_CRC("TestAttribute");
+        const AZ::Crc32 attributeCrc = AZ_CRC_CE("TestAttribute");
         const int attributeValue = 5;
         m_serializeContext->Class<SerializeTestClasses::BaseNoRtti>()
             ->Attribute(attributeCrc, attributeValue)
@@ -7300,7 +7300,7 @@ namespace UnitTest
         static bool Convert(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
         {
             AZStd::vector<int> vec;
-            AZ::SerializeContext::DataElementNode* vecElement = classElement.FindSubElement(AZ_CRC("m_vec"));
+            AZ::SerializeContext::DataElementNode* vecElement = classElement.FindSubElement(AZ_CRC_CE("m_vec"));
             EXPECT_TRUE(vecElement != nullptr);
             bool gotData = vecElement->GetData(vec);
             EXPECT_TRUE(gotData);
@@ -8127,7 +8127,7 @@ namespace UnitTest
         {
             if (classElement.GetVersion() < 1)
             {
-                int enumIndex = classElement.FindElement(AZ_CRC("m_value"));
+                int enumIndex = classElement.FindElement(AZ_CRC_CE("m_value"));
                 if (enumIndex == -1)
                 {
                     return false;

Code/Framework/AzCore/Tests/Slice.cpp

@@ -644,7 +644,7 @@ namespace UnitTest
         {
             auto allEntitiesValidFunction = [](AZ::EntityId) { return true; };
             m_dataFlags = AZStd::make_unique<AZ::SliceComponent::DataFlagsPerEntity>(allEntitiesValidFunction);
-            m_addressOfSetFlag.push_back(AZ_CRC("Components"));
+            m_addressOfSetFlag.push_back(AZ_CRC_CE("Components"));
             m_valueOfSetFlag = AZ::DataPatch::Flag::ForceOverrideSet;
             m_entityIdToGoMissing = AZ::Entity::MakeId();
             m_entityIdToRemain = AZ::Entity::MakeId();
@@ -773,9 +773,9 @@ namespace UnitTest
         // Now modify the root slice to prevent override of the component's m_int value.
         {
             AZ::DataPatch::AddressType address;
-            address.push_back(AZ_CRC("Components"));
+            address.push_back(AZ_CRC_CE("Components"));
             address.push_back(componentId1InRootSlice);
-            address.push_back(AZ_CRC("int"));
+            address.push_back(AZ_CRC_CE("int"));
 
             rootSliceComponent->SetEntityDataFlagsAtAddress(entityId1InRootSlice, address, AZ::DataPatch::Flag::PreventOverrideSet);
 

Code/Framework/AzFramework/AzFramework/Asset/AssetProcessorMessages.h

@@ -465,7 +465,7 @@ namespace AzFramework
             AZ_RTTI(AssetDependencyInfoRequest, "{2365EEA3-D8A6-41E4-9C9F-2113D5617230}",
                     AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::AssetDependencyInfoRequest");
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::AssetDependencyInfoRequest");
 
             AssetDependencyInfoRequest() = default;
 

Code/Framework/AzFramework/AzFramework/Quality/QualitySystemComponent.cpp

@@ -372,12 +372,12 @@ namespace AzFramework
 
     void QualitySystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("QualitySystemComponentService"));
+        provided.push_back(AZ_CRC_CE("QualitySystemComponentService"));
     }
 
     void QualitySystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("QualitySystemComponentService"));
+        incompatible.push_back(AZ_CRC_CE("QualitySystemComponentService"));
     }
 
     void QualitySystemComponent::GetDependentServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& dependent)

Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.h

@@ -17,50 +17,50 @@
  * sits on the target running the VM and communicates with the remote debugger
  * through the IRemoteTools interface.
  *
- * To communicate with the agent, send TM messages to AZ_CRC("ScriptDebugAgent").
- * The agent will respond by sending TM messages to AZ_CRC("ScriptDebugger").
+ * To communicate with the agent, send TM messages to AZ_CRC_CE("ScriptDebugAgent").
+ * The agent will respond by sending TM messages to AZ_CRC_CE("ScriptDebugger").
  * See the comments in TargetManagementAPI.h" for information on how to send TM
  * messages.
  *
  * Valid commands and agent's responses:
  *  Commands that can be sent at any time:
- *      AZ_CRC("AttachDebugger")
- *          AZ_CRC("DebuggerAttached")
- *          AZ_CRC("DebuggerRefused")
- *      AZ_CRC("EnumContexts")
+ *      AZ_CRC_CE("AttachDebugger")
+ *          AZ_CRC_CE("DebuggerAttached")
+ *          AZ_CRC_CE("DebuggerRefused")
+ *      AZ_CRC_CE("EnumContexts")
  *          AZ_CRC(EnumContextsResult")
  *  Commands that can be sent when attached:
- *      AZ_CRC("DetachDebugger")
- *          AZ_CRC("DebuggerDetached") *** can also be sent to current debugger if another debugger is attaching
- *      AZ_CRC("AddBreakpoint")
- *          AZ_CRC("BreakpointAdded")
- *          AZ_CRC("BreakpointHit") *** sent when a breakpoint hits
- *      AZ_CRC("RemoveBreakpoint")
- *          AZ_CRC("BreakpointRemoved")
- *      AZ_CRC("EnumRegisteredGlobals")
- *          AZ_CRC("EnumRegisteredGlobalsResult")
- *      AZ_CRC("EnumRegisteredClasses")
- *          AZ_CRC("EnumRegisteredClassesResult")
- *      AZ_CRC("GetValue")
- *          AZ_CRC("GetValueResult")
+ *      AZ_CRC_CE("DetachDebugger")
+ *          AZ_CRC_CE("DebuggerDetached") *** can also be sent to current debugger if another debugger is attaching
+ *      AZ_CRC_CE("AddBreakpoint")
+ *          AZ_CRC_CE("BreakpointAdded")
+ *          AZ_CRC_CE("BreakpointHit") *** sent when a breakpoint hits
+ *      AZ_CRC_CE("RemoveBreakpoint")
+ *          AZ_CRC_CE("BreakpointRemoved")
+ *      AZ_CRC_CE("EnumRegisteredGlobals")
+ *          AZ_CRC_CE("EnumRegisteredGlobalsResult")
+ *      AZ_CRC_CE("EnumRegisteredClasses")
+ *          AZ_CRC_CE("EnumRegisteredClassesResult")
+ *      AZ_CRC_CE("GetValue")
+ *          AZ_CRC_CE("GetValueResult")
  *  Commands that can only be sent while NOT on a breakpoint
- *      AZ_CRC("ExecuteScript")
- *          AZ_CRC("ExecutionCompleted")
+ *      AZ_CRC_CE("ExecuteScript")
+ *          AZ_CRC_CE("ExecutionCompleted")
  *  Commands that can only be sent while sitting on a breakpoint
- *      AZ_CRC("GetCallstack")
- *          AZ_CRC("CallstackResult")
- *      AZ_CRC("EnumLocals")
- *          AZ_CRC("EnumLocalsResult")
- *      AZ_CRC("SetValue")
- *          AZ_CRC("SetValueResult")
- *      AZ_CRC("StepOver")
- *          AZ_CRC("Ack")
- *      AZ_CRC("StepIn")
- *          AZ_CRC("Ack")
- *      AZ_CRC("StepOut")
- *          AZ_CRC("Ack")
- *      AZ_CRC("Continue")
- *          AZ_CRC("Ack")
+ *      AZ_CRC_CE("GetCallstack")
+ *          AZ_CRC_CE("CallstackResult")
+ *      AZ_CRC_CE("EnumLocals")
+ *          AZ_CRC_CE("EnumLocalsResult")
+ *      AZ_CRC_CE("SetValue")
+ *          AZ_CRC_CE("SetValueResult")
+ *      AZ_CRC_CE("StepOver")
+ *          AZ_CRC_CE("Ack")
+ *      AZ_CRC_CE("StepIn")
+ *          AZ_CRC_CE("Ack")
+ *      AZ_CRC_CE("StepOut")
+ *          AZ_CRC_CE("Ack")
+ *      AZ_CRC_CE("Continue")
+ *          AZ_CRC_CE("Ack")
  */
 
 namespace AzFramework

Code/Framework/AzFramework/AzFramework/Visibility/OctreeSystemComponent.cpp

@@ -567,12 +567,12 @@ namespace AzFramework
 
     void OctreeSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("OctreeService"));
+        provided.push_back(AZ_CRC_CE("OctreeService"));
     }
 
     void OctreeSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("OctreeService"));
+        incompatible.push_back(AZ_CRC_CE("OctreeService"));
     }
 
     OctreeSystemComponent::OctreeSystemComponent()        

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/EditorPrefabComponent.cpp

@@ -51,12 +51,12 @@ namespace AzToolsFramework
 
         void EditorPrefabComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorPrefabInstanceContainerService"));
+            services.push_back(AZ_CRC_CE("EditorPrefabInstanceContainerService"));
         }
 
         void EditorPrefabComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorPrefabInstanceContainerService"));
+            services.push_back(AZ_CRC_CE("EditorPrefabInstanceContainerService"));
         }
 
         void EditorPrefabComponent::Activate()

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Notifications/ToastBus.h

@@ -42,7 +42,7 @@ namespace AzToolsFramework
     /**
     * An EBus used to hide or show toast notifications.  Generally, these request are handled by a
     * ToastNotificationsView that has been created with a specific ToastRequestBusId
-    * e.g. AZ_CRC("ExampleToastNotificationView")
+    * e.g. AZ_CRC_CE("ExampleToastNotificationView")
     */
     class ToastRequests
         : public AZ::EBusTraits

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabIntegrationManager.cpp

@@ -1354,7 +1354,7 @@ namespace AzToolsFramework
                 PrefabSaveHandler::GenerateSuggestedFilenameFromEntities(prefabRootEntities, suggestedName);
 
                 if (!PrefabSaveHandler::QueryUserForPrefabSaveLocation(
-                        suggestedName, targetDirectory, AZ_CRC("PrefabUserSettings"), activeWindow, prefabName, prefabFilePath))
+                        suggestedName, targetDirectory, AZ_CRC_CE("PrefabUserSettings"), activeWindow, prefabName, prefabFilePath))
                 {
                     // User canceled prefab creation, or error prevented continuation.
                     return;

Code/Framework/AzToolsFramework/AzToolsFramework/UI/Prefab/PrefabSaveLoadHandler.cpp

@@ -422,7 +422,7 @@ namespace AzToolsFramework
             AZ_Assert(mainWindow != nullptr, "PrefabSaveHandler - Editor MainWindow is not available.");
 
             m_prefabToastNotificationsView =
-                AZStd::make_unique<AzToolsFramework::ToastNotificationsView>(mainWindow, AZ_CRC("PrefabToastNotificationsView"));
+                AZStd::make_unique<AzToolsFramework::ToastNotificationsView>(mainWindow, AZ_CRC_CE("PrefabToastNotificationsView"));
 
             m_prefabToastNotificationsView->SetRejectDuplicates(false);
             m_prefabToastNotificationsView->SetAnchorPoint(QPoint(1, 1));
@@ -648,7 +648,7 @@ namespace AzToolsFramework
             AZStd::string prefabNameFiltered = prefabName;
             AZ::StringFunc::Replace(prefabNameFiltered, ' ', '_');
 
-            auto settings = AZ::UserSettings::CreateFind<PrefabUserSettings>(AZ_CRC("PrefabUserSettings"), AZ::UserSettings::CT_LOCAL);
+            auto settings = AZ::UserSettings::CreateFind<PrefabUserSettings>(AZ_CRC_CE("PrefabUserSettings"), AZ::UserSettings::CT_LOCAL);
             if (settings->m_autoNumber)
             {
                 AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI.h

@@ -295,7 +295,7 @@ namespace AzToolsFramework
         // like this, which will cause the property manager to be ready first:
         // virtual void GetRequiredServices(DependencyArrayType& required) const
         //{
-        //      required.push_back(AZ_CRC("PropertyManagerService"));
+        //      required.push_back(AZ_CRC_CE("PropertyManagerService"));
         //}
 
         virtual void RegisterPropertyType(PropertyHandlerBase* pHandler) = 0;

Code/Framework/AzToolsFramework/AzToolsFramework/UI/PropertyEditor/PropertyEditorAPI_Internals.h

@@ -120,7 +120,7 @@ namespace AzToolsFramework
         virtual void RegisterWithPropertySystem(AZ::DocumentPropertyEditor::PropertyEditorSystemInterface* /*system*/) {}
 
         // you need to define this.
-        virtual AZ::u32 GetHandlerName() const = 0;  // AZ_CRC("IntSlider")
+        virtual AZ::u32 GetHandlerName() const = 0;  // AZ_CRC_CE("IntSlider")
 
         // specify true if you want the user to be able to either specify no handler or specify "Default" as the handler.
         // and still get your handler.

Code/Framework/AzToolsFramework/Tests/ComponentAddRemove.cpp

@@ -53,7 +53,7 @@ namespace UnitTest
                 {
                     editContext->Class<LeatherBootsComponent>("Leather Boots", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
                 }
             }
         }
@@ -90,7 +90,7 @@ namespace UnitTest
                 {
                     editContext->Class<WoolSocksComponent>("Wool Socks", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
                 }
             }
         }
@@ -124,7 +124,7 @@ namespace UnitTest
                 {
                     editContext->Class<HatesSocksComponent>("Hates Socks", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
                 }
             }
         }
@@ -157,7 +157,7 @@ namespace UnitTest
                 {
                     editContext->Class<BlueJeansComponent>("Blue Jeans", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
                 }
             }
         }
@@ -192,7 +192,7 @@ namespace UnitTest
                 {
                     editContext->Class<WhiteBriefsComponent>("White Briefs", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
                 }
             }
         }
@@ -226,7 +226,7 @@ namespace UnitTest
                 {
                     editContext->Class<HeartBoxersComponent>("Heart Boxers", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
                 }
             }
         }
@@ -260,7 +260,7 @@ namespace UnitTest
                 {
                     editContext->Class<KnifeSheathComponent>("Knife Sheath", "")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
                 }
             }
         }
@@ -767,7 +767,7 @@ namespace UnitTest
         ASSERT_EQ(pendingComponentInfo.m_validComponentsThatAreIncompatible.size(), 0);
         ASSERT_EQ(pendingComponentInfo.m_pendingComponentsWithRequiredServices.size(), 0);
         // And that missing service should be the BeltService
-        ASSERT_EQ(pendingComponentInfo.m_missingRequiredServices[0], AZ_CRC("BeltService"));
+        ASSERT_EQ(pendingComponentInfo.m_missingRequiredServices[0], AZ_CRC_CE("BeltService"));
 
         // Entity 1 should remain untouched
         ASSERT_EQ(2, m_entity1Counter.GetCount());
@@ -800,7 +800,7 @@ namespace UnitTest
         ASSERT_EQ(pendingComponentInfo.m_validComponentsThatAreIncompatible.size(), 0);
         ASSERT_EQ(pendingComponentInfo.m_pendingComponentsWithRequiredServices.size(), 0);
         // And that missing service should be the "UnderwearService"
-        ASSERT_EQ(pendingComponentInfo.m_missingRequiredServices[0], AZ_CRC("UnderwearService"));
+        ASSERT_EQ(pendingComponentInfo.m_missingRequiredServices[0], AZ_CRC_CE("UnderwearService"));
 
         outcome = AzToolsFramework::AddComponents<WhiteBriefsComponent>::ToEntities(m_entity1);
 
@@ -1173,12 +1173,12 @@ namespace UnitTest
 
             static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
             {
-                provided.push_back(AZ_CRC("ValidComponentService"));
+                provided.push_back(AZ_CRC_CE("ValidComponentService"));
             }
 
             static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
             {
-                incompatible.push_back(AZ_CRC("ValidComponentService"));
+                incompatible.push_back(AZ_CRC_CE("ValidComponentService"));
             }
 
             static void Reflect(ReflectContext* reflection)
@@ -1214,12 +1214,12 @@ namespace UnitTest
 
             static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
             {
-                provided.push_back(AZ_CRC("HiddenComponentService"));
+                provided.push_back(AZ_CRC_CE("HiddenComponentService"));
             }
 
             static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
             {
-                incompatible.push_back(AZ_CRC("HiddenComponentService"));
+                incompatible.push_back(AZ_CRC_CE("HiddenComponentService"));
             }
 
             static void Reflect(ReflectContext* reflection)

Code/Framework/AzToolsFramework/Tests/Entity/EditorEntitySearchComponentTests.cpp

@@ -44,7 +44,7 @@ namespace AzToolsFramework
                     editContext->Class<EntitySearch_TestComponent1>("SearchTestComponent1", "Component 1 for Entity Search Unit Tests")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
-                            ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                            ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                             ->Attribute(AZ::Edit::Attributes::Category, "Entity Search Test Components")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
                             ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
@@ -103,7 +103,7 @@ namespace AzToolsFramework
                     editContext->Class<EntitySearch_TestComponent2>("SearchTestComponent2", "Component 2 for Entity Search Unit Tests")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
-                            ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                            ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                             ->Attribute(AZ::Edit::Attributes::Category, "Entity Search Test Components")
                             ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
                             ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")

Code/Framework/AzToolsFramework/Tests/EntityInspectorTests.cpp

@@ -60,12 +60,12 @@ namespace UnitTest
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("InspectorTestService1"));
+            services.push_back(AZ_CRC_CE("InspectorTestService1"));
         }
 
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("InspectorTestService1"));
+            services.push_back(AZ_CRC_CE("InspectorTestService1"));
         }
 
         ~Inspector_TestComponent1() override
@@ -116,7 +116,7 @@ namespace UnitTest
                     editContext->Class<Inspector_TestComponent2>("InspectorTestComponent2", "Component 2 for AZ Tools Framework Unit Tests")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, true)
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                         ->Attribute(AZ::Edit::Attributes::Category, "Inspector Test Components")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Tag.png")
                         ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Tag.png")
@@ -129,12 +129,12 @@ namespace UnitTest
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("InspectorTestService2"));
+            services.push_back(AZ_CRC_CE("InspectorTestService2"));
         }
 
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("InspectorTestService2"));
+            services.push_back(AZ_CRC_CE("InspectorTestService2"));
         }
 
         ~Inspector_TestComponent2() override
@@ -197,12 +197,12 @@ namespace UnitTest
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("InspectorTestService3"));
+            services.push_back(AZ_CRC_CE("InspectorTestService3"));
         }
 
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("InspectorTestService3"));
+            services.push_back(AZ_CRC_CE("InspectorTestService3"));
         }
 
         ~Inspector_TestComponent3() override

Code/Framework/AzToolsFramework/Tests/GenericComponentWrapperTest.cpp

@@ -149,7 +149,7 @@ public:
             {
                 editContext->Class<InGameOnlyComponent>("InGame Only", "")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
             }
         }
     }
@@ -174,7 +174,7 @@ public:
             {
                 editContext->Class<NoneEditorComponent>("None Editor", "")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"));
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"));
             }
         }
     }

Code/Framework/AzToolsFramework/Tests/InstanceDataHierarchy.cpp

@@ -389,11 +389,11 @@ namespace UnitTest
                 // note: reflection serialization context values are used for lookup (crcs stored)
                 //       if a more specific address is required, start from field and work up to structures/components etc
                 //       (see addrSubDataInt below as an example)
-                InstanceDataNode::Address addrFloat = { AZ_CRC("Float") };
-                InstanceDataNode::Address addrString = { AZ_CRC("String") };
-                InstanceDataNode::Address addrNormalContainer = { AZ_CRC("NormalContainer") };
-                InstanceDataNode::Address addrSubData = { AZ_CRC("SubData") };
-                InstanceDataNode::Address addrSubDataInt = { AZ_CRC("Int"), AZ_CRC("SubData") };
+                InstanceDataNode::Address addrFloat = { AZ_CRC_CE("Float") };
+                InstanceDataNode::Address addrString = { AZ_CRC_CE("String") };
+                InstanceDataNode::Address addrNormalContainer = { AZ_CRC_CE("NormalContainer") };
+                InstanceDataNode::Address addrSubData = { AZ_CRC_CE("SubData") };
+                InstanceDataNode::Address addrSubDataInt = { AZ_CRC_CE("Int"), AZ_CRC_CE("SubData") };
 
                 // find InstanceDataNodes using partial address
                 InstanceDataNode* foundFloat = idhTestComponent.FindNodeByPartialAddress(addrFloat);
@@ -410,7 +410,7 @@ namespace UnitTest
                 AZ_TEST_ASSERT(foundSubDataInt);
 
                 // check a case where we know the address is incorrect and we will not find an InstanceDataNode
-                InstanceDataNode::Address addrInvalid = { AZ_CRC("INVALID") };
+                InstanceDataNode::Address addrInvalid = { AZ_CRC_CE("INVALID") };
                 InstanceDataNode* foundInvalid = idhTestComponent.FindNodeByPartialAddress(addrInvalid);
                 AZ_TEST_ASSERT(foundInvalid == nullptr);
 
@@ -702,8 +702,8 @@ namespace UnitTest
             idh.AddRootInstance(&ec, azrtti_typeid<EnumContainer>());
             idh.Build(&serializeContext, 0);
 
-            InstanceDataNode* enumNode = idh.FindNodeByPartialAddress({ AZ_CRC("Enum") });
-            InstanceDataNode* enumVectorNode = idh.FindNodeByPartialAddress({ AZ_CRC("EnumVector") });
+            InstanceDataNode* enumNode = idh.FindNodeByPartialAddress({ AZ_CRC_CE("Enum") });
+            InstanceDataNode* enumVectorNode = idh.FindNodeByPartialAddress({ AZ_CRC_CE("EnumVector") });
 
             ASSERT_NE(enumNode, nullptr);
             ASSERT_NE(enumVectorNode, nullptr);
@@ -711,7 +711,7 @@ namespace UnitTest
             auto getEnumData = [&ec](const AzToolsFramework::InstanceDataNode& node) -> Uuid
             {
                 Uuid id = Uuid::CreateNull();
-                auto attribute = node.GetElementMetadata()->FindAttribute(AZ_CRC("EnumType"));
+                auto attribute = node.GetElementMetadata()->FindAttribute(AZ_CRC_CE("EnumType"));
                 auto attributeData = azrtti_cast<AttributeData<AZ::TypeId>*>(attribute);
                 if (attributeData)
                 {
@@ -1017,14 +1017,14 @@ namespace UnitTest
             idh.Build(&serializeContext, 0);
 
             AZStd::unordered_map<AZ::u32, AZStd::unique_ptr<KeyTestData>> keyTestData;
-            keyTestData[AZ_CRC("map")] = TypedKeyTestData<AZStd::string>::Create({"A", "B", "lorem ipsum"});
-            keyTestData[AZ_CRC("unorderedMap")] = TypedKeyTestData<AZStd::pair<int, double>>::Create({ {5, 1.0}, {5, -2.0} });
-            keyTestData[AZ_CRC("set")] = TypedKeyTestData<int>::Create({2, 4, -255, 999});
-            keyTestData[AZ_CRC("unorderedSet")] = TypedKeyTestData<AZ::u64>::Create({500000, 9, 0, 42, 42});
-            keyTestData[AZ_CRC("multiMap")] = TypedKeyTestData<int>::Create({-1, 2, -3, 4, -5, 6});
-            keyTestData[AZ_CRC("nestedMap")] = TypedKeyTestData<int>::Create({1, 10, 100, 1000});
-            keyTestData[AZ_CRC("uncollapsableMap")] = TypedKeyTestData<CustomKeyWithoutStringRepresentation>::Create({{0}, {1}});
-            keyTestData[AZ_CRC("collapsableMap")] = TypedKeyTestData<CustomKeyWithStringRepresentation>::Create({{0}, {1}});
+            keyTestData[AZ_CRC_CE("map")] = TypedKeyTestData<AZStd::string>::Create({"A", "B", "lorem ipsum"});
+            keyTestData[AZ_CRC_CE("unorderedMap")] = TypedKeyTestData<AZStd::pair<int, double>>::Create({ {5, 1.0}, {5, -2.0} });
+            keyTestData[AZ_CRC_CE("set")] = TypedKeyTestData<int>::Create({2, 4, -255, 999});
+            keyTestData[AZ_CRC_CE("unorderedSet")] = TypedKeyTestData<AZ::u64>::Create({500000, 9, 0, 42, 42});
+            keyTestData[AZ_CRC_CE("multiMap")] = TypedKeyTestData<int>::Create({-1, 2, -3, 4, -5, 6});
+            keyTestData[AZ_CRC_CE("nestedMap")] = TypedKeyTestData<int>::Create({1, 10, 100, 1000});
+            keyTestData[AZ_CRC_CE("uncollapsableMap")] = TypedKeyTestData<CustomKeyWithoutStringRepresentation>::Create({{0}, {1}});
+            keyTestData[AZ_CRC_CE("collapsableMap")] = TypedKeyTestData<CustomKeyWithStringRepresentation>::Create({{0}, {1}});
 
             auto insertKeysIntoContainer = [&serializeContext](AzToolsFramework::InstanceDataNode& node, KeyTestData* keysToInsert)
             {
@@ -1039,7 +1039,7 @@ namespace UnitTest
                 ASSERT_NE(associativeInterface, nullptr);
                 auto key = associativeInterface->CreateKey();
 
-                auto attribute = containerClassElement ->FindAttribute(AZ_CRC("KeyType"));
+                auto attribute = containerClassElement ->FindAttribute(AZ_CRC_CE("KeyType"));
                 auto attributeData = azrtti_cast<AttributeData<AZ::TypeId>*>(attribute);
                 ASSERT_NE(attributeData, nullptr);
                 auto keyId = attributeData->Get(node.FirstInstance());
@@ -1070,17 +1070,17 @@ namespace UnitTest
             for (InstanceDataNode& node : idh.GetChildren())
             {
                 const AZ::SerializeContext::ClassElement* element = node.GetElementMetadata();
-                if (element->m_nameCrc == AZ_CRC("nestedMap"))
+                if (element->m_nameCrc == AZ_CRC_CE("nestedMap"))
                 {
                     auto children = node.GetChildren();
                     // We should have entries for each inserted key in the nested map
-                    EXPECT_EQ(children.size(), keyTestData[AZ_CRC("nestedMap")]->NumberOfKeys());
+                    EXPECT_EQ(children.size(), keyTestData[AZ_CRC_CE("nestedMap")]->NumberOfKeys());
                     for (AzToolsFramework::InstanceDataNode& child : children)
                     {
                         insertKeysIntoContainer(child.GetChildren().back(), nestedKeys.get());
                     }
                 }
-                else if (element->m_nameCrc == AZ_CRC("collapsableMap"))
+                else if (element->m_nameCrc == AZ_CRC_CE("collapsableMap"))
                 {
                     auto children = node.GetChildren();
                     EXPECT_GT(children.size(), 0);
@@ -1091,7 +1091,7 @@ namespace UnitTest
                         EXPECT_NE(name.find(CustomKeyWithStringRepresentation::KeyPrefix()), AZStd::string::npos);
                     }
                 }
-                else if (element->m_nameCrc == AZ_CRC("uncollapsableMap"))
+                else if (element->m_nameCrc == AZ_CRC_CE("uncollapsableMap"))
                 {
                     auto children = node.GetChildren();
                     EXPECT_GT(children.size(), 0);
@@ -1105,8 +1105,8 @@ namespace UnitTest
                         auto valueNode = *keyValueChildrenIterator;
 
                         // Ensure key/value pairs that can't be collapsed get labels based on type
-                        EXPECT_EQ(AZ::Crc32(keyNode.GetElementEditMetadata()->m_name), AZ_CRC("Key<CustomKeyWithoutStringRepresentation>"));
-                        EXPECT_EQ(AZ::Crc32(valueNode.GetElementEditMetadata()->m_name), AZ_CRC("Value<int>"));
+                        EXPECT_EQ(AZ::Crc32(keyNode.GetElementEditMetadata()->m_name), AZ_CRC_CE("Key<CustomKeyWithoutStringRepresentation>"));
+                        EXPECT_EQ(AZ::Crc32(valueNode.GetElementEditMetadata()->m_name), AZ_CRC_CE("Value<int>"));
                     }
                 }
             }
@@ -1117,7 +1117,7 @@ namespace UnitTest
             for (InstanceDataNode& node : idh.GetChildren())
             {
                 const AZ::SerializeContext::ClassElement* element = node.GetElementMetadata();
-                if (element->m_nameCrc == AZ_CRC("map") || element->m_nameCrc == AZ_CRC("unorderedMap") || element->m_nameCrc == AZ_CRC("nestedMap"))
+                if (element->m_nameCrc == AZ_CRC_CE("map") || element->m_nameCrc == AZ_CRC_CE("unorderedMap") || element->m_nameCrc == AZ_CRC_CE("nestedMap"))
                 {
                     for (InstanceDataNode& pair : node.GetChildren())
                     {
@@ -1255,7 +1255,7 @@ namespace UnitTest
                         editContext->Class<UIElementContainer>("Test", "")
                             ->UIElement("TestHandler", "UIElement")
                             ->DataElement(nullptr, &UIElementContainer::m_data)
-                            ->UIElement(AZ_CRC("TestHandler2"), "UIElement2")
+                            ->UIElement(AZ_CRC_CE("TestHandler2"), "UIElement2")
                             ;
                     }
                 }
@@ -1292,9 +1292,9 @@ namespace UnitTest
             ++it;
             Crc32 uiHandler = 0;
             EXPECT_EQ(it->ReadAttribute(AZ::Edit::UIHandlers::Handler, uiHandler), true);
-            EXPECT_EQ(uiHandler, AZ_CRC("TestHandler"));
+            EXPECT_EQ(uiHandler, AZ_CRC_CE("TestHandler"));
             EXPECT_STREQ(it->GetElementMetadata()->m_name, "UIElement");
-            EXPECT_EQ(it->GetElementMetadata()->m_nameCrc, AZ_CRC("UIElement"));
+            EXPECT_EQ(it->GetElementMetadata()->m_nameCrc, AZ_CRC_CE("UIElement"));
 
             // The "data" element is in between the two UIElements
             ++it;
@@ -1303,9 +1303,9 @@ namespace UnitTest
             ++it;
             uiHandler = 0;
             EXPECT_EQ(it->ReadAttribute(AZ::Edit::UIHandlers::Handler, uiHandler), true);
-            EXPECT_EQ(uiHandler, AZ_CRC("TestHandler2"));
+            EXPECT_EQ(uiHandler, AZ_CRC_CE("TestHandler2"));
             EXPECT_STREQ(it->GetElementMetadata()->m_name, "UIElement2");
-            EXPECT_EQ(it->GetElementMetadata()->m_nameCrc, AZ_CRC("UIElement2"));
+            EXPECT_EQ(it->GetElementMetadata()->m_nameCrc, AZ_CRC_CE("UIElement2"));
         }
     };
 
@@ -1435,7 +1435,7 @@ namespace UnitTest
                             ->Attribute(AZ::Edit::Attributes::AcceptsMultiEdit, false)
                         ->UIElement("TestHandler", "aggregatedUIElement")
                             ->Attribute(AZ::Edit::Attributes::AcceptsMultiEdit, true)
-                        ->UIElement(AZ_CRC("TestHandler2"), "notAggregatedUIElement")
+                        ->UIElement(AZ_CRC_CE("TestHandler2"), "notAggregatedUIElement")
                     ;
                 }
             }

Code/Framework/AzToolsFramework/Tests/Prefab/PrefabProcessorRemoveComponentPerPlatformTests.cpp

@@ -24,7 +24,7 @@ namespace UnitTest
 
     const char* PlatformTag = "platform_1";
     const char* EntityName = "entity_1";
-    const AZ::Crc32 ComponentService = AZ_CRC("good_service");
+    const AZ::Crc32 ComponentService = AZ_CRC_CE("good_service");
 
     class KeepThisComponent : public AZ::Component
     {

Code/Framework/AzToolsFramework/Tests/SliceUpgradeTestsData.h

@@ -202,7 +202,7 @@ namespace UnitTest
             // - Data (int) becomes Info (float) with the conversion Info = Data + 13.5f
             if (classElement.GetVersion() == 0)
             {
-                int dataIndex = classElement.FindElement(AZ_CRC("Data"));
+                int dataIndex = classElement.FindElement(AZ_CRC_CE("Data"));
 
                 if (dataIndex < 0)
                 {

Code/Tools/LuaIDE/Source/LUA/LUAEditorSettingsDialog.cpp

@@ -56,7 +56,7 @@ namespace LUAEditor
         m_gui->propertyEditor->setObjectName("m_gui->propertyEditor");
         m_gui->propertyEditor->setMinimumHeight(500);
         m_gui->propertyEditor->setMaximumHeight(1000);
-        m_gui->propertyEditor->SetSavedStateKey(AZ_CRC("LuaIDE_SyntaxStyleSettings"));
+        m_gui->propertyEditor->SetSavedStateKey(AZ_CRC_CE("LuaIDE_SyntaxStyleSettings"));
 
         setModal(false);
 

Code/Tools/SceneAPI/SceneData/Rules/CoordinateSystemRule.cpp

@@ -195,7 +195,7 @@ namespace AZ::SceneAPI::SceneData
                 if (currentRuleNode.GetId() == oldCoordSysRuleId)
                 {
                     int targetCoordinateSystem = 0;
-                    currentRuleNode.FindSubElementAndGetData(AZ_CRC("targetCoordinateSystem"), targetCoordinateSystem);
+                    currentRuleNode.FindSubElementAndGetData(AZ_CRC_CE("targetCoordinateSystem"), targetCoordinateSystem);
 
                     AZStd::shared_ptr<CoordinateSystemRule> coordSysRule = AZStd::make_shared<CoordinateSystemRule>();
                     coordSysRule->SetTargetCoordinateSystem(static_cast<AZ::SceneAPI::DataTypes::ICoordinateSystemRule::CoordinateSystem>(targetCoordinateSystem));

Gems/AWSCore/Code/Source/ScriptCanvas/AWSScriptBehaviorsComponent.cpp

@@ -29,7 +29,7 @@ namespace AWSCore
                 editContext->Class<AWSScriptBehaviorsComponent>("AWSScriptBehaviors", "Provides ScriptCanvas functions for calling AWS")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "Scripting")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("AWS"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("AWS"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ;
             }

Gems/Achievements/Code/Source/AchievementsSystemComponent.cpp

@@ -137,13 +137,13 @@ namespace Achievements
     ////////////////////////////////////////////////////////////////////////////////////////
     void AchievementsSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("AchievementsService"));
+        provided.push_back(AZ_CRC_CE("AchievementsService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////
     void AchievementsSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("AchievementsService"));
+        incompatible.push_back(AZ_CRC_CE("AchievementsService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////

Gems/AssetValidation/Code/Source/AssetValidationSystemComponent.cpp

@@ -48,12 +48,12 @@ namespace AssetValidation
 
     void AssetValidationSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("AssetValidationService"));
+        provided.push_back(AZ_CRC_CE("AssetValidationService"));
     }
 
     void AssetValidationSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("AssetValidationService"));
+        incompatible.push_back(AZ_CRC_CE("AssetValidationService"));
     }
 
     void AssetValidationSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/Atom/RHI/Code/Source/RHI.Private/FactoryManagerSystemComponent.cpp

@@ -69,7 +69,7 @@ namespace AZ::RHI
 
     void FactoryManagerSystemComponent::GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent)
     {
-        dependent.push_back(AZ_CRC("GraphicsProfilerService"));
+        dependent.push_back(AZ_CRC_CE("GraphicsProfilerService"));
         dependent.push_back(AZ_CRC_CE("DeviceAttributesSystemComponentService"));
     }
 

Gems/Atom/RHI/Code/Source/RHI.Profiler/PIX/PIXSystemComponent.cpp

@@ -74,7 +74,7 @@ namespace AZ::RHI
 
     void PIXSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("GraphicsProfilerService"));
+        provided.push_back(AZ_CRC_CE("GraphicsProfilerService"));
     }
 
     void PIXSystemComponent::Activate()

Gems/Atom/RHI/Code/Source/RHI.Profiler/RenderDoc/RenderDocSystemComponent.cpp

@@ -26,7 +26,7 @@ namespace AZ::RHI
 
     void RenderDocSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("GraphicsProfilerService"));
+        provided.push_back(AZ_CRC_CE("GraphicsProfilerService"));
     }
 
     void RenderDocSystemComponent::Activate()

Gems/AtomLyIntegration/AtomFont/Code/Source/AtomFontSystemComponent.cpp

@@ -44,12 +44,12 @@ namespace AZ
 
         void AtomFontSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("AtomFontService"));
+            provided.push_back(AZ_CRC_CE("AtomFontService"));
         }
 
         void AtomFontSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("AtomFontService"));
+            incompatible.push_back(AZ_CRC_CE("AtomFontService"));
         }
 
         void AtomFontSystemComponent::GetRequiredServices([[maybe_unused]] AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/AtomLyIntegration/AtomImGuiTools/Code/Source/AtomImGuiToolsSystemComponent.cpp

@@ -39,12 +39,12 @@ namespace AtomImGuiTools
 
     void AtomImGuiToolsSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("AtomImGuiToolsService"));
+        provided.push_back(AZ_CRC_CE("AtomImGuiToolsService"));
     }
 
     void AtomImGuiToolsSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("AtomImGuiToolsService"));
+        incompatible.push_back(AZ_CRC_CE("AtomImGuiToolsService"));
     }
 
     void AtomImGuiToolsSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/AtomLyIntegration/AtomRenderOptions/Code/Source/AtomRenderOptionsSystemComponent.cpp

@@ -31,12 +31,12 @@ namespace AZ::Render
 
     void AtomRenderOptionsSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("AtomRenderOptionsService"));
+        provided.push_back(AZ_CRC_CE("AtomRenderOptionsService"));
     }
 
     void AtomRenderOptionsSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("AtomRenderOptionsService"));
+        incompatible.push_back(AZ_CRC_CE("AtomRenderOptionsService"));
     }
 
     void AtomRenderOptionsSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/AtomLyIntegration/AtomViewportDisplayIcons/Code/Source/AtomViewportDisplayIconsSystemComponent.cpp

@@ -62,12 +62,12 @@ namespace AZ::Render
 
     void AtomViewportDisplayIconsSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("ViewportDisplayIconsService"));
+        provided.push_back(AZ_CRC_CE("ViewportDisplayIconsService"));
     }
 
     void AtomViewportDisplayIconsSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("ViewportDisplayIconsService"));
+        incompatible.push_back(AZ_CRC_CE("ViewportDisplayIconsService"));
     }
 
     void AtomViewportDisplayIconsSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/AtomLyIntegration/AtomViewportDisplayInfo/Code/Source/AtomViewportDisplayInfoSystemComponent.cpp

@@ -71,12 +71,12 @@ namespace AZ::Render
 
     void AtomViewportDisplayInfoSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("ViewportDisplayInfoService"));
+        provided.push_back(AZ_CRC_CE("ViewportDisplayInfoService"));
     }
 
     void AtomViewportDisplayInfoSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("ViewportDisplayInfoService"));
+        incompatible.push_back(AZ_CRC_CE("ViewportDisplayInfoService"));
     }
 
     void AtomViewportDisplayInfoSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/MaterialAssignmentId.cpp

@@ -19,7 +19,7 @@ namespace AZ
         {
             if (classElement.GetVersion() < 2)
             {
-                constexpr AZ::u32 materialAssetIdCrc = AZ_CRC("materialAssetId");
+                constexpr AZ::u32 materialAssetIdCrc = AZ_CRC_CE("materialAssetId");
 
                 AZ::Data::AssetId materialAssetId;
                 if (!classElement.GetChildData(materialAssetIdCrc, materialAssetId))

Gems/AtomLyIntegration/CommonFeatures/Code/Source/OcclusionCullingPlane/OcclusionCullingPlaneComponentController.cpp

@@ -68,7 +68,7 @@ namespace AZ
 
         void OcclusionCullingPlaneComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
-            required.push_back(AZ_CRC("TransformService"));
+            required.push_back(AZ_CRC_CE("TransformService"));
         }
 
         OcclusionCullingPlaneComponentController::OcclusionCullingPlaneComponentController(const OcclusionCullingPlaneComponentConfig& config)

Gems/AtomLyIntegration/CommonFeatures/Code/Source/PostProcess/LookModification/LookModificationComponentController.cpp

@@ -54,7 +54,7 @@ namespace AZ
 
         void LookModificationComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("LookModificationService"));
+            incompatible.push_back(AZ_CRC_CE("LookModificationService"));
         }
 
         void LookModificationComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/AtomLyIntegration/CommonFeatures/Code/Source/Scripting/EntityReferenceComponentController.cpp

@@ -27,12 +27,12 @@ namespace AZ
 
         void EntityReferenceComponentController::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("EntityReferenceService"));
+            provided.push_back(AZ_CRC_CE("EntityReferenceService"));
         }
 
         void EntityReferenceComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("EntityReferenceService"));
+            incompatible.push_back(AZ_CRC_CE("EntityReferenceService"));
         }
 
         EntityReferenceComponentController::EntityReferenceComponentController(const EntityReferenceComponentConfig& config)

Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyAtmosphere/SkyAtmosphereComponentController.cpp

@@ -76,7 +76,7 @@ namespace AZ::Render
 
     void SkyAtmosphereComponentController::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("SkyAtmosphereService"));
+        provided.push_back(AZ_CRC_CE("SkyAtmosphereService"));
     }
 
     void SkyAtmosphereComponentController::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
@@ -86,7 +86,7 @@ namespace AZ::Render
 
     void SkyAtmosphereComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
     {
-        required.push_back(AZ_CRC("TransformService"));
+        required.push_back(AZ_CRC_CE("TransformService"));
     }
 
     SkyAtmosphereComponentController::SkyAtmosphereComponentController(const SkyAtmosphereComponentConfig& config)

Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/HDRiSkyboxComponentController.cpp

@@ -59,7 +59,7 @@ namespace AZ
 
         void HDRiSkyboxComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
-            required.push_back(AZ_CRC("TransformService"));
+            required.push_back(AZ_CRC_CE("TransformService"));
         }
 
         HDRiSkyboxComponentController::HDRiSkyboxComponentController(const HDRiSkyboxComponentConfig& config)

Gems/AtomLyIntegration/CommonFeatures/Code/Source/SkyBox/PhysicalSkyComponentController.cpp

@@ -60,7 +60,7 @@ namespace AZ
 
         void PhysicalSkyComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
-            required.push_back(AZ_CRC("TransformService"));
+            required.push_back(AZ_CRC_CE("TransformService"));
         }
 
         PhysicalSkyComponentController::PhysicalSkyComponentController(const PhysicalSkyComponentConfig& config)

Gems/AudioSystem/Code/Source/AudioSystemGemSystemComponent.cpp

@@ -65,12 +65,12 @@ namespace AudioSystemGem
 
     void AudioSystemGemSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("AudioSystemGemService"));
+        provided.push_back(AZ_CRC_CE("AudioSystemGemService"));
     }
 
     void AudioSystemGemSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("AudioSystemGemService"));
+        incompatible.push_back(AZ_CRC_CE("AudioSystemGemService"));
     }
 
     void AudioSystemGemSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/BarrierInput/Code/Source/BarrierInputSystemComponent.cpp

@@ -71,13 +71,13 @@ namespace BarrierInput
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void BarrierInputSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("BarrierInputService"));
+        provided.push_back(AZ_CRC_CE("BarrierInputService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void BarrierInputSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("BarrierInputService"));
+        incompatible.push_back(AZ_CRC_CE("BarrierInputService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////

Gems/DiffuseProbeGrid/Code/Source/Components/DiffuseProbeGridComponentController.cpp

@@ -93,7 +93,7 @@ namespace AZ
         void DiffuseProbeGridComponentController::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
             required.push_back(AZ_CRC_CE("BoxShapeService"));
-            required.push_back(AZ_CRC("TransformService"));
+            required.push_back(AZ_CRC_CE("TransformService"));
         }
 
         DiffuseProbeGridComponentController::DiffuseProbeGridComponentController(const DiffuseProbeGridComponentConfig& config)

Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/ActorGroup.cpp

@@ -163,7 +163,7 @@ namespace EMotionFX
                 if (version < 2)
                 {
                     result = result && classElement.AddElementWithData<AZ::Uuid>(context, "id", AZ::Uuid::CreateNull()) != -1;
-                    classElement.RemoveElementByName(AZ_CRC("autoCreateTrajectoryNode"));
+                    classElement.RemoveElementByName(AZ_CRC_CE("autoCreateTrajectoryNode"));
                 }
 
                 if (version < 3)
@@ -183,7 +183,7 @@ namespace EMotionFX
 
                 if (version < 6)
                 {
-                    classElement.RemoveElementByName(AZ_CRC("nodeSelectionList"));
+                    classElement.RemoveElementByName(AZ_CRC_CE("nodeSelectionList"));
                 }
 
                 return result;

Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Groups/MotionGroup.cpp

@@ -193,9 +193,9 @@ namespace EMotionFX
                             AZ::SerializeContext::DataElementNode& currentRuleNode = sharedPointerNode.GetSubElement(0);
                             if (currentRuleNode.GetId() == azrtti_typeid<Rule::MotionCompressionSettingsRule>())
                             {
-                                currentRuleNode.FindSubElementAndGetData(AZ_CRC("maxTranslationError"), translationError);
-                                currentRuleNode.FindSubElementAndGetData(AZ_CRC("maxRotationError"), rotationError);
-                                currentRuleNode.FindSubElementAndGetData(AZ_CRC("maxScaleError"), scaleError);
+                                currentRuleNode.FindSubElementAndGetData(AZ_CRC_CE("maxTranslationError"), translationError);
+                                currentRuleNode.FindSubElementAndGetData(AZ_CRC_CE("maxRotationError"), rotationError);
+                                currentRuleNode.FindSubElementAndGetData(AZ_CRC_CE("maxScaleError"), scaleError);
 
                                 // Create the motion sampling rule.
                                 AZStd::shared_ptr<Rule::MotionSamplingRule> motionSamplingRule = AZStd::make_shared<Rule::MotionSamplingRule>();

Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MetaDataRule.cpp

@@ -75,7 +75,7 @@ namespace EMotionFX
                     return false;
                 }
 
-                AZ::SerializeContext::DataElementNode* metaDataStringNode = rootElementNode.FindSubElement(AZ_CRC("metaData"));
+                AZ::SerializeContext::DataElementNode* metaDataStringNode = rootElementNode.FindSubElement(AZ_CRC_CE("metaData"));
                 AZStd::vector<AZStd::string> commands;
                 if (metaDataStringNode)
                 {

Gems/EMotionFX/Code/EMotionFX/Pipeline/SceneAPIExt/Rules/MotionSamplingRule.cpp

@@ -147,7 +147,7 @@ namespace EMotionFX
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::NameLabelOverride, "")
-                        ->DataElement(AZ_CRC("MotionData"), &MotionSamplingRule::m_motionDataType, "Motion data type",
+                        ->DataElement(AZ_CRC_CE("MotionData"), &MotionSamplingRule::m_motionDataType, "Motion data type",
                             "The motion data type to use. This defines how the motion data is stored. This can have an effect on performance and memory usage.")
                             ->Attribute(AZ::Edit::Attributes::ChangeNotify, AZ::Edit::PropertyRefreshLevels::EntireTree)
                         ->DataElement(AZ::Edit::UIHandlers::ComboBox, &MotionSamplingRule::m_sampleRateMethod, "Sample rate", "Either use the Fbx sample rate or use a custom sample rate. The sample rate is automatically limited to the rate from Fbx.")

Gems/EMotionFX/Code/Source/Editor/Plugins/SkeletonOutliner/SkeletonOutlinerPlugin.cpp

@@ -72,7 +72,7 @@ namespace EMotionFX
     {
         m_mainWidget = new QWidget(m_dock);
         [[maybe_unused]] auto* toastNotificationsView =
-            new AzToolsFramework::ToastNotificationsView(m_mainWidget, AZ_CRC("SkeletonOutliner"));
+            new AzToolsFramework::ToastNotificationsView(m_mainWidget, AZ_CRC_CE("SkeletonOutliner"));
 
         QVBoxLayout* mainLayout = new QVBoxLayout();
         m_mainWidget->setLayout(mainLayout);

Gems/EMotionFX/Code/Source/Editor/PropertyWidgets/MotionDataHandler.cpp

@@ -20,7 +20,7 @@ namespace EMotionFX
 
     AZ::u32 MotionDataHandler::GetHandlerName() const
     {
-        return AZ_CRC("MotionData");
+        return AZ_CRC_CE("MotionData");
     }
 
     QWidget* MotionDataHandler::CreateGUI(QWidget* parent)

Gems/EMotionFX/Code/Source/Editor/SkeletonModelJointWidget.cpp

@@ -208,7 +208,7 @@ namespace EMotionFX
             [title, description]
             {
                 AzToolsFramework::ToastRequestBus::Event(
-                    AZ_CRC("SkeletonOutliner"),
+                    AZ_CRC_CE("SkeletonOutliner"),
                     &AzToolsFramework::ToastRequestBus::Events::ShowToastNotification,
                     AzQtComponents::ToastConfiguration{
                         AzQtComponents::ToastType::Error,

Gems/GameState/Code/Source/GameStateSystemComponent.cpp

@@ -37,13 +37,13 @@ namespace GameState
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void GameStateSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("GameStateService"));
+        provided.push_back(AZ_CRC_CE("GameStateService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void GameStateSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("GameStateService"));
+        incompatible.push_back(AZ_CRC_CE("GameStateService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////

Gems/Gestures/Code/Source/GesturesSystemComponent.cpp

@@ -17,13 +17,13 @@ namespace Gestures
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void GesturesSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("GestureInputService"));
+        provided.push_back(AZ_CRC_CE("GestureInputService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void GesturesSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("GestureInputService"));
+        incompatible.push_back(AZ_CRC_CE("GestureInputService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////

Gems/HttpRequestor/Code/Source/HttpRequestorSystemComponent.cpp

@@ -175,12 +175,12 @@ namespace HttpRequestor
 
     void HttpRequestorSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("HttpRequestorService"));
+        provided.push_back(AZ_CRC_CE("HttpRequestorService"));
     }
 
     void HttpRequestorSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("HttpRequestorService"));
+        incompatible.push_back(AZ_CRC_CE("HttpRequestorService"));
     }
 
     void HttpRequestorSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/InAppPurchases/Code/Source/InAppPurchasesSystemComponent.cpp

@@ -102,12 +102,12 @@ namespace InAppPurchases
 
     void SystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("InAppPurchasesService"));
+        provided.push_back(AZ_CRC_CE("InAppPurchasesService"));
     }
 
     void SystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("InAppPurchasesService"));
+        incompatible.push_back(AZ_CRC_CE("InAppPurchasesService"));
     }
 
     void SystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LocalUser/Code/Source/LocalUserSystemComponent.cpp

@@ -106,13 +106,13 @@ namespace LocalUser
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void LocalUserSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("LocalUserService"));
+        provided.push_back(AZ_CRC_CE("LocalUserService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void LocalUserSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("LocalUserService"));
+        incompatible.push_back(AZ_CRC_CE("LocalUserService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////

Gems/LyShine/Code/Editor/LyShineEditorSystemComponent.cpp

@@ -48,13 +48,13 @@ namespace LyShineEditor
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     void LyShineEditorSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("UiCanvasEditorService"));
+        provided.push_back(AZ_CRC_CE("UiCanvasEditorService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////
     void LyShineEditorSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("UiCanvasEditorService"));
+        incompatible.push_back(AZ_CRC_CE("UiCanvasEditorService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////

Gems/LyShine/Code/Source/UiButtonComponent.h

@@ -54,15 +54,15 @@ protected: // static member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiCheckboxComponent.h

@@ -67,15 +67,15 @@ protected: // member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiDraggableComponent.h

@@ -80,15 +80,15 @@ protected: // static member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiDropTargetComponent.h

@@ -59,15 +59,15 @@ protected: // static member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiDropTargetService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiDropTargetService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiDropdownComponent.h

@@ -105,15 +105,15 @@ protected: // member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiDropdownOptionComponent.h

@@ -54,12 +54,12 @@ protected: // member functions
 
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("UiDropdownOptionService"));
+        provided.push_back(AZ_CRC_CE("UiDropdownOptionService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("UiDropdownOptionService"));
+        incompatible.push_back(AZ_CRC_CE("UiDropdownOptionService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiElementComponent.cpp

@@ -1918,7 +1918,7 @@ bool UiElementComponent::VersionConverter(AZ::SerializeContext& context,
     {
         // Version 3 added the persistent member m_childEntityIdOrder with replaces m_children
         // Find the "Children" element that we will be replacing.
-        int childrenIndex = classElement.FindElement(AZ_CRC("Children"));
+        int childrenIndex = classElement.FindElement(AZ_CRC_CE("Children"));
         if (childrenIndex != -1)
         {
             AZ::SerializeContext::DataElementNode& childrenElementNode = classElement.GetSubElement(childrenIndex);
@@ -1949,7 +1949,7 @@ bool UiElementComponent::VersionConverter(AZ::SerializeContext& context,
             }
 
             // remove the old m_children persistent member
-            classElement.RemoveElementByName(AZ_CRC("Children"));
+            classElement.RemoveElementByName(AZ_CRC_CE("Children"));
         }
     }
 

Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.cpp

@@ -29,7 +29,7 @@ namespace
         AZ::SerializeContext& context,
         AZ::SerializeContext::DataElementNode& classElement)
     {
-        int index = classElement.FindElement(AZ_CRC("Frame Delay"));
+        int index = classElement.FindElement(AZ_CRC_CE("Frame Delay"));
         if (index != -1)
         {
             AZ::SerializeContext::DataElementNode& frameDelayNode = classElement.GetSubElement(index);
@@ -45,7 +45,7 @@ namespace
             classElement.RemoveElement(index);
 
             // If Framerate doesn't exist yet, add it
-            index = classElement.FindElement(AZ_CRC("Framerate"));
+            index = classElement.FindElement(AZ_CRC_CE("Framerate"));
             if (index == -1)
             {
                 index = classElement.AddElement<float>(context, "Framerate");
@@ -78,7 +78,7 @@ namespace
         AZ::SerializeContext::DataElementNode& classElement)
     {
         // If Framerate Unit doesn't exist yet, add it
-        int index = classElement.FindElement(AZ_CRC("Framerate Unit"));
+        int index = classElement.FindElement(AZ_CRC_CE("Framerate Unit"));
         if (index == -1)
         {
             index = classElement.AddElement<int>(context, "Framerate Unit");
@@ -184,7 +184,7 @@ void UiFlipbookAnimationComponent::Reflect(AZ::ReflectContext* context)
                 ->Attribute(AZ::Edit::Attributes::Category, "UI")
                 ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Flipbook.png")
                 ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Flipbook.svg")
-                ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("UI"))
+                ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("UI"))
                 ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
             ;
 

Gems/LyShine/Code/Source/UiFlipbookAnimationComponent.h

@@ -35,17 +35,17 @@ public: // static functions
 
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("UiFlipbookService"));
+        provided.push_back(AZ_CRC_CE("UiFlipbookService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("UiFlipbookService"));
+        incompatible.push_back(AZ_CRC_CE("UiFlipbookService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
     {
-        required.push_back(AZ_CRC("UiIndexableImageService"));
+        required.push_back(AZ_CRC_CE("UiIndexableImageService"));
     }
 
 public: // functions

Gems/LyShine/Code/Source/UiImageComponent.h

@@ -137,8 +137,8 @@ public:  // static member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiVisualService"));
-        provided.push_back(AZ_CRC("UiImageService"));
-        provided.push_back(AZ_CRC("UiIndexableImageService"));
+        provided.push_back(AZ_CRC_CE("UiImageService"));
+        provided.push_back(AZ_CRC_CE("UiIndexableImageService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)

Gems/LyShine/Code/Source/UiImageSequenceComponent.h

@@ -100,7 +100,7 @@ public: // static member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiVisualService"));
-        provided.push_back(AZ_CRC("UiIndexableImageService"));
+        provided.push_back(AZ_CRC_CE("UiIndexableImageService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)

Gems/LyShine/Code/Source/UiInteractableComponent.cpp

@@ -819,11 +819,11 @@ bool UiInteractableComponent::VersionConverter(AZ::SerializeContext& context,
     // - Need to move the navigation settings into a sub element UiNavigationSettings
     if (classElement.GetVersion() <= 1)
     {
-        int navModeIndex = classElement.FindElement(AZ_CRC("NavigationMode"));
-        int navUpIndex = classElement.FindElement(AZ_CRC("OnUpEntity"));
-        int navDownIndex = classElement.FindElement(AZ_CRC("OnDownEntity"));
-        int navLeftIndex = classElement.FindElement(AZ_CRC("OnLeftEntity"));
-        int navRightIndex = classElement.FindElement(AZ_CRC("OnRightEntity"));
+        int navModeIndex = classElement.FindElement(AZ_CRC_CE("NavigationMode"));
+        int navUpIndex = classElement.FindElement(AZ_CRC_CE("OnUpEntity"));
+        int navDownIndex = classElement.FindElement(AZ_CRC_CE("OnDownEntity"));
+        int navLeftIndex = classElement.FindElement(AZ_CRC_CE("OnLeftEntity"));
+        int navRightIndex = classElement.FindElement(AZ_CRC_CE("OnRightEntity"));
 
         if (navModeIndex == -1 || navUpIndex == -1 || navDownIndex == -1 || navLeftIndex == -1 || navRightIndex == -1)
         {

Gems/LyShine/Code/Source/UiLayoutFitterComponent.h

@@ -52,12 +52,12 @@ public:  // static member functions
 
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("UiFitToContentService"));
+        provided.push_back(AZ_CRC_CE("UiFitToContentService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("UiFitToContentService"));
+        incompatible.push_back(AZ_CRC_CE("UiFitToContentService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiMarkupButtonComponent.h

@@ -84,22 +84,22 @@ protected: // static member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
     {
         required.push_back(AZ_CRC_CE("UiElementService"));
         required.push_back(AZ_CRC_CE("UiTransformService"));
-        required.push_back(AZ_CRC("UiTextService"));
+        required.push_back(AZ_CRC_CE("UiTextService"));
     }
 
     static void Reflect(AZ::ReflectContext* context);

Gems/LyShine/Code/Source/UiParticleEmitterComponent.h

@@ -193,7 +193,7 @@ public:  // static member functions
 
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("UiParticleEmitterService"));
+        provided.push_back(AZ_CRC_CE("UiParticleEmitterService"));
         provided.push_back(AZ_CRC_CE("UiVisualService"));
     }
 

Gems/LyShine/Code/Source/UiRadioButtonComponent.h

@@ -67,15 +67,15 @@ protected: // member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiRadioButtonGroupComponent.h

@@ -59,12 +59,12 @@ protected: // member functions
 
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("UiRadioButtonGroupService"));
+        provided.push_back(AZ_CRC_CE("UiRadioButtonGroupService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("UiRadioButtonGroupService"));
+        incompatible.push_back(AZ_CRC_CE("UiRadioButtonGroupService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiScrollBarComponent.h

@@ -110,15 +110,15 @@ protected: // member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiScrollBoxComponent.h

@@ -144,16 +144,16 @@ protected: // member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
         provided.push_back(AZ_CRC_CE("UiScrollBoxService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiSerialize.cpp

@@ -589,7 +589,7 @@ namespace UiSerialize
                 AZ::SerializeContext::DataElementNode& dstBaseClassElement = srcClassElement.GetSubElement(interactableBaseClassIndex);
                 stateActionsIndex = dstBaseClassElement.FindElement(AZ_CRC(stateActionsElementName));
                 AZ::SerializeContext::DataElementNode& dstStateActionsNode = dstBaseClassElement.GetSubElement(stateActionsIndex);
-                colorIndex = dstStateActionsNode.FindElement(AZ_CRC("element"));
+                colorIndex = dstStateActionsNode.FindElement(AZ_CRC_CE("element"));
                 AZ::SerializeContext::DataElementNode& dstColorNode = dstStateActionsNode.GetSubElement(colorIndex);
 
                 if (!LyShine::ConvertSubElementFromVector3ToAzColor(context, dstColorNode, "Color"))

Gems/LyShine/Code/Source/UiSliderComponent.h

@@ -88,15 +88,15 @@ protected: // member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiTextComponent.cpp

@@ -74,7 +74,7 @@ namespace
         // the flag on. So the markup would stop working.
 
         // Just for safety check that the flag doesn't already exist
-        int index = classElement.FindElement(AZ_CRC("MarkupEnabled"));
+        int index = classElement.FindElement(AZ_CRC_CE("MarkupEnabled"));
         if (index == -1)
         {
             // The element does not exist (it really never should at this version)
@@ -176,7 +176,7 @@ namespace
         AZ::SerializeContext& context,
         AZ::SerializeContext::DataElementNode& classElement)
     {
-        int index = classElement.FindElement(AZ_CRC("WrapTextSetting"));
+        int index = classElement.FindElement(AZ_CRC_CE("WrapTextSetting"));
         if (index != -1)
         {
             AZ::SerializeContext::DataElementNode& wrapTextSettingNode = classElement.GetSubElement(index);
@@ -202,7 +202,7 @@ namespace
                 }
 
                 // If ShrinkToFit doesn't exist yet, add it
-                index = classElement.FindElement(AZ_CRC("ShrinkToFit"));
+                index = classElement.FindElement(AZ_CRC_CE("ShrinkToFit"));
                 if (index == -1)
                 {
                     index = classElement.AddElement<int>(context, "ShrinkToFit");
@@ -241,7 +241,7 @@ namespace
         AZ::SerializeContext& context,
         AZ::SerializeContext::DataElementNode& classElement)
     {
-        int index = classElement.FindElement(AZ_CRC("OverflowMode"));
+        int index = classElement.FindElement(AZ_CRC_CE("OverflowMode"));
         if (index != -1)
         {
             AZ::SerializeContext::DataElementNode& overflowModeSettingNode = classElement.GetSubElement(index);

Gems/LyShine/Code/Source/UiTextComponent.h

@@ -344,13 +344,13 @@ public:  // static member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiVisualService"));
-        provided.push_back(AZ_CRC("UiTextService"));
+        provided.push_back(AZ_CRC_CE("UiTextService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiVisualService"));
-        incompatible.push_back(AZ_CRC("UiTextService"));
+        incompatible.push_back(AZ_CRC_CE("UiTextService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShine/Code/Source/UiTextInputComponent.h

@@ -130,15 +130,15 @@ protected:  // static member functions
     static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
         provided.push_back(AZ_CRC_CE("UiInteractableService"));
-        provided.push_back(AZ_CRC("UiNavigationService"));
-        provided.push_back(AZ_CRC("UiStateActionsService"));
+        provided.push_back(AZ_CRC_CE("UiNavigationService"));
+        provided.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
         incompatible.push_back(AZ_CRC_CE("UiInteractableService"));
-        incompatible.push_back(AZ_CRC("UiNavigationService"));
-        incompatible.push_back(AZ_CRC("UiStateActionsService"));
+        incompatible.push_back(AZ_CRC_CE("UiNavigationService"));
+        incompatible.push_back(AZ_CRC_CE("UiStateActionsService"));
     }
 
     static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)

Gems/LyShineExamples/Code/Source/LyShineExamplesSystemComponent.cpp

@@ -42,17 +42,17 @@ namespace LyShineExamples
 
     void LyShineExamplesSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("LyShineExamplesService"));
+        provided.push_back(AZ_CRC_CE("LyShineExamplesService"));
     }
 
     void LyShineExamplesSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("LyShineExamplesService"));
+        incompatible.push_back(AZ_CRC_CE("LyShineExamplesService"));
     }
 
     void LyShineExamplesSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
     {
-        required.push_back(AZ_CRC("LyShineService"));;
+        required.push_back(AZ_CRC_CE("LyShineService"));;
     }
 
     void LyShineExamplesSystemComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)

Gems/Maestro/Code/Source/Components/EditorSequenceComponent.cpp

@@ -106,7 +106,7 @@ namespace Maestro
                         ->Attribute(AZ::Edit::Attributes::Category, "Cinematics")
                         ->Attribute(AZ::Edit::Attributes::Icon, "Icons/Components/Sequence.png")
                         ->Attribute(AZ::Edit::Attributes::ViewportIcon, "Icons/Components/Viewport/Sequence.png")
-                      //->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                      //->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                         ->Attribute(AZ::Edit::Attributes::AddableByUser, false)     // SequenceAgents are only added by TrackView
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ;

Gems/MessagePopup/Code/Source/LyShineMessagePopup.cpp

@@ -45,13 +45,13 @@ namespace MessagePopup
     //-------------------------------------------------------------------------
     void LyShineMessagePopup::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("MessagePopupService"));
+        provided.push_back(AZ_CRC_CE("MessagePopupService"));
     }
 
     //-------------------------------------------------------------------------
     void LyShineMessagePopup::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("MessagePopupService"));
+        incompatible.push_back(AZ_CRC_CE("MessagePopupService"));
     }
 
     //-------------------------------------------------------------------------

Gems/MessagePopup/Code/Source/MessagePopupSystemComponent.cpp

@@ -89,13 +89,13 @@ namespace MessagePopup
     //-------------------------------------------------------------------------
     void MessagePopupSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("MessagePopupSystemComponentService"));
+        provided.push_back(AZ_CRC_CE("MessagePopupSystemComponentService"));
     }
 
     //-------------------------------------------------------------------------
     void MessagePopupSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("MessagePopupSystemComponentService"));
+        incompatible.push_back(AZ_CRC_CE("MessagePopupSystemComponentService"));
     }
 
     //-------------------------------------------------------------------------

Gems/MiniAudio/Code/Source/Clients/MiniAudioSystemComponent.cpp

@@ -40,7 +40,7 @@ namespace MiniAudio
             {
                 ec->Class<MiniAudioSystemComponent>("MiniAudio", "[Description of functionality provided by this System Component]")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("System"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("System"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true);
             }
         }

Gems/MiniAudio/Code/Source/Tools/EditorMiniAudioListenerComponent.cpp

@@ -32,7 +32,7 @@ namespace MiniAudio
                 editContext->Class<EditorMiniAudioListenerComponent>("MiniAudio Listener", "")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "MiniAudio")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly);
 
@@ -46,7 +46,7 @@ namespace MiniAudio
                     ->Class<MiniAudioListenerComponentConfig>(
                         "MiniAudioListenerComponent Config", "[Configuration for MiniAudioListenerComponent]")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
 
                     ->DataElement(

Gems/MiniAudio/Code/Source/Tools/EditorMiniAudioPlaybackComponent.cpp

@@ -32,7 +32,7 @@ namespace MiniAudio
                 editContext->Class<EditorMiniAudioPlaybackComponent>("MiniAudio Playback", "")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                     ->Attribute(AZ::Edit::Attributes::Category, "MiniAudio")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
 
@@ -61,7 +61,7 @@ namespace MiniAudio
                     ->Class<MiniAudioPlaybackComponentConfig>(
                         "MiniAudioPlaybackComponent Config", "[Configuration for MiniAudioPlaybackComponent]")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
 
                     ->DataElement(

Gems/MultiplayerCompression/Code/Source/MultiplayerCompressionSystemComponent.cpp

@@ -38,12 +38,12 @@ namespace MultiplayerCompression
 
     void MultiplayerCompressionSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("MultiplayerCompressionService"));
+        provided.push_back(AZ_CRC_CE("MultiplayerCompressionService"));
     }
 
     void MultiplayerCompressionSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("MultiplayerCompressionService"));
+        incompatible.push_back(AZ_CRC_CE("MultiplayerCompressionService"));
     }
 
     MultiplayerCompressionSystemComponent::MultiplayerCompressionSystemComponent()

Gems/Presence/Code/Source/PresenceSystemComponent.cpp

@@ -126,13 +126,13 @@ namespace Presence
     ////////////////////////////////////////////////////////////////////////////////////////////
     void PresenceSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("PresenceService"));
+        provided.push_back(AZ_CRC_CE("PresenceService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////
     void PresenceSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("PresenceService"));
+        incompatible.push_back(AZ_CRC_CE("PresenceService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////

Gems/RecastNavigation/Code/Source/EditorComponents/EditorDetourNavigationComponent.cpp

@@ -28,7 +28,7 @@ namespace RecastNavigation
                 editContext->Class<EditorDetourNavigationComponent>("Detour Navigation Component",
                     "[Calculates paths within an associated navigation mesh.]")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &EditorDetourNavigationComponent::m_navQueryEntityId,
                         "Navigation Mesh", "Entity with Recast Navigation Mesh component")

Gems/RecastNavigation/Code/Source/EditorComponents/EditorRecastNavigationMeshComponent.cpp

@@ -31,7 +31,7 @@ namespace RecastNavigation
                 editContext->Class<EditorRecastNavigationMeshComponent>("Recast Navigation Mesh",
                     "[Calculates the walkable navigation mesh within a specified area.]")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ;
 
@@ -47,7 +47,7 @@ namespace RecastNavigation
                 editContext->Class<RecastNavigationMeshConfig>("Recast Navigation Mesh Config",
                     "[Navigation mesh configuration]")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
 
                     // Agent configuration

Gems/RecastNavigation/Code/Source/EditorComponents/EditorRecastNavigationPhysXProviderComponent.cpp

@@ -26,7 +26,7 @@ namespace RecastNavigation
                 editContext->Class<EditorRecastNavigationPhysXProviderComponent>("Recast Navigation PhysX Provider",
                     "[Collects triangle geometry from PhysX scene for navigation mesh within the area defined by a shape component.]")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                     ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                 ;
@@ -42,7 +42,7 @@ namespace RecastNavigation
                 editContext->Class<RecastNavigationPhysXProviderConfig>("Recast Navigation PhysX Provider Config",
                     "[Navigation PhysX Provider configuration]")
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game"))
+                    ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
 
                     ->DataElement(AZ::Edit::UIHandlers::Default, &RecastNavigationPhysXProviderConfig::m_collisionGroupId, "Collision Group",

Gems/SaveData/Code/Source/SaveDataSystemComponent.cpp

@@ -46,13 +46,13 @@ namespace SaveData
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void SaveDataSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("SaveDataService"));
+        provided.push_back(AZ_CRC_CE("SaveDataService"));
     }
     
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void SaveDataSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("SaveDataService"));
+        incompatible.push_back(AZ_CRC_CE("SaveDataService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////