Merge pull request #18120 from mprettner-huawei/crc-ce-refactor

Change all usages of AZ_CRC with constexpr arguments to AZ_CRC_CE

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/Controls/ReflectedPropertyControl/PropertyMiscCtrl.h

@@ -57,7 +57,7 @@ public:
     bool IsDefaultHandler() const override { return false; }
     QWidget* CreateGUI(QWidget *pParent) override;
 
-    AZ::u32 GetHandlerName(void) const override  {return AZ_CRC("ePropertyUser", 0x65b972c0); }
+    AZ::u32 GetHandlerName(void) const override  {return AZ_CRC_CE("ePropertyUser"); }
     void ConsumeAttribute(UserPropertyEditor* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
     void WriteGUIValuesIntoProperty(size_t index, UserPropertyEditor* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;
     bool ReadValuesIntoGUI(size_t index, UserPropertyEditor* GUI, const property_t& instance, AzToolsFramework::InstanceDataNode* node)  override;
@@ -72,7 +72,7 @@ public:
     bool IsDefaultHandler() const override { return false; }
     QWidget* CreateGUI(QWidget *pParent) override;
 
-    AZ::u32 GetHandlerName(void) const override { return AZ_CRC("ePropertyFloatCurve", 0x7440ccce); }
+    AZ::u32 GetHandlerName(void) const override { return AZ_CRC_CE("ePropertyFloatCurve"); }
 
     void ConsumeAttribute(CSplineCtrl* GUI, AZ::u32 attrib, AzToolsFramework::PropertyAttributeReader* attrValue, const char* debugName) override;
     void WriteGUIValuesIntoProperty(size_t index, CSplineCtrl* GUI, property_t& instance, AzToolsFramework::InstanceDataNode* node) override;

Code/Editor/Controls/ReflectedPropertyControl/PropertyMotionCtrl.h

@@ -28,7 +28,7 @@ public:
 
     virtual AZ::u32 GetHandlerName(void) const override
     {
-        return AZ_CRC("Motion", 0xf5fea1e8);
+        return AZ_CRC_CE("Motion");
     }
 
     virtual bool IsDefaultHandler() const override

Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.cpp

@@ -73,12 +73,12 @@ void ReflectedVarInit::setupReflection(AZ::SerializeContext* serializeContext)
         ec->Class< CReflectedVarUser >("VarUser", "")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
             ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarUser::varName)
-            ->Attribute(AZ::Edit::Attributes::Handler, AZ_CRC("ePropertyUser", 0x65b972c0))
+            ->Attribute(AZ::Edit::Attributes::Handler, AZ_CRC_CE("ePropertyUser"))
             ;
 
         ec->Class< CReflectedVarColor >("VarColor", "")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::Color, &CReflectedVarColor::m_color, "Color", "")
             ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarColor::varName)
             ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarColor::description)
@@ -92,7 +92,7 @@ void ReflectedVarInit::setupReflection(AZ::SerializeContext* serializeContext)
 
         ec->Class< CPropertyContainer >("PropertyContainer", "")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::Default, &CPropertyContainer::m_properties, "Properties", "")
             ->Attribute(AZ::Edit::Attributes::ContainerCanBeModified, false)
             ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CPropertyContainer::varName)
@@ -139,7 +139,7 @@ void CReflectedVarAny<T>::reflect(AZ::SerializeContext* serializeContext)
     {
         ec->Class< CReflectedVarAny<T> >("VarAny", "")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::Default, &CReflectedVarAny<T>::m_value, "Value", "")
             ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarAny<T>::varName)
             ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarAny<T>::description)
@@ -171,7 +171,7 @@ void CReflectedVarRanged<T, R>::reflect(AZ::SerializeContext* serializeContext)
     {
         ec->Class< CReflectedVarRanged<T, R> >("VarAny", "")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::Slider, &CReflectedVarRanged<T, R>::m_value, "Value", "")
             ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &CReflectedVarRanged<T, R>::varName)
             ->Attribute(AZ::Edit::Attributes::DescriptionTextOverride, &CReflectedVarRanged<T, R>::description)
@@ -206,7 +206,7 @@ void CReflectedVarEnum<T>::reflect(AZ::SerializeContext* serializeContext)
     {
         ec->Class< CReflectedVarEnum<T> >("Enum Variable", "")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::ComboBox, &CReflectedVarEnum<T>::m_selectedEnumName, "Value", "")
             ->Attribute(AZ::Edit::Attributes::StringList, &CReflectedVarEnum<T>::GetEnums)
             ->Attribute(AZ::Edit::Attributes::ChangeNotify, &CReflectedVarEnum<T>::OnEnumChanged)
@@ -248,9 +248,9 @@ AZ::u32 CReflectedVarSpline::handler()
     switch (m_propertyType)
     {
     case ePropertyFloatCurve:
-        return AZ_CRC("ePropertyFloatCurve", 0x7440ccce);
+        return AZ_CRC_CE("ePropertyFloatCurve");
     case ePropertyColorCurve:
-        return AZ_CRC("ePropertyColorCurve", 0xa30da4ec);
+        return AZ_CRC_CE("ePropertyColorCurve");
     default:
         AZ_Assert(false, "CReflectedVarSpline property type must be ePropertyFloatCurve or ePropertyColorCurve");
         return AZ::Edit::UIHandlers::Default;
@@ -263,28 +263,28 @@ AZ::u32 CReflectedVarGenericProperty::handler()
     switch (m_propertyType)
     {
     case ePropertyShader:
-        return AZ_CRC("ePropertyShader", 0xc40932f1);
+        return AZ_CRC_CE("ePropertyShader");
     case ePropertyEquip:
-        return AZ_CRC("ePropertyEquip", 0x66ffd290);
+        return AZ_CRC_CE("ePropertyEquip");
     case ePropertyDeprecated0:
-        return AZ_CRC("ePropertyCustomAction", 0x4ffa5ba5);
+        return AZ_CRC_CE("ePropertyCustomAction");
     case ePropertyGameToken:
-        return AZ_CRC("ePropertyGameToken", 0x34855b6f);
+        return AZ_CRC_CE("ePropertyGameToken");
     case ePropertyMissionObj:
-        return AZ_CRC("ePropertyMissionObj", 0x4a2d0dc8);
+        return AZ_CRC_CE("ePropertyMissionObj");
     case ePropertySequence:
-        return AZ_CRC("ePropertySequence", 0xdd1c7d44);
+        return AZ_CRC_CE("ePropertySequence");
     case ePropertySequenceId:
-        return AZ_CRC("ePropertySequenceId", 0x05983dcc);
+        return AZ_CRC_CE("ePropertySequenceId");
     case ePropertyLocalString:
-        return AZ_CRC("ePropertyLocalString", 0x0cd9609a);
+        return AZ_CRC_CE("ePropertyLocalString");
     case ePropertyLightAnimation:
-        return AZ_CRC("ePropertyLightAnimation", 0x277097da);
+        return AZ_CRC_CE("ePropertyLightAnimation");
     case ePropertyParticleName:
-        return AZ_CRC("ePropertyParticleName", 0xf44c7133);
+        return AZ_CRC_CE("ePropertyParticleName");
     default:
         AZ_Assert(false, "No property handlers defined for the property type");
-        return AZ_CRC("Default", 0xe35e00df);
+        return AZ_CRC_CE("Default");
     }
 }
 

Code/Editor/Controls/ReflectedPropertyControl/ReflectedVar.h

@@ -55,7 +55,7 @@ public:
     //If we're an unnamed container, just show our children in flat list.  Otherwise show the container name with children underneath
     AZ::u32 GetVisibility() const
     {
-        return m_varName.empty() ? AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20) : AZ_CRC("PropertyVisibility_Show", 0xa43c82dd);
+        return m_varName.empty() ? AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly") : AZ_CRC_CE("PropertyVisibility_Show");
     }
 
     void SetAutoExpand(bool autoExpand) { m_autoExpand = autoExpand; }

Code/Editor/EditorPreferencesPageAWS.cpp

@@ -34,7 +34,7 @@ void CEditorPreferencesPage_AWS::Reflect(AZ::SerializeContext& serialize)
 
         editContext->Class<CEditorPreferencesPage_AWS>("AWS Preferences", "AWS Preferences")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_AWS::m_usageOptions, "AWS Data Collection and Use", "AWS Data Collection and Use");
     }
 }

Code/Editor/EditorPreferencesPageFiles.cpp

@@ -94,7 +94,7 @@ void CEditorPreferencesPage_Files::Reflect(AZ::SerializeContext& serialize)
 
         editContext->Class<CEditorPreferencesPage_Files>("File Preferences", "Class for handling File Preferences")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_files, "Files", "File Preferences")
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_editors, "External Editors", "External Editors")
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_Files::m_autoBackup, "Auto Backup", "Auto Backup")
@@ -119,7 +119,7 @@ void CEditorPreferencesPage_Files::OnApply()
 {
     using namespace AzToolsFramework::SliceUtilities;
 
-    auto sliceSettings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC("SliceUserSettings", 0x055b32eb), AZ::UserSettings::CT_LOCAL);
+    auto sliceSettings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC_CE("SliceUserSettings"), AZ::UserSettings::CT_LOCAL);
     sliceSettings->m_autoNumber = m_files.m_autoNumberSlices;
     sliceSettings->m_saveLocation = m_files.m_saveLocation;
 
@@ -144,7 +144,7 @@ void CEditorPreferencesPage_Files::OnApply()
 void CEditorPreferencesPage_Files::InitializeSettings()
 {
     using namespace AzToolsFramework::SliceUtilities;
-    auto sliceSettings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC("SliceUserSettings", 0x055b32eb), AZ::UserSettings::CT_LOCAL);
+    auto sliceSettings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC_CE("SliceUserSettings"), AZ::UserSettings::CT_LOCAL);
 
     m_files.m_autoNumberSlices = sliceSettings->m_autoNumber;
     m_files.m_saveLocation = sliceSettings->m_saveLocation;

Code/Editor/EditorPreferencesPageGeneral.cpp

@@ -107,7 +107,7 @@ void CEditorPreferencesPage_General::Reflect(AZ::SerializeContext& serialize)
 
         editContext->Class<CEditorPreferencesPage_General>("General Editor Preferences", "Class for handling General Editor Preferences")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_generalSettings, "General Settings", "General Editor Preferences")
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_levelSaveSettings, "Prefab Settings", "General Prefab Settings")
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_General::m_messaging, "Messaging", "Messaging")

Code/Editor/EditorPreferencesPageViewportCamera.cpp

@@ -330,7 +330,7 @@ void CEditorPreferencesPage_ViewportCamera::Reflect(AZ::SerializeContext& serial
     {
         editContext->Class<CEditorPreferencesPage_ViewportCamera>("Viewport Preferences", "Viewport Preferences")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(
                 AZ::Edit::UIHandlers::Default,
                 &CEditorPreferencesPage_ViewportCamera::m_cameraMovementSettings,

Code/Editor/EditorPreferencesPageViewportDebug.cpp

@@ -46,7 +46,7 @@ void CEditorPreferencesPage_ViewportDebug::Reflect(AZ::SerializeContext& seriali
 
         editContext->Class<CEditorPreferencesPage_ViewportDebug>("Viewport Debug Preferences", "Viewport Debug Preferences")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportDebug::m_profiling, "Profiling", "Profiling")
             ->DataElement(AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportDebug::m_warnings, "Viewport Warning Settings", "Viewport Warning Settings");
     }

Code/Editor/EditorPreferencesPageViewportGeneral.cpp

@@ -161,7 +161,7 @@ void CEditorPreferencesPage_ViewportGeneral::Reflect(AZ::SerializeContext& seria
 
         editContext->Class<CEditorPreferencesPage_ViewportGeneral>("General Viewport Preferences", "General Viewport Preferences")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(
                 AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportGeneral::m_general, "General Viewport Settings",
                 "General Viewport Settings")

Code/Editor/EditorPreferencesPageViewportManipulator.cpp

@@ -103,7 +103,7 @@ void CEditorPreferencesPage_ViewportManipulator::Reflect(AZ::SerializeContext& s
         editContext
             ->Class<CEditorPreferencesPage_ViewportManipulator>("Manipulator Viewport Preferences", "Manipulator Viewport Preferences")
             ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20))
+            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"))
             ->DataElement(
                 AZ::Edit::UIHandlers::Default, &CEditorPreferencesPage_ViewportManipulator::m_manipulators, "Manipulators", "Manipulators");
     }

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/Component/ComponentApplication.cpp

@@ -218,7 +218,7 @@ namespace AZ
     {
         if (node.GetVersion() < 2)
         {
-            int nodeIdx = node.FindElement(AZ_CRC("recordsMode", 0x764c147a));
+            int nodeIdx = node.FindElement(AZ_CRC_CE("recordsMode"));
             if (nodeIdx != -1)
             {
                 auto& subNode = node.GetSubElement(nodeIdx);
@@ -230,7 +230,7 @@ namespace AZ
                 subNode.SetName("recordingMode");
             }
 
-            nodeIdx = node.FindElement(AZ_CRC("stackRecordLevels", 0xf8492566));
+            nodeIdx = node.FindElement(AZ_CRC_CE("stackRecordLevels"));
             if (nodeIdx != -1)
             {
                 auto& subNode = node.GetSubElement(nodeIdx);

Code/Framework/AzCore/AzCore/Component/Entity.cpp

@@ -713,7 +713,7 @@ namespace AZ
             for (int i = 0; i < classElement.GetNumSubElements(); ++i)
             {
                 AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(i);
-                if (elementNode.GetName() == AZ_CRC("Id", 0xbf396750))
+                if (elementNode.GetName() == AZ_CRC_CE("Id"))
                 {
                     u64 oldEntityId;
                     if (elementNode.GetData(oldEntityId))
@@ -756,7 +756,7 @@ namespace AZ
             for (int i = 0; i < classElement.GetNumSubElements(); ++i)
             {
                 AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(i);
-                if (elementNode.GetName() == AZ_CRC("m_refId", 0xb7853eda))
+                if (elementNode.GetName() == AZ_CRC_CE("m_refId"))
                 {
                     u64 oldEntityId;
                     if (elementNode.GetData(oldEntityId))
@@ -1339,7 +1339,7 @@ namespace AZ
             processInfo.m_processId = AZ::Platform::GetCurrentProcessId();
             processInfo.m_startTime = AZStd::GetTimeUTCMilliSecond();
             AZ::u32 signature = AZ::Crc32(&processInfo, sizeof(processInfo));
-            processSignature = Environment::CreateVariable<AZ::u32>(AZ_CRC("MachineProcessSignature", 0x47681763), signature);
+            processSignature = Environment::CreateVariable<AZ::u32>(AZ_CRC_CE("MachineProcessSignature"), signature);
         }
         return *processSignature;
     }
@@ -1371,7 +1371,7 @@ namespace AZ
 
         if (!counter)
         {
-            counter = Environment::CreateVariable<AZStd::atomic_uint>(AZ_CRC("EntityIdMonotonicCounter", 0xbe691c64), 1);
+            counter = Environment::CreateVariable<AZStd::atomic_uint>(AZ_CRC_CE("EntityIdMonotonicCounter"), 1);
         }
 
         AZ::u64 count = counter->fetch_add(1);

Code/Framework/AzCore/AzCore/IO/CompressorZLib.cpp

@@ -52,7 +52,7 @@ namespace AZ::IO
     //=========================================================================
     AZ::u32     CompressorZLib::TypeId()
     {
-        return AZ_CRC("ZLib", 0x73887d3a);
+        return AZ_CRC_CE("ZLib");
     }
 
     //=========================================================================

Code/Framework/AzCore/AzCore/IO/CompressorZStd.cpp

@@ -36,7 +36,7 @@ namespace AZ::IO
 
     AZ::u32 CompressorZStd::TypeId()
     {
-        return AZ_CRC("ZStd", 0x72fd505e);
+        return AZ_CRC_CE("ZStd");
     }
 
     bool CompressorZStd::ReadHeaderAndData(CompressorStream* stream, AZ::u8* data, unsigned int dataSize)

Code/Framework/AzCore/AzCore/Jobs/JobManagerComponent.cpp

@@ -99,7 +99,7 @@ namespace AZ
     //=========================================================================
     void JobManagerComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("JobsService", 0xd5ab5a50));
+        provided.push_back(AZ_CRC_CE("JobsService"));
     }
 
     //=========================================================================
@@ -107,7 +107,7 @@ namespace AZ
     //=========================================================================
     void JobManagerComponent::GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("JobsService", 0xd5ab5a50));
+        incompatible.push_back(AZ_CRC_CE("JobsService"));
     }
 
     //=========================================================================
@@ -115,7 +115,7 @@ namespace AZ
     //=========================================================================
     void JobManagerComponent::GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent)
     {
-        dependent.push_back(AZ_CRC("ProfilerService", 0x505033c9));
+        dependent.push_back(AZ_CRC_CE("ProfilerService"));
     }
 
     //=========================================================================

Code/Framework/AzCore/AzCore/Math/Crc.h

@@ -12,42 +12,39 @@
 #include <AzCore/std/string/string_view.h>
 #include <AzCore/RTTI/TypeInfoSimple.h>
 
-//////////////////////////////////////////////////////////////////////////
-// Macros for pre-processor Crc32 conversion
-//
-// When AZ_CRC("My string") is used by default it will map to AZ::Crc32("My string").
-// We do have a pro-processor program which will precompute the crc for you and
-// transform that macro to AZ_CRC("My string", 0x18fbd270) this will expand to just 0x18fbd270.
-// This will remove completely the "My string" from your executable, it will add it to a database and so on.
-// WHen you want to update the string, just change the string.
-// If you don't run the precompile step the code should still run fine, except it will be slower,
-// the strings will be in the exe and converted on the fly and you can't use the result where you need
-// a constant expression.
-// For example
-// switch(id) {
-//  case AZ_CRC("My string",0x18fbd270): {} break; // this will compile fine
-//  case AZ_CRC("My string"): {} break; // this will cause "error C2051: case expression not constant"
-// }
-// So it's you choice what you do, depending on your needs.
-//
-/// Implementation when we have only 1 param (by default it should be string.
+// Implementation with only 1 param (by default it should be string)
 #define AZ_CRC_1(_1)    AZ::Crc32(_1)
-/// Implementation when we have 2 params (we use the 2 only)
+
+// Deprecated (use AZ_CRC_CE instead): Implementation with 2 params (only the second parameter is used)
 #define AZ_CRC_2(_1, _2) AZ::Crc32(AZ::u32(_2))
 
-#define AZ_CRC(...)     AZ_MACRO_SPECIALIZE(AZ_CRC_, AZ_VA_NUM_ARGS(__VA_ARGS__), (__VA_ARGS__))
-
-//! AZ_CRC_CE macro is for enforcing a compile time evaluation of a Crc32 value
-//! "CE" by the way stands for consteval, which is the C++20 term used to mark immediate functions
-//! It can be used for any paramater that is convertible to either the uint32_t or string_view Crc constructor
-//! It works by converting using the Crc32 constructor to create a temp Crc32 and then use the operator uint32_t
-//! To convert the parameter into uint32_t. Since this code isn't using  C++20 yet only integral types can be used
-//! as non-type-template parameters
-//! An example of the use is as below
-//! AZ::Crc32 testValue1 = AZ_CRC_CE("Test1");
-//! AZ::Crc32 testValue2 = AZ_CRC_CE(0x43b3afd1);
+//! Generates a Crc32 value from a string representation.
+//! This macro is @b not guaranteed to be evaluated at compile time if the version with one parameter is used, so it should only be used if
+//! the parameter is not a constexpr value. If the parameter is a constexpr value, the AZ_CRC_CE macro should be used instead. The version
+//! with two parameters is deprecated, also use AZ_CRC_CE instead.
+//! @example
+//! <ul>
+//!   <li>AZ::Crc32 testValue = AZ_CRC("My string");</li>
+//!   <li>AZ::Crc32 testValue = AZ_CRC(0x18fbd270);</li>
+//!   <li>AZ::Crc32 testValue = AZ_CRC("My string", 0x18fbd270); // Deprecated, use AZ_CRC_CE("My string") instead</li>
+//! </ul>
+#define AZ_CRC(...) AZ_MACRO_SPECIALIZE(AZ_CRC_, AZ_VA_NUM_ARGS(__VA_ARGS__), (__VA_ARGS__))
+
+//! Generates a Crc32 value from a string representation at compile time.
+//! This macro @b is guaranteed to be evaluated at compile time, so it should be used if the parameter is a constexpr value.
+//! The "CE" postfix stands for consteval, which is the C++20 term used to mark immediate functions.
+//! It can be used for any parameter that is convertible to either the uint32_t or string_view Crc constructor.
+//! It works by using the Crc32 constructor to create a temp Crc32 and then using operator uint32_t to convert the parameter into uint32_t.
+//! Since this code isn't using C++20 yet only integral types can be used as non-type-template parameters.
+//! @example
+//! <ul>
+//!   <li>AZ::Crc32 testValue = AZ_CRC_CE("My string");</li>
+//!   <li>constexpr AZ::Crc32 testValue = AZ_CRC_CE("My string");</li>
+//!   <li>AZ::Crc32 testValue = AZ_CRC_CE(0x18fbd270);</li>
+//!   <li>case AZ_CRC_CE("My string"): {} break;</li>
+//! </ul>
 #define AZ_CRC_CE(literal_) AZ::Internal::CompileTimeCrc32<static_cast<AZ::u32>(AZ::Crc32{ literal_ })>
-//////////////////////////////////////////////////////////////////////////
+
 namespace AZ
 {
     class SerializeContext;

Code/Framework/AzCore/AzCore/RTTI/BehaviorContext.h

@@ -35,7 +35,7 @@ namespace AZStd
 
 namespace AZ
 {
-    const static AZ::Crc32 RuntimeEBusAttribute = AZ_CRC("RuntimeEBus", 0x466b899b); ///< Signals that this reflected ebus should only be available at runtime, helps tools filter out data driven ebuses
+    const static AZ::Crc32 RuntimeEBusAttribute = AZ_CRC_CE("RuntimeEBus"); ///< Signals that this reflected ebus should only be available at runtime, helps tools filter out data driven ebuses
 
     constexpr const char* k_PropertyNameGetterSuffix = "::Getter";
     constexpr const char* k_PropertyNameSetterSuffix = "::Setter";

Code/Framework/AzCore/AzCore/RTTI/BehaviorContextAttributes.inl

@@ -17,20 +17,20 @@ namespace AZ
     {
         namespace Attributes
         {
-            const static AZ::Crc32 Ignore = AZ_CRC("ScriptIgnore", 0xeb7615e1); ///< Don't use the element in the script reflection
-            const static AZ::Crc32 ClassNameOverride = AZ_CRC("ScriptClassNameOverride", 0x891238a3); ///< Provide a custom name for script reflection, that doesn't match the behavior Context name
-            const static AZ::Crc32 MethodOverride = AZ_CRC("ScriptFunctionOverride", 0xf89a7882); ///< Use a custom function in the attribute instead of the function  
-            const static AZ::Crc32 ConstructorOverride = AZ_CRC("ConstructorOverride", 0xef5ce4aa); ///< You can provide a custom constructor to be called when created from Lua script
-            const static AZ::Crc32 GenericConstructorOverride = AZ_CRC("GenericConstructorOverride", 0xe6a1698e); ///< You can provide a custom constructor to be called when creating a script
-            const static AZ::Crc32 ReaderWriterOverride = AZ_CRC("ReaderWriterOverride", 0x1ad9ce2a); ///< paired with \ref ScriptContext::CustomReaderWriter allows you to customize read/write to Lua VM
-            const static AZ::Crc32 ConstructibleFromNil = AZ_CRC("ConstructibleFromNil", 0x23908169); ///< Applied to classes. Value (bool) specifies if the class be default constructed when nil is provided.
-            const static AZ::Crc32 ToolTip = AZ_CRC("ToolTip", 0xa1b95fb0); ///< Add a tooltip for a method/event/property
-            const static AZ::Crc32 Category = AZ_CRC("Category", 0x064c19c1); ///< Provide a category to allow for partitioning/sorting/ordering of the element
-            const static AZ::Crc32 Deprecated = AZ_CRC("Deprecated", 0xfe49a138); ///< Marks a reflected class, method, EBus or property as deprecated. 
-            const static AZ::Crc32 DisallowBroadcast = AZ_CRC("DisallowBroadcast", 0x389b0ac7); ///< Marks a reflected EBus as not allowing Broadcasts, only Events.
+            const static AZ::Crc32 Ignore = AZ_CRC_CE("ScriptIgnore"); ///< Don't use the element in the script reflection
+            const static AZ::Crc32 ClassNameOverride = AZ_CRC_CE("ScriptClassNameOverride"); ///< Provide a custom name for script reflection, that doesn't match the behavior Context name
+            const static AZ::Crc32 MethodOverride = AZ_CRC_CE("ScriptFunctionOverride"); ///< Use a custom function in the attribute instead of the function
+            const static AZ::Crc32 ConstructorOverride = AZ_CRC_CE("ConstructorOverride"); ///< You can provide a custom constructor to be called when created from Lua script
+            const static AZ::Crc32 GenericConstructorOverride = AZ_CRC_CE("GenericConstructorOverride"); ///< You can provide a custom constructor to be called when creating a script
+            const static AZ::Crc32 ReaderWriterOverride = AZ_CRC_CE("ReaderWriterOverride"); ///< paired with \ref ScriptContext::CustomReaderWriter allows you to customize read/write to Lua VM
+            const static AZ::Crc32 ConstructibleFromNil = AZ_CRC_CE("ConstructibleFromNil"); ///< Applied to classes. Value (bool) specifies if the class be default constructed when nil is provided.
+            const static AZ::Crc32 ToolTip = AZ_CRC_CE("ToolTip"); ///< Add a tooltip for a method/event/property
+            const static AZ::Crc32 Category = AZ_CRC_CE("Category"); ///< Provide a category to allow for partitioning/sorting/ordering of the element
+            const static AZ::Crc32 Deprecated = AZ_CRC_CE("Deprecated"); ///< Marks a reflected class, method, EBus or property as deprecated.
+            const static AZ::Crc32 DisallowBroadcast = AZ_CRC_CE("DisallowBroadcast"); ///< Marks a reflected EBus as not allowing Broadcasts, only Events.
             ///< This attribute can be attached to the EditContext Attribute of a reflected class, the BehaviorContext Attribute of a reflected class, method, ebus or property.
             ///< ExcludeFlags can be used to prevent elements from appearing in List, Documentation, etc...
-            const static AZ::Crc32 ExcludeFrom = AZ_CRC("ExcludeFrom", 0xa98972fe);
+            const static AZ::Crc32 ExcludeFrom = AZ_CRC_CE("ExcludeFrom");
             enum ExcludeFlags : AZ::u64
             {
                 List = 1 << 0,
@@ -40,7 +40,7 @@ namespace AZ
                 All = (List | Documentation | Preview)
             };
 
-            const static AZ::Crc32 Storage = AZ_CRC("ScriptStorage", 0xcd95b44d);
+            const static AZ::Crc32 Storage = AZ_CRC_CE("ScriptStorage");
             enum class StorageType
             {
                 ScriptOwn, // default
@@ -48,7 +48,7 @@ namespace AZ
                 Value, // Object is stored by value in the VM
             };
 
-            const static AZ::Crc32 Operator = AZ_CRC("ScriptOperator", 0xfee681b6);
+            const static AZ::Crc32 Operator = AZ_CRC_CE("ScriptOperator");
             enum class OperatorType
             {
                 // note storage policy can be T*,T (only if we store raw pointers), shared_ptr<T>, intrusive pointer<T>

Code/Framework/AzCore/AzCore/Script/ScriptContext.cpp

@@ -388,7 +388,7 @@ namespace AZ
     namespace Internal
     {
         // Flag on Lua user data to validate that it is AZ user data
-        static const Crc32 AZLuaUserData = AZ_CRC("AZLuaUserData", 0x7d76a773);
+        static const Crc32 AZLuaUserData = AZ_CRC_CE("AZLuaUserData");
 
         // Special indices in the table at AZ_LUA_WEAK_CACHE_TABLE_REF
         enum {
@@ -904,7 +904,7 @@ namespace AZ
             LSV_BEGIN(l, 1);
             // Lua: object
             AZ::LuaUserData* userData = reinterpret_cast<AZ::LuaUserData*>(lua_touserdata(l, -1));
-            AZ_Assert(userData && userData->magicData == AZ_CRC("AZLuaUserData", 0x7d76a773), "this isn't user data");
+            AZ_Assert(userData && userData->magicData == AZ_CRC_CE("AZLuaUserData"), "this isn't user data");
             lua_getmetatable(l, -1); // load the class metatable
             // Lua: object, mt
             lua_rawgeti(l, -1, AZ_LUA_CLASS_METATABLE_NAME_INDEX);
@@ -1680,7 +1680,7 @@ LUA_API const Node* lua_getDummyNode()
 {
     if (!s_luaDummyNodeVariable)
     {
-        const AZ::u32 luaDummyNodeVariableID = AZ_CRC("lua_DummyNode", 0x155c8ce4);
+        const AZ::u32 luaDummyNodeVariableID = AZ_CRC_CE("lua_DummyNode");
 
         s_luaDummyNodeVariable = AZ::Environment::FindVariable<Node>(luaDummyNodeVariableID);
         if (!s_luaDummyNodeVariable)

Code/Framework/AzCore/AzCore/Script/ScriptProperty.cpp

@@ -112,7 +112,7 @@ namespace AZ
             for (int i = 0; i < classElement.GetNumSubElements(); ++i)
             {
                 AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(i);
-                if (elementNode.GetName() == AZ_CRC("name", 0x5e237e06))
+                if (elementNode.GetName() == AZ_CRC_CE("name"))
                 {
                     AZStd::string name;
                     if (elementNode.GetData(name))
@@ -1321,7 +1321,7 @@ namespace AZ
             for (int classIdx = 0; classIdx < classElement.GetNumSubElements(); ++classIdx)
             {
                 AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(classIdx);
-                if (elementNode.GetName() == AZ_CRC("values", 0x3aa74ce6))
+                if (elementNode.GetName() == AZ_CRC_CE("values"))
                 {
                     if (elementNode.GetNumSubElements() > 0)
                     {
@@ -1330,7 +1330,7 @@ namespace AZ
                         for (int dsfIdx = 0; dsfIdx < dsfNode.GetNumSubElements(); ++dsfIdx)
                         {
                             AZ::SerializeContext::DataElementNode& dataNode = dsfNode.GetSubElement(dsfIdx);
-                            if (dataNode.GetName() == AZ_CRC("m_data", 0x335cc942))
+                            if (dataNode.GetName() == AZ_CRC_CE("m_data"))
                             {
                                 const int idx = classElement.AddElement<AZ::Uuid>(context, "elementType");
                                 const AZ::Uuid elementType = dataNode.GetId();

Code/Framework/AzCore/AzCore/Script/ScriptSystemComponent.cpp

@@ -736,7 +736,7 @@ void ScriptSystemComponent::GetHandledAssetTypes(AZStd::vector<Data::AssetType>&
 //=========================================================================
 void ScriptSystemComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
 {
-    provided.push_back(AZ_CRC("ScriptService", 0x787235ab));
+    provided.push_back(AZ_CRC_CE("ScriptService"));
 }
 
 //=========================================================================
@@ -744,7 +744,7 @@ void ScriptSystemComponent::GetProvidedServices(ComponentDescriptor::DependencyA
 //=========================================================================
 void ScriptSystemComponent::GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible)
 {
-    incompatible.push_back(AZ_CRC("ScriptService", 0x787235ab));
+    incompatible.push_back(AZ_CRC_CE("ScriptService"));
 }
 
 //=========================================================================
@@ -752,7 +752,7 @@ void ScriptSystemComponent::GetIncompatibleServices(ComponentDescriptor::Depende
 //=========================================================================
 void ScriptSystemComponent::GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent)
 {
-    dependent.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
+    dependent.push_back(AZ_CRC_CE("AssetDatabaseService"));
 }
 
 //=========================================================================
@@ -869,7 +869,7 @@ void ScriptSystemComponent::Reflect(ReflectContext* reflection)
         
         serializeContext->Class<ScriptSystemComponent, AZ::Component>()
             ->Version(1)
-            // ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AZ_CRC("AssetBuilder", 0xc739c7d7) }))
+            // ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AZ_CRC_CE("AssetBuilder") }))
             ->Field("garbageCollectorSteps", &ScriptSystemComponent::m_defaultGarbageCollectorSteps)
             ;
 

Code/Framework/AzCore/AzCore/ScriptCanvas/ScriptCanvasAttributes.h

@@ -32,44 +32,44 @@ namespace AZ
         };
 
         ///< Marks a class for internal, usually unserialized, use
-        static const AZ::Crc32 AllowInternalCreation = AZ_CRC("AllowInternalCreation", 0x4817d9fb);
+        static const AZ::Crc32 AllowInternalCreation = AZ_CRC_CE("AllowInternalCreation");
 
         ///< Marks a node as an action that deactivates self, and does so in a way that is detectable at compile time
         static const AZ::Crc32 DeactivatesInputEntity = AZ_CRC_CE("DeactivatesInputEntity");
 
         ///< This is used to provide a more readable name for ScriptCanvas nodes
-        static const AZ::Crc32 PrettyName = AZ_CRC("PrettyName", 0x50ac3029);
+        static const AZ::Crc32 PrettyName = AZ_CRC_CE("PrettyName");
         ///< This is used to forbid variable creation of types in ScriptCanvas nodes
-        static const AZ::Crc32 VariableCreationForbidden = AZ_CRC("VariableCreationForbidden", 0x0034f5bb);
+        static const AZ::Crc32 VariableCreationForbidden = AZ_CRC_CE("VariableCreationForbidden");
         ///< Used to mark a function as a tuple retrieval function. The value for Index is what index is used to retrive the function
-        static const AZ::Crc32 TupleGetFunctionIndex = AZ_CRC("TupleGetFunction", 0x50020c16);
+        static const AZ::Crc32 TupleGetFunctionIndex = AZ_CRC_CE("TupleGetFunction");
 
         ///< Used to unpack the types of a single return type that can be unpacked, eg AZStd::tuple or AZ::Outcome
-        static const AZ::Crc32 ReturnValueTypesFunction = AZ_CRC("ReturnValueTypesFunction", 0x557e7ed1);
+        static const AZ::Crc32 ReturnValueTypesFunction = AZ_CRC_CE("ReturnValueTypesFunction");
 
         ///< Used to construct zero-initialized a tuple type
-        static const AZ::Crc32 TupleConstructorFunction = AZ_CRC("TupleConstructorFunction", 0x36a77490);
+        static const AZ::Crc32 TupleConstructorFunction = AZ_CRC_CE("TupleConstructorFunction");
 
         ///< Used to mark a function as a floating function separate from whatever class reflected it.
-        static const AZ::Crc32 FloatingFunction = AZ_CRC("FloatingFunction", 0xdcf978f9);
+        static const AZ::Crc32 FloatingFunction = AZ_CRC_CE("FloatingFunction");
 
         ///< Used to mark a slot as hidden from the SC author at edit time
         using HiddenIndices = AZStd::vector<size_t>;
-        static const AZ::Crc32 HiddenParameterIndex = AZ_CRC("HiddenParameterIndex", 0xabfdb58b);
+        static const AZ::Crc32 HiddenParameterIndex = AZ_CRC_CE("HiddenParameterIndex");
 
         ///<
-        static const AZ::Crc32 ExplicitOverloadCrc = AZ_CRC("ExplicitOverload", 0xbd3a878d);
+        static const AZ::Crc32 ExplicitOverloadCrc = AZ_CRC_CE("ExplicitOverload");
 
         ///< Used to mark overload method argument dynamic group for ScriptCanvas node
-        static const AZ::Crc32 OverloadArgumentGroup = AZ_CRC("OverloadArgumentGroup", 0x24e595bb);
+        static const AZ::Crc32 OverloadArgumentGroup = AZ_CRC_CE("OverloadArgumentGroup");
 
         ///<
-        static const AZ::Crc32 CheckedOperation = AZ_CRC("CheckedOperation", 0x95054825);
+        static const AZ::Crc32 CheckedOperation = AZ_CRC_CE("CheckedOperation");
 
-        static const AZ::Crc32 BranchOnResult = AZ_CRC("BranchOnResult", 0x7a741f05);
+        static const AZ::Crc32 BranchOnResult = AZ_CRC_CE("BranchOnResult");
 
         ///< \see enum class Script::Attributes::OperatorType
-        static const AZ::Crc32 OperatorOverride = AZ_CRC("OperatorOverride", 0x6b0e3ffb);
+        static const AZ::Crc32 OperatorOverride = AZ_CRC_CE("OperatorOverride");
 
         namespace Internal
         {
@@ -78,11 +78,11 @@ namespace AZ
         }
 
         ///< If that output of a function is an AZ::Outcome, unpack elements into separate slots
-        static const AZ::Crc32 AutoUnpackOutputOutcomeSlots = AZ_CRC("AutoUnpackOutputOutcomeSlots", 0x2664162d);
+        static const AZ::Crc32 AutoUnpackOutputOutcomeSlots = AZ_CRC_CE("AutoUnpackOutputOutcomeSlots");
         ///< If that output of a function is an AZ::Outcome, unpack elements into separate slots
-        static const AZ::Crc32 AutoUnpackOutputOutcomeFailureSlotName= AZ_CRC("AutoUnpackOutputOutcomeFailureSlotName", 0xfc72dd3f);
+        static const AZ::Crc32 AutoUnpackOutputOutcomeFailureSlotName= AZ_CRC_CE("AutoUnpackOutputOutcomeFailureSlotName");
         ///< If that output of a function is an AZ::Outcome, unpack elements into separate slots
-        static const AZ::Crc32 AutoUnpackOutputOutcomeSuccessSlotName = AZ_CRC("AutoUnpackOutputOutcomeSuccessSlotName", 0x22ac22d5);
+        static const AZ::Crc32 AutoUnpackOutputOutcomeSuccessSlotName = AZ_CRC_CE("AutoUnpackOutputOutcomeSuccessSlotName");
 
     }
 }

Code/Framework/AzCore/AzCore/Serialization/AZStdAnyDataContainer.inl

@@ -25,7 +25,7 @@ namespace AZ
 
             const char* GetElementName([[maybe_unused]] int index = 0) override { return "m_data"; }
 
-            u32 GetElementNameCrC([[maybe_unused]] int index = 0) override { return AZ_CRC("m_data", 0x335cc942); }
+            u32 GetElementNameCrC([[maybe_unused]] int index = 0) override { return AZ_CRC_CE("m_data"); }
 
             /// Null if element with this name can't be found.
             const SerializeContext::ClassElement* GetElement(u32) const override
@@ -35,10 +35,10 @@ namespace AZ
 
             bool GetElement(SerializeContext::ClassElement& classElement, const SerializeContext::DataElement& dataElement) const override
             {
-                if (static_cast<AZ::u32>(AZ_CRC("m_data", 0x335cc942)) == dataElement.m_nameCrc)
+                if (static_cast<AZ::u32>(AZ_CRC_CE("m_data")) == dataElement.m_nameCrc)
                 {
                     classElement.m_name = "m_data";
-                    classElement.m_nameCrc = AZ_CRC("m_data", 0x335cc942);
+                    classElement.m_nameCrc = AZ_CRC_CE("m_data");
                     classElement.m_typeId = dataElement.m_id;
                     classElement.m_dataSize = sizeof(void*);
                     classElement.m_offset = 0;
@@ -65,7 +65,7 @@ namespace AZ
 
                 SerializeContext::ClassElement anyChildElement;
                 anyChildElement.m_name = "m_data";
-                anyChildElement.m_nameCrc = AZ_CRC("m_data", 0x335cc942);
+                anyChildElement.m_nameCrc = AZ_CRC_CE("m_data");
                 anyChildElement.m_typeId = anyTypeId;
                 anyChildElement.m_dataSize = sizeof(void*);
                 anyChildElement.m_offset = 0;

Code/Framework/AzCore/AzCore/Serialization/AZStdContainers.inl

@@ -137,7 +137,7 @@ namespace AZ
             {
                 auto uuid = AzTypeInfo<ValueType>::Uuid();
 
-                classElement.m_attributes.emplace_back(AZ_CRC("EnumType", 0xb177e1b5), CreateModuleAttribute(AZStd::move(uuid)));
+                classElement.m_attributes.emplace_back(AZ_CRC_CE("EnumType"), CreateModuleAttribute(AZStd::move(uuid)));
             }
         }
 
@@ -756,7 +756,7 @@ namespace AZ
                 // Register our key type within an lvalue to rvalue wrapper as an attribute
                 AZ::TypeId uuid = azrtti_typeid<WrappedKeyType>();
 
-                m_classElement.m_attributes.emplace_back(AZ_CRC("KeyType", 0x15bc5303), CreateModuleAttribute(AZStd::move(uuid)));
+                m_classElement.m_attributes.emplace_back(AZ_CRC_CE("KeyType"), CreateModuleAttribute(AZStd::move(uuid)));
             }
 
             // Reflect our wrapped key and value types to serializeContext so that may later be used
@@ -1056,12 +1056,12 @@ namespace AZ
             {
                 // FIXME: We should properly fill in all the other fields as well.
                 m_value1ClassElement.m_name = "value1";
-                m_value1ClassElement.m_nameCrc = AZ_CRC("value1", 0xa2756c5a);
+                m_value1ClassElement.m_nameCrc = AZ_CRC_CE("value1");
                 m_value1ClassElement.m_offset = 0;
                 SetupClassElementFromType<T1>(m_value1ClassElement);
 
                 m_value2ClassElement.m_name = "value2";
-                m_value2ClassElement.m_nameCrc = AZ_CRC("value2", 0x3b7c3de0);
+                m_value2ClassElement.m_nameCrc = AZ_CRC_CE("value2");
                 m_value2ClassElement.m_offset = sizeof(T1);
                 SetupClassElementFromType<T2>(m_value2ClassElement);
             }
@@ -1539,7 +1539,7 @@ namespace AZ
             AZRValueContainer()
             {
                 m_valueClassElement.m_name = "value";
-                m_valueClassElement.m_nameCrc = AZ_CRC("value", 0x1d775834);
+                m_valueClassElement.m_nameCrc = AZ_CRC_CE("value");
                 m_valueClassElement.m_offset = 0;
                 SetupClassElementFromType<T>(m_valueClassElement);
             }

Code/Framework/AzCore/AzCore/Serialization/DataPatch.cpp

@@ -1952,13 +1952,13 @@ namespace AZ
         // Find all pair elements within the legacy DataPatch
         AZStd::vector<AZ::SerializeContext::DataElementNode*> pairElements = Utils::FindDescendantElements(context,
             dataPatchElement,
-            AZStd::vector<AZ::Crc32>({ AZ_CRC("m_patch", 0xaedc2952), AZ_CRC("element", 0x41405e39) }));
+            AZStd::vector<AZ::Crc32>({ AZ_CRC_CE("m_patch"), AZ_CRC_CE("element") }));
 
         for (AZ::SerializeContext::DataElementNode* pairElement : pairElements)
         {
             // Pull out the first and second elements from each pair
-            AZ::SerializeContext::DataElementNode* first = pairElement->FindSubElement(AZ_CRC("value1", 0xa2756c5a));
-            AZ::SerializeContext::DataElementNode* second = pairElement->FindSubElement(AZ_CRC("value2", 0x3b7c3de0));
+            AZ::SerializeContext::DataElementNode* first = pairElement->FindSubElement(AZ_CRC_CE("value1"));
+            AZ::SerializeContext::DataElementNode* second = pairElement->FindSubElement(AZ_CRC_CE("value2"));
 
             if (!first || !second)
             {
@@ -2048,7 +2048,7 @@ namespace AZ
         AZ_PROFILE_FUNCTION(AzCore);
         // Pull the targetClassId value out of the class element before it gets cleared when converting the DataPatch TypeId
         AZ::TypeId targetClassTypeId;
-        if (!classElement.GetChildData(AZ_CRC("m_targetClassId", 0xcabab9dc), targetClassTypeId))
+        if (!classElement.GetChildData(AZ_CRC_CE("m_targetClassId"), targetClassTypeId))
         {
             AZStd::string errorMessage = "Unable to retrieve data from the TypeId field m_targetClassId in the OldDataPatch class";
 

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

@@ -20,13 +20,13 @@ namespace AZ
             //!
             //! Accepted Child Attributes:
             //! Many, see AZ::Edit::Attributes
-            const static AZ::Crc32 EditorData = AZ_CRC("EditorData", 0xf44f1a1d);
+            const static AZ::Crc32 EditorData = AZ_CRC_CE("EditorData");
             //! Where specified, all subsequent children will be grouped together in the UI under the name of the group
             //! which is specified as the class element description.
             //!
             //! Accepted Child Attributes:
             //! - AZ::Edit::Attributes::AutoExpand
-            const static AZ::Crc32 Group = AZ_CRC("Group", 0x6dc044c5);
+            const static AZ::Crc32 Group = AZ_CRC_CE("Group");
             //! Specifies that the type contains a UIElement, a child property editor without a mapping to a specific member.
             //! This can be used to add UI components to the property editor that aren't just value editors, e.g. buttons.
             //!
@@ -36,41 +36,41 @@ namespace AZ
             //! Accepted Child Attributes:
             //! - AZ::Edit::Attributes::Handler
             //! - AZ::Edit::Attributes::AcceptsMultiEdit
-            const static AZ::Crc32 UIElement = AZ_CRC("UIElement", 0x4fb5a8e3);
+            const static AZ::Crc32 UIElement = AZ_CRC_CE("UIElement");
         }
 
         namespace Attributes
         {
-            const static AZ::Crc32 EnableForAssetEditor = AZ_CRC("EnableInAssetEditor", 0xc4efd0f7);
+            const static AZ::Crc32 EnableForAssetEditor = AZ_CRC_CE("EnableInAssetEditor");
 
             //! AddableByUser : a bool which determines if the component can be added by the user.
             //! Setting this to false effectively hides the component from views where user can create components.
-            const static AZ::Crc32 AddableByUser = AZ_CRC("AddableByUser", 0x181bc2f4);
+            const static AZ::Crc32 AddableByUser = AZ_CRC_CE("AddableByUser");
             //! RemoveableByUser : A bool which determines if the component can be removed by the user.
             //! Setting this to false prevents the user from removing this component. Default behavior is removeable by user.
-            const static AZ::Crc32 RemoveableByUser = AZ_CRC("RemoveableByUser", 0x32c7fd50);
+            const static AZ::Crc32 RemoveableByUser = AZ_CRC_CE("RemoveableByUser");
             //! An int which, if specified, causes a component to be forced to a particular position in the sorted list of
             //! components on an entity, and prevents dragging or moving operations which would affect that position.
             const static AZ::Crc32 FixedComponentListIndex = AZ_CRC_CE("FixedComponentListIndex");
 
-            const static AZ::Crc32 AppearsInAddComponentMenu = AZ_CRC("AppearsInAddComponentMenu", 0x53790e31);
-            const static AZ::Crc32 ForceAutoExpand = AZ_CRC("ForceAutoExpand", 0x1a5c79d2); // Ignores expansion state set by user, enforces expansion.
-            const static AZ::Crc32 AutoExpand = AZ_CRC("AutoExpand", 0x306ff5c0); // Expands automatically unless user changes expansion state.
-            const static AZ::Crc32 ButtonText = AZ_CRC("ButtonText", 0x79fe5d8b);
-            const static AZ::Crc32 Category = AZ_CRC("Category", 0x064c19c1);
-            const static AZ::Crc32 Visibility = AZ_CRC("Visibility", 0x518e4300);
-            const static AZ::Crc32 ButtonTooltip = AZ_CRC("ButtonTooltip", 0x1605a7d2);
-            const static AZ::Crc32 CheckboxTooltip = AZ_CRC("CheckboxTooltip", 0x1159eb78);
-            const static AZ::Crc32 CheckboxDefaultValue = AZ_CRC("CheckboxDefaultValue", 0x03f117e6);
+            const static AZ::Crc32 AppearsInAddComponentMenu = AZ_CRC_CE("AppearsInAddComponentMenu");
+            const static AZ::Crc32 ForceAutoExpand = AZ_CRC_CE("ForceAutoExpand"); // Ignores expansion state set by user, enforces expansion.
+            const static AZ::Crc32 AutoExpand = AZ_CRC_CE("AutoExpand"); // Expands automatically unless user changes expansion state.
+            const static AZ::Crc32 ButtonText = AZ_CRC_CE("ButtonText");
+            const static AZ::Crc32 Category = AZ_CRC_CE("Category");
+            const static AZ::Crc32 Visibility = AZ_CRC_CE("Visibility");
+            const static AZ::Crc32 ButtonTooltip = AZ_CRC_CE("ButtonTooltip");
+            const static AZ::Crc32 CheckboxTooltip = AZ_CRC_CE("CheckboxTooltip");
+            const static AZ::Crc32 CheckboxDefaultValue = AZ_CRC_CE("CheckboxDefaultValue");
             //! Affects the display order of a node relative to it's parent/children.  Higher values display further down (after) lower values.  Default is 0, negative values are allowed.  Must be applied as an attribute to the EditorData element
-            const static AZ::Crc32 DisplayOrder = AZ_CRC("DisplayOrder", 0x23660ec2);
+            const static AZ::Crc32 DisplayOrder = AZ_CRC_CE("DisplayOrder");
             //! Specifies whether the UI should support multi-edit for aggregate instances of this property
             //! This is enabled by default for everything except UIElements, which require an explicit opt-in
             //!
             //! Element type to use this with: Any
             //! Expected value type: bool
             //! Default value: true for DataElements, false for UIElements
-            const static AZ::Crc32 AcceptsMultiEdit = AZ_CRC("AcceptsMultiEdit", 0x1d14a103);
+            const static AZ::Crc32 AcceptsMultiEdit = AZ_CRC_CE("AcceptsMultiEdit");
 
             //! Specifies a small, human readable string representation of an entire class for editor display.
             //! This is used to create a string representation of the class when displaying associative containers.
@@ -78,31 +78,31 @@ namespace AZ
             //! Element type to use this with: Any type that can sensibly be represented to the user with a string.
             //! Expected value type: AZStd::string
             //! Default value: None
-            const static AZ::Crc32 ConciseEditorStringRepresentation = AZ_CRC("ConciseEditorStringRepresentation", 0xe8f2a004);
+            const static AZ::Crc32 ConciseEditorStringRepresentation = AZ_CRC_CE("ConciseEditorStringRepresentation");
 
             //! Container attributes
-            const static AZ::Crc32 ContainerCanBeModified = AZ_CRC("ContainerCanBeModified", 0xd9948f69);
-            const static AZ::Crc32 ShowAsKeyValuePairs = AZ_CRC("ShowAsKeyValuePairs", 0xefb4b240);
-            const static AZ::Crc32 StringList = AZ_CRC("StringList", 0xdf80b99c);
+            const static AZ::Crc32 ContainerCanBeModified = AZ_CRC_CE("ContainerCanBeModified");
+            const static AZ::Crc32 ShowAsKeyValuePairs = AZ_CRC_CE("ShowAsKeyValuePairs");
+            const static AZ::Crc32 StringList = AZ_CRC_CE("StringList");
 
             //! GenericComboBox Attributes
-            const static AZ::Crc32 GenericValue = AZ_CRC("GenericValue", 0x7a28c4bc);
-            const static AZ::Crc32 GenericValueList = AZ_CRC("GenericValueList", 0x6847012e);
-            const static AZ::Crc32 PostChangeNotify = AZ_CRC("PostChangeNotify", 0x456e84c8);
+            const static AZ::Crc32 GenericValue = AZ_CRC_CE("GenericValue");
+            const static AZ::Crc32 GenericValueList = AZ_CRC_CE("GenericValueList");
+            const static AZ::Crc32 PostChangeNotify = AZ_CRC_CE("PostChangeNotify");
 
             const static AZ::Crc32 ValueText = AZ_CRC_CE("ValueText");
             const static AZ::Crc32 PlaceholderText = AZ_CRC_CE("PlaceholderText");
 
-            const static AZ::Crc32 TrueText = AZ_CRC("TrueText", 0x263d9d95);
-            const static AZ::Crc32 FalseText = AZ_CRC("FalseText", 0x5f8c95bd);
+            const static AZ::Crc32 TrueText = AZ_CRC_CE("TrueText");
+            const static AZ::Crc32 FalseText = AZ_CRC_CE("FalseText");
 
-            const static AZ::Crc32 EnumValues = AZ_CRC("EnumValues", 0xc551a2e0);
+            const static AZ::Crc32 EnumValues = AZ_CRC_CE("EnumValues");
 
             //! Used to bind either a callback or a refresh mode to the changing of a particular property.
-            const static AZ::Crc32 AddNotify = AZ_CRC("AddNotify", 0x16f00b95);
-            const static AZ::Crc32 RemoveNotify = AZ_CRC("RemoveNotify", 0x16ec95f5);
-            const static AZ::Crc32 ChangeNotify = AZ_CRC("ChangeNotify", 0xf793bc19);
-            const static AZ::Crc32 ClearNotify = AZ_CRC("ClearNotify", 0x88914c8c);
+            const static AZ::Crc32 AddNotify = AZ_CRC_CE("AddNotify");
+            const static AZ::Crc32 RemoveNotify = AZ_CRC_CE("RemoveNotify");
+            const static AZ::Crc32 ChangeNotify = AZ_CRC_CE("ChangeNotify");
+            const static AZ::Crc32 ClearNotify = AZ_CRC_CE("ClearNotify");
 
             //! Specifies a function to accept or reject a value changed in the Open 3D Engine Editor.
             //! For example, a component could reject AZ::EntityId values that reference its own entity.
@@ -113,64 +113,64 @@ namespace AZ
             //!                                      `newValue` is a void* pointing at the new value being validated.
             //!                                      `valueType` is the type ID of the value pointed to by `newValue`.
             //! Default value:                   None
-            const AZ::Crc32 ChangeValidate = AZ_CRC("ChangeValidate", 0xc65d7180);
+            const AZ::Crc32 ChangeValidate = AZ_CRC_CE("ChangeValidate");
 
             //! Used to bind a callback to the editing complete event of a string line edit control.
-            const static AZ::Crc32 StringLineEditingCompleteNotify = AZ_CRC("StringLineEditingCompleteNotify", 0x139e5fa9);
+            const static AZ::Crc32 StringLineEditingCompleteNotify = AZ_CRC_CE("StringLineEditingCompleteNotify");
 
-            const static AZ::Crc32 NameLabelOverride = AZ_CRC("NameLabelOverride", 0x9ff79cab);
+            const static AZ::Crc32 NameLabelOverride = AZ_CRC_CE("NameLabelOverride");
             const static AZ::Crc32 AssetPickerTitle = AZ_CRC_CE("AssetPickerTitle");
             const static AZ::Crc32 HideProductFilesInAssetPicker = AZ_CRC_CE("HideProductFilesInAssetPicker");
-            const static AZ::Crc32 ChildNameLabelOverride = AZ_CRC("ChildNameLabelOverride", 0x73dd2909);
+            const static AZ::Crc32 ChildNameLabelOverride = AZ_CRC_CE("ChildNameLabelOverride");
             //! Container attribute that is used to override labels for its elements given the index of the element
-            const static AZ::Crc32 IndexedChildNameLabelOverride = AZ_CRC("IndexedChildNameLabelOverride", 0x5f313ac2);
-            const static AZ::Crc32 DescriptionTextOverride = AZ_CRC("DescriptionTextOverride", 0x608b64a8);
+            const static AZ::Crc32 IndexedChildNameLabelOverride = AZ_CRC_CE("IndexedChildNameLabelOverride");
+            const static AZ::Crc32 DescriptionTextOverride = AZ_CRC_CE("DescriptionTextOverride");
             const static AZ::Crc32 ContainerReorderAllow = AZ_CRC_CE("ContainerReorderAllow");
 
-            const static AZ::Crc32 PrimaryAssetType = AZ_CRC("PrimaryAssetType", 0xa400a5ce);
-            const static AZ::Crc32 DynamicElementType = AZ_CRC("DynamicElementType", 0x7c0b82f9);
+            const static AZ::Crc32 PrimaryAssetType = AZ_CRC_CE("PrimaryAssetType");
+            const static AZ::Crc32 DynamicElementType = AZ_CRC_CE("DynamicElementType");
             //! Asset to show when the selection is empty
-            const static AZ::Crc32 DefaultAsset = AZ_CRC("DefaultAsset", 0x1a7b1141);
+            const static AZ::Crc32 DefaultAsset = AZ_CRC_CE("DefaultAsset");
             //! Allow or disallow clearing the asset
-            const static AZ::Crc32 AllowClearAsset = AZ_CRC("AllowClearAsset", 0x24827182);
+            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");
 
             //! Component icon attributes
-            const static AZ::Crc32 Icon = AZ_CRC("Icon", 0x659429db);
-            const static AZ::Crc32 CategoryStyle = AZ_CRC("CategoryStyle", 0xe503b236);
-            const static AZ::Crc32 ViewportIcon = AZ_CRC("ViewportIcon", 0xe7f19a70);
-            const static AZ::Crc32 HideIcon = AZ_CRC("HideIcon", 0xfe652ee7);
-            const static AZ::Crc32 PreferNoViewportIcon = AZ_CRC("PreferNoViewportIcon", 0x04ae9cb2);
-            const static AZ::Crc32 DynamicIconOverride = AZ_CRC("DynamicIconOverride", 0xcc4cea6b);
+            const static AZ::Crc32 Icon = AZ_CRC_CE("Icon");
+            const static AZ::Crc32 CategoryStyle = AZ_CRC_CE("CategoryStyle");
+            const static AZ::Crc32 ViewportIcon = AZ_CRC_CE("ViewportIcon");
+            const static AZ::Crc32 HideIcon = AZ_CRC_CE("HideIcon");
+            const static AZ::Crc32 PreferNoViewportIcon = AZ_CRC_CE("PreferNoViewportIcon");
+            const static AZ::Crc32 DynamicIconOverride = AZ_CRC_CE("DynamicIconOverride");
 
             //! Data attributes
-            const static AZ::Crc32 Min = AZ_CRC("Min", 0xa17b1dd0);
-            const static AZ::Crc32 Max = AZ_CRC("Max", 0x9d762289);
-            const static AZ::Crc32 ReadOnly = AZ_CRC("ReadOnly", 0x3c5ecbf8);
-            const static AZ::Crc32 Step = AZ_CRC("Step", 0x43b9fe3c);
-            const static AZ::Crc32 Suffix = AZ_CRC("Suffix", 0xb5b087de);
-            const static AZ::Crc32 SoftMin = AZ_CRC("SoftMin", 0x155bd9a3);
-            const static AZ::Crc32 SoftMax = AZ_CRC("SoftMax", 0x2956e6fa);
-            const static AZ::Crc32 Decimals = AZ_CRC("Decimals", 0x7252f046);
-            const static AZ::Crc32 DisplayDecimals = AZ_CRC("DisplayDecimals", 0x31f5f3a0);
-
-            const static AZ::Crc32 LabelForX = AZ_CRC("LabelForX", 0x46dc59ea);
-            const static AZ::Crc32 LabelForY = AZ_CRC("LabelForY", 0x31db697c);
-            const static AZ::Crc32 LabelForZ = AZ_CRC("LabelForZ", 0xa8d238c6);
-            const static AZ::Crc32 LabelForW = AZ_CRC("LabelForW", 0xd663447b);
-
-            const static AZ::Crc32 StyleForX = AZ_CRC("StyleForX", 0x4e381088);
-            const static AZ::Crc32 StyleForY = AZ_CRC("StyleForY", 0x393f201e);
-            const static AZ::Crc32 StyleForZ = AZ_CRC("StyleForZ", 0xa03671a4);
-            const static AZ::Crc32 StyleForW = AZ_CRC("StyleForW", 0xde870d19);
+            const static AZ::Crc32 Min = AZ_CRC_CE("Min");
+            const static AZ::Crc32 Max = AZ_CRC_CE("Max");
+            const static AZ::Crc32 ReadOnly = AZ_CRC_CE("ReadOnly");
+            const static AZ::Crc32 Step = AZ_CRC_CE("Step");
+            const static AZ::Crc32 Suffix = AZ_CRC_CE("Suffix");
+            const static AZ::Crc32 SoftMin = AZ_CRC_CE("SoftMin");
+            const static AZ::Crc32 SoftMax = AZ_CRC_CE("SoftMax");
+            const static AZ::Crc32 Decimals = AZ_CRC_CE("Decimals");
+            const static AZ::Crc32 DisplayDecimals = AZ_CRC_CE("DisplayDecimals");
+
+            const static AZ::Crc32 LabelForX = AZ_CRC_CE("LabelForX");
+            const static AZ::Crc32 LabelForY = AZ_CRC_CE("LabelForY");
+            const static AZ::Crc32 LabelForZ = AZ_CRC_CE("LabelForZ");
+            const static AZ::Crc32 LabelForW = AZ_CRC_CE("LabelForW");
+
+            const static AZ::Crc32 StyleForX = AZ_CRC_CE("StyleForX");
+            const static AZ::Crc32 StyleForY = AZ_CRC_CE("StyleForY");
+            const static AZ::Crc32 StyleForZ = AZ_CRC_CE("StyleForZ");
+            const static AZ::Crc32 StyleForW = AZ_CRC_CE("StyleForW");
             
-            const static AZ::Crc32 RequiredService = AZ_CRC("RequiredService", 0x4d7d0865);
-            const static AZ::Crc32 IncompatibleService = AZ_CRC("IncompatibleService", 0x06a52aa9);
+            const static AZ::Crc32 RequiredService = AZ_CRC_CE("RequiredService");
+            const static AZ::Crc32 IncompatibleService = AZ_CRC_CE("IncompatibleService");
 
-            const static AZ::Crc32 MaxLength = AZ_CRC("MaxLength", 0x385c7325);
+            const static AZ::Crc32 MaxLength = AZ_CRC_CE("MaxLength");
 
             //! Specifies the URL to load for a component
             //!
@@ -188,46 +188,46 @@ namespace AZ
             //!   ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
             //!   ->Attribute(AZ::Edit::Attributes::HelpPageURL, "https://o3de.org/docs/user-guide/components/reference/lua-script/")
             //! @endcode
-            const static AZ::Crc32 HelpPageURL = AZ_CRC("HelpPageURL", 0xa344d681);
+            const static AZ::Crc32 HelpPageURL = AZ_CRC_CE("HelpPageURL");
 
             //! Combobox parameters.
-            const static AZ::Crc32 ComboBoxEditable = AZ_CRC("ComboBoxEditable", 0x7ee76669);
+            const static AZ::Crc32 ComboBoxEditable = AZ_CRC_CE("ComboBoxEditable");
 
             //! For use with slice creation tools. See SliceCreationFlags below for details.
-            const static AZ::Crc32 SliceFlags = AZ_CRC("SliceFlags", 0xa447e1fb);
+            const static AZ::Crc32 SliceFlags = AZ_CRC_CE("SliceFlags");
 
             //! Does the clear button in the LineEdit need to have a test for visibility.
             const static AZ::Crc32 ShowClearButtonHandler = AZ_CRC_CE("ShowClearButtonHandler");
 
             //! For optional use on Getter Events used for Virtual Properties
-            const static AZ::Crc32 PropertyPosition = AZ_CRC("Position", 0x462ce4f5);
-            const static AZ::Crc32 PropertyRotation = AZ_CRC("Rotation", 0x297c98f1);
-            const static AZ::Crc32 PropertyScale = AZ_CRC("Scale", 0xec462584);
-            const static AZ::Crc32 PropertyHidden = AZ_CRC("Hidden", 0x885de9bd);
+            const static AZ::Crc32 PropertyPosition = AZ_CRC_CE("Position");
+            const static AZ::Crc32 PropertyRotation = AZ_CRC_CE("Rotation");
+            const static AZ::Crc32 PropertyScale = AZ_CRC_CE("Scale");
+            const static AZ::Crc32 PropertyHidden = AZ_CRC_CE("Hidden");
 
             //! Specifies a vector<Crc32> of platform tags that must *all* be set on the current platform for the component to be exported.
-            const static AZ::Crc32 ExportIfAllPlatformTags = AZ_CRC("ExportIfAllPlatformTags", 0x572ad424);
+            const static AZ::Crc32 ExportIfAllPlatformTags = AZ_CRC_CE("ExportIfAllPlatformTags");
 
             //! Specifies a vector<Crc32> of platform tags, of which at least one must be set on the current platform for the component to be exported.
-            const static AZ::Crc32 ExportIfAnyPlatformTags = AZ_CRC("ExportIfAnyPlatformTags", 0x1f6c0540);
+            const static AZ::Crc32 ExportIfAnyPlatformTags = AZ_CRC_CE("ExportIfAnyPlatformTags");
 
             //! Binds to a function (static or member) to allow for dynamic (runtime) slice exporting of custom editor components.
-            const static AZ::Crc32 RuntimeExportCallback = AZ_CRC("RuntimeExportCallback", 0x4b52dc01);
+            const static AZ::Crc32 RuntimeExportCallback = AZ_CRC_CE("RuntimeExportCallback");
 
             //! Attribute for storing a Id Generator function used by GenerateNewIdsAndFixRefs to remapping old id's to new id's
-            const static AZ::Crc32 IdGeneratorFunction = AZ_CRC("IdGeneratorFunction", 0x4269a3fd);
+            const static AZ::Crc32 IdGeneratorFunction = AZ_CRC_CE("IdGeneratorFunction");
 
             //! Attribute for tagging a System Component for use in certain contexts
-            const static AZ::Crc32 SystemComponentTags = AZ_CRC("SystemComponentTags", 0x2d8bebc9);
+            const static AZ::Crc32 SystemComponentTags = AZ_CRC_CE("SystemComponentTags");
             
             //! Attribute for providing a custom UI Handler - can be used with Attribute() (or with ElementAttribute() for containers such as vectors, to specify the handler for container elements (i.e. vectors))
-            const static AZ::Crc32 Handler = AZ_CRC("Handler", 0x939715cd);
+            const static AZ::Crc32 Handler = AZ_CRC_CE("Handler");
 
             //! Attribute for skipping a set amount of descendant elements which are not leaves when calculating property visibility
-            const static AZ::Crc32 VisibilitySkipNonLeafDepth = AZ_CRC("VisibilitySkipNonLeafDepth", 0x790293fa);
+            const static AZ::Crc32 VisibilitySkipNonLeafDepth = AZ_CRC_CE("VisibilitySkipNonLeafDepth");
 
             //! Attribute for making a slider have non-linear scale. The default is 0.5, which results in linear scale. Value can be shifted lower or higher to control more precision in the power curve at those ends (minimum = 0, maximum = 1)
-            const static AZ::Crc32 SliderCurveMidpoint = AZ_CRC("SliderCurveMidpoint", 0x8c26aea2);
+            const static AZ::Crc32 SliderCurveMidpoint = AZ_CRC_CE("SliderCurveMidpoint");
 
             //! Attribute for binding a function that can convert the type being viewed to a string
             inline constexpr AZ::Crc32 ToString{ "ToString" };
@@ -240,23 +240,23 @@ namespace AZ
             //! i.e. DataElement(DefaultHandler, field, ...)
             const static AZ::Crc32 Default = 0;
 
-            const static AZ::Crc32 Button = AZ_CRC("Button", 0x3a06ac3d);
-            const static AZ::Crc32 CheckBox = AZ_CRC("CheckBox", 0x1e7b08ed);
-            const static AZ::Crc32 Color = AZ_CRC("Color", 0x665648e9);
-            const static AZ::Crc32 ComboBox = AZ_CRC("ComboBox", 0x858d0ae9);
-            const static AZ::Crc32 RadioButton = AZ_CRC("RadioButton", 0xcbfd6f3a);
-            const static AZ::Crc32 EntityId = AZ_CRC("EntityId", 0x63ac0d5e);
-            const static AZ::Crc32 LayoutPadding = AZ_CRC("LayoutPadding", 0x87ffd04b);
-            const static AZ::Crc32 LineEdit = AZ_CRC("LineEdit", 0x3f15f4ba);
+            const static AZ::Crc32 Button = AZ_CRC_CE("Button");
+            const static AZ::Crc32 CheckBox = AZ_CRC_CE("CheckBox");
+            const static AZ::Crc32 Color = AZ_CRC_CE("Color");
+            const static AZ::Crc32 ComboBox = AZ_CRC_CE("ComboBox");
+            const static AZ::Crc32 RadioButton = AZ_CRC_CE("RadioButton");
+            const static AZ::Crc32 EntityId = AZ_CRC_CE("EntityId");
+            const static AZ::Crc32 LayoutPadding = AZ_CRC_CE("LayoutPadding");
+            const static AZ::Crc32 LineEdit = AZ_CRC_CE("LineEdit");
             const static AZ::Crc32 MultiLineEdit = AZ_CRC_CE("MultiLineEdit");
-            const static AZ::Crc32 Quaternion = AZ_CRC("Quaternion", 0x4be832b9);
-            const static AZ::Crc32 Slider = AZ_CRC("Slider", 0xcfc71007);
-            const static AZ::Crc32 SpinBox = AZ_CRC("SpinBox", 0xf3fd1c2d);
-            const static AZ::Crc32 Crc = AZ_CRC("Crc", 0x7c6287fd); // for u32 representation of a CRC, only works on u32 values.
-            const static AZ::Crc32 Vector2 = AZ_CRC("Vector2", 0xe6775839);
-            const static AZ::Crc32 Vector3 = AZ_CRC("Vector3", 0x917068af);
-            const static AZ::Crc32 Vector4 = AZ_CRC("Vector4", 0x0f14fd0c);
-            const static AZ::Crc32 ExeSelectBrowseEdit = AZ_CRC("ExeSelectBrowseEdit", 0xa2feae94);
+            const static AZ::Crc32 Quaternion = AZ_CRC_CE("Quaternion");
+            const static AZ::Crc32 Slider = AZ_CRC_CE("Slider");
+            const static AZ::Crc32 SpinBox = AZ_CRC_CE("SpinBox");
+            const static AZ::Crc32 Crc = AZ_CRC_CE("Crc"); // for u32 representation of a CRC, only works on u32 values.
+            const static AZ::Crc32 Vector2 = AZ_CRC_CE("Vector2");
+            const static AZ::Crc32 Vector3 = AZ_CRC_CE("Vector3");
+            const static AZ::Crc32 Vector4 = AZ_CRC_CE("Vector4");
+            const static AZ::Crc32 ExeSelectBrowseEdit = AZ_CRC_CE("ExeSelectBrowseEdit");
             const static AZ::Crc32 Label = AZ_CRC_CE("Label");
 
             // Maintained in the UIHandlers namespace for backwards compatibility; moved to the Attributes namespace now
@@ -266,36 +266,36 @@ namespace AZ
         // Attributes used in internal implementation only
         namespace InternalAttributes
         {
-            const static AZ::Crc32 EnumValue = AZ_CRC("EnumValue", 0xe4f32eed);
-            const static AZ::Crc32 EnumType = AZ_CRC("EnumType", 0xb177e1b5);
-            const static AZ::Crc32 ElementInstances = AZ_CRC("ElementInstances", 0x38163ba4);
+            const static AZ::Crc32 EnumValue = AZ_CRC_CE("EnumValue");
+            const static AZ::Crc32 EnumType = AZ_CRC_CE("EnumType");
+            const static AZ::Crc32 ElementInstances = AZ_CRC_CE("ElementInstances");
         }
 
         //! Notifies the property system to refresh the property grid, along with the level of refresh.
         namespace PropertyRefreshLevels
         {
-            const static AZ::Crc32 None = AZ_CRC("RefreshNone", 0x98a5045b);
+            const static AZ::Crc32 None = AZ_CRC_CE("RefreshNone");
 
             //! This will only update the values in each row that has a property
-            const static AZ::Crc32 ValuesOnly = AZ_CRC("RefreshValues", 0x28e720d4);
+            const static AZ::Crc32 ValuesOnly = AZ_CRC_CE("RefreshValues");
 
             //! This will re-consume all attributes and values, with the exception of the
             //! Visibility attribute. This is due to the Visibility attribute being consumed
             //! at a higher level in the system and would be a more expensive operation that
             //! would essentially be the same as the EntireTree refresh level.
-            const static AZ::Crc32 AttributesAndValues = AZ_CRC("RefreshAttributesAndValues", 0xcbc2147c);
+            const static AZ::Crc32 AttributesAndValues = AZ_CRC_CE("RefreshAttributesAndValues");
 
             //! Re-create the entire tree of properties.
-            const static AZ::Crc32 EntireTree = AZ_CRC("RefreshEntireTree", 0xefbc823c);
+            const static AZ::Crc32 EntireTree = AZ_CRC_CE("RefreshEntireTree");
         }
 
         //! Specifies the visibility setting for a particular property.
         namespace PropertyVisibility
         {
-            const static AZ::Crc32 Show = AZ_CRC("PropertyVisibility_Show", 0xa43c82dd);
-            const static AZ::Crc32 ShowChildrenOnly = AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20);
-            const static AZ::Crc32 Hide = AZ_CRC("PropertyVisibility_Hide", 0x32ab90f7);
-            const static AZ::Crc32 HideChildren = AZ_CRC("PropertyVisibility_HideChildren", 0x13cbd01e);
+            const static AZ::Crc32 Show = AZ_CRC_CE("PropertyVisibility_Show");
+            const static AZ::Crc32 ShowChildrenOnly = AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly");
+            const static AZ::Crc32 Hide = AZ_CRC_CE("PropertyVisibility_Hide");
+            const static AZ::Crc32 HideChildren = AZ_CRC_CE("PropertyVisibility_HideChildren");
         }
 
         namespace SliceFlags

Code/Framework/AzCore/AzCore/Serialization/ObjectStream.cpp

@@ -602,7 +602,7 @@ namespace AZ
                             }
                         }
                     }
-                    else if (parentClassInfo->m_typeId == SerializeTypeInfo<DynamicSerializableField>::GetUuid() && element.m_nameCrc == AZ_CRC("m_data", 0x335cc942))   // special case for dynamic-typed fields
+                    else if (parentClassInfo->m_typeId == SerializeTypeInfo<DynamicSerializableField>::GetUuid() && element.m_nameCrc == AZ_CRC_CE("m_data"))   // special case for dynamic-typed fields
                     {
                         DynamicSerializableField* fieldContainer = reinterpret_cast<DynamicSerializableField*>(parentClassPtr);
                         fieldContainer->m_typeId = classData->m_typeId;

Code/Framework/AzCore/AzCore/Serialization/SerializeContext.cpp

@@ -1337,7 +1337,7 @@ namespace AZ
                         {
                             AZ::SerializeContext::ClassElement dynamicElementData;
                             dynamicElementData.m_name = "m_data";
-                            dynamicElementData.m_nameCrc = AZ_CRC("m_data", 0x335cc942);
+                            dynamicElementData.m_nameCrc = AZ_CRC_CE("m_data");
                             dynamicElementData.m_typeId = dynamicFieldDesc->m_typeId;
                             dynamicElementData.m_dataSize = sizeof(void*);
                             dynamicElementData.m_offset = reinterpret_cast<size_t>(&(reinterpret_cast<AZ::DynamicSerializableField const volatile*>(0)->m_data));

Code/Framework/AzCore/AzCore/Serialization/SerializeContext.h

@@ -65,7 +65,7 @@ namespace AZ::SerializeContextAttributes
 {
     // Attribute used to set an override function on a SerializeContext::ClassData attribute array
     // which can be used to override the ObjectStream WriteElement call to write out reflected data differently
-    static const AZ::Crc32 ObjectStreamWriteElementOverride = AZ_CRC("ObjectStreamWriteElementOverride", 0x35eb659f);
+    static const AZ::Crc32 ObjectStreamWriteElementOverride = AZ_CRC_CE("ObjectStreamWriteElementOverride");
 }
 namespace AZ
 {
@@ -1122,7 +1122,7 @@ namespace AZ::Serialize
         /// Return default element generic name (used by most containers).
         static inline const char* GetDefaultElementName() { return "element"; }
         /// Return default element generic name crc (used by most containers).
-        static inline u32 GetDefaultElementNameCrc() { return AZ_CRC("element", 0x41405e39); }
+        static inline u32 GetDefaultElementNameCrc() { return AZ_CRC_CE("element"); }
 
         // Returns default element generic name unless overridden by an IDataContainer
         virtual const char* GetElementName([[maybe_unused]] int index = 0) { return GetDefaultElementName(); }

Code/Framework/AzCore/AzCore/Serialization/SerializeContextEnum.cpp

@@ -11,7 +11,7 @@
 namespace AZ
 {
     const Crc32 Serialize::Attributes::EnumValueKey(AZ_CRC_CE("EnumValueKey"));
-    const Crc32 Serialize::Attributes::EnumUnderlyingType(AZ_CRC("EnumUnderlyingType", 0x8c461f93));
+    const Crc32 Serialize::Attributes::EnumUnderlyingType(AZ_CRC_CE("EnumUnderlyingType"));
 
     SerializeContext::EnumBuilder::EnumBuilder(SerializeContext* context, const typename SerializeContext::UuidToClassMap::iterator& classMapIter)
         : m_context(context)

Code/Framework/AzCore/AzCore/Serialization/std/VariantReflection.inl

@@ -420,7 +420,7 @@ namespace AZ
                 m_classData.m_dataConverter = &m_dataConverter;
 
                 // Create the ObjectStreamWriteOverrideCB in the current module
-                m_classData.m_attributes.emplace_back(AZ_CRC("ObjectStreamWriteElementOverride", 0x35eb659f), CreateModuleAttribute(&ObjectStreamWriter));
+                m_classData.m_attributes.emplace_back(AZ_CRC_CE("ObjectStreamWriteElementOverride"), CreateModuleAttribute(&ObjectStreamWriter));
             }
 
             SerializeContext::ClassData* GetClassData() override

Code/Framework/AzCore/AzCore/Slice/SliceComponent.cpp

@@ -33,7 +33,7 @@ namespace AZ
         {
             if (classElement.GetVersion() < 2)
             {
-                const int instancesIndex = classElement.FindElement(AZ_CRC("Instances", 0x7a270069));
+                const int instancesIndex = classElement.FindElement(AZ_CRC_CE("Instances"));
                 if (instancesIndex > -1)
                 {
                     auto& instancesElement = classElement.GetSubElement(instancesIndex);
@@ -265,7 +265,7 @@ namespace AZ
 
             // Make the addressing relative to InstantiatedContainer (entityDataFlags are relative to the individual entity)
             DataPatch::AddressType addressPrefix;
-            addressPrefix.push_back(AZ_CRC("Entities", 0x50ec64e5));
+            addressPrefix.push_back(AZ_CRC_CE("Entities"));
             addressPrefix.push_back(static_cast<u64>(toEntityId));
 
             for (auto& addressFlagsPair : entityDataFlags)
@@ -610,7 +610,7 @@ namespace AZ
         {
             // Make the addressing relative to InstantiatedContainer (m_dataFlags stores flags relative to the individual entity)
             DataPatch::AddressType addressPrefix;
-            addressPrefix.push_back(AZ_CRC("Entities", 0x50ec64e5));
+            addressPrefix.push_back(AZ_CRC_CE("Entities"));
             addressPrefix.push_back(static_cast<u64>(baseIdInstanceIdPair.first));
 
             for (auto& addressDataFlagsPair : m_dataFlags.GetEntityDataFlags(baseIdInstanceIdPair.second))
@@ -3074,7 +3074,7 @@ namespace AZ
     //=========================================================================
     void SliceComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("Prefab", 0xa60af5fc));
+        provided.push_back(AZ_CRC_CE("Prefab"));
     }
 
     //=========================================================================
@@ -3082,7 +3082,7 @@ namespace AZ
     //=========================================================================
     void SliceComponent::GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent)
     {
-        dependent.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
+        dependent.push_back(AZ_CRC_CE("AssetDatabaseService"));
     }
 
     /**

Code/Framework/AzCore/AzCore/Slice/SliceMetadataInfoComponent.cpp

@@ -201,7 +201,7 @@ namespace AZ
         // - Change AssociatedIds(m_associatedEntities) to be a set of entityIds instead of an unordered_set
         if (classElement.GetVersion() <= 1)
         {
-            int associatedIdsIndex = classElement.FindElement(AZ_CRC("AssociatedIds", 0xb5dc95c6));
+            int associatedIdsIndex = classElement.FindElement(AZ_CRC_CE("AssociatedIds"));
 
             if (associatedIdsIndex < 0)
             {
@@ -235,12 +235,12 @@ namespace AZ
 
     void SliceMetadataInfoComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("SliceMetadataInfoService", 0xdaaa6bb4));
+        provided.push_back(AZ_CRC_CE("SliceMetadataInfoService"));
     }
 
     void SliceMetadataInfoComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("SliceMetadataInfoService", 0xdaaa6bb4));
+        incompatible.push_back(AZ_CRC_CE("SliceMetadataInfoService"));
     }
 
     void SliceMetadataInfoComponent::CheckDependencyCount()

Code/Framework/AzCore/AzCore/Slice/SliceSystemComponent.cpp

@@ -31,18 +31,18 @@ namespace AZ
 
     void SliceSystemComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& services)
     {
-        services.push_back(AZ_CRC("SliceSystemService", 0x1a5b7aad));
+        services.push_back(AZ_CRC_CE("SliceSystemService"));
     }
 
     void SliceSystemComponent::GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& services)
     {
-        services.push_back(AZ_CRC("SliceSystemService", 0x1a5b7aad));
+        services.push_back(AZ_CRC_CE("SliceSystemService"));
     }
 
     void SliceSystemComponent::GetDependentServices(ComponentDescriptor::DependencyArrayType& services)
     {
-        services.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
-        services.push_back(AZ_CRC("AssetCatalogService", 0xc68ffc57));
+        services.push_back(AZ_CRC_CE("AssetDatabaseService"));
+        services.push_back(AZ_CRC_CE("AssetCatalogService"));
     }
 
     void SliceSystemComponent::Activate()

Code/Framework/AzCore/AzCore/Statistics/StatisticalProfilerProxySystemComponent.cpp

@@ -29,13 +29,13 @@ namespace AZ::Statistics
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void StatisticalProfilerProxySystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("StatisticalProfilerService", 0x20066f73));
+        provided.push_back(AZ_CRC_CE("StatisticalProfilerService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void StatisticalProfilerProxySystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("StatisticalProfilerService", 0x20066f73));
+        incompatible.push_back(AZ_CRC_CE("StatisticalProfilerService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////

Code/Framework/AzCore/AzCore/UserSettings/UserSettingsComponent.cpp

@@ -83,7 +83,7 @@ namespace AZ
     //-----------------------------------------------------------------------------
     void UserSettingsComponent::GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("UserSettingsService", 0xa0eadff5));
+        provided.push_back(AZ_CRC_CE("UserSettingsService"));
     }
 
     //-----------------------------------------------------------------------------

Code/Framework/AzCore/Platform/Windows/AzCore/Debug/StackTracer_Windows.cpp

@@ -63,7 +63,7 @@ namespace AZ {
         {
             if (!s_dynamicallyLoadedModulesMutex)
             {
-                s_dynamicallyLoadedModulesMutex = Environment::CreateVariable<AZStd::mutex>(AZ_CRC("SymbolStorageDynamicallyLoadedModulesMutex", 0x2b7dbaf2));
+                s_dynamicallyLoadedModulesMutex = Environment::CreateVariable<AZStd::mutex>(AZ_CRC_CE("SymbolStorageDynamicallyLoadedModulesMutex"));
                 AZ_Assert(s_dynamicallyLoadedModulesMutex, "Unable to create SymbolStorageDynamicallyLoadedModulesMutex environment variable");
             }
             return *s_dynamicallyLoadedModulesMutex;
@@ -73,7 +73,7 @@ namespace AZ {
         {
             if (!s_dynamicallyLoadedModules)
             {
-                s_dynamicallyLoadedModules = Environment::CreateVariable<SymbolStorageDynamicallyLoadedModules>(AZ_CRC("SymbolStorageDynamicallyLoadedModules", 0xecf96588));
+                s_dynamicallyLoadedModules = Environment::CreateVariable<SymbolStorageDynamicallyLoadedModules>(AZ_CRC_CE("SymbolStorageDynamicallyLoadedModules"));
                 AZ_Assert(s_dynamicallyLoadedModules, "Unable to create SymbolStorageDynamicallyLoadedModules environment variable - dynamically loaded modules won't have symbols loaded!");
             }
             return *s_dynamicallyLoadedModules;

Code/Framework/AzCore/Tests/Components.cpp

@@ -314,14 +314,14 @@ namespace UnitTest
         void GetProvidedServices(DependencyArrayType& provided, const Component* instance) const override
         {
             (void)instance;
-            provided.push_back(AZ_CRC("ServiceA", 0x808b9021));
+            provided.push_back(AZ_CRC_CE("ServiceA"));
         }
         void GetDependentServices(DependencyArrayType& dependent, const Component* instance) const override
         {
             (void)instance;
             if (m_isDependent)
             {
-                dependent.push_back(AZ_CRC("ServiceD", 0xf0e164ae));
+                dependent.push_back(AZ_CRC_CE("ServiceD"));
             }
         }
         void Reflect(ReflectContext* /*reflection*/) const override {}
@@ -341,9 +341,9 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceB", 0x1982c19b)); }
-        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC("ServiceE", 0x87e65438)); }
-        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible) { incompatible.push_back(AZ_CRC("ServiceF", 0x1eef0582)); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceB")); }
+        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC_CE("ServiceE")); }
+        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible) { incompatible.push_back(AZ_CRC_CE("ServiceF")); }
         static void Reflect(ReflectContext* /*reflection*/)  {}
     };
 
@@ -359,7 +359,7 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetRequiredServices(ComponentDescriptor::DependencyArrayType& required) { required.push_back(AZ_CRC("ServiceB", 0x1982c19b)); }
+        static void GetRequiredServices(ComponentDescriptor::DependencyArrayType& required) { required.push_back(AZ_CRC_CE("ServiceB")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
 
@@ -375,7 +375,7 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceD", 0xf0e164ae)); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceD")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -391,8 +391,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC("ServiceD", 0xf0e164ae)); dependent.push_back(AZ_CRC("ServiceA", 0x808b9021)); }
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceE", 0x87e65438)); }
+        static void GetDependentServices(ComponentDescriptor::DependencyArrayType& dependent) { dependent.push_back(AZ_CRC_CE("ServiceD")); dependent.push_back(AZ_CRC_CE("ServiceA")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceE")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -409,7 +409,7 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceE", 0x87e65438)); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceE")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -425,8 +425,8 @@ namespace UnitTest
         void Activate() override {}
         void Deactivate() override {}
 
-        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible) { incompatible.push_back(AZ_CRC("ServiceA", 0x808b9021)); }
-        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC("ServiceF", 0x1eef0582)); }
+        static void GetIncompatibleServices(ComponentDescriptor::DependencyArrayType& incompatible) { incompatible.push_back(AZ_CRC_CE("ServiceA")); }
+        static void GetProvidedServices(ComponentDescriptor::DependencyArrayType& provided) { provided.push_back(AZ_CRC_CE("ServiceF")); }
         static void Reflect(ReflectContext* /*reflection*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -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*/) {}
     };
     //////////////////////////////////////////////////////////////////////////
@@ -1127,17 +1127,17 @@ namespace UnitTest
         systemEntity->Init();
         systemEntity->Activate();
 
-        AZStd::intrusive_ptr<MyUserSettings> myGlobalUserSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_GLOBAL);
+        AZStd::intrusive_ptr<MyUserSettings> myGlobalUserSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_GLOBAL);
         AZ_TEST_ASSERT(myGlobalUserSettings);
         myGlobalUserSettings->m_intOption1 = 10;
-        AZStd::intrusive_ptr<MyUserSettings> storedGlobalSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_GLOBAL);
+        AZStd::intrusive_ptr<MyUserSettings> storedGlobalSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_GLOBAL);
         AZ_TEST_ASSERT(myGlobalUserSettings == storedGlobalSettings);
         AZ_TEST_ASSERT(storedGlobalSettings->m_intOption1 == 10);
 
-        AZStd::intrusive_ptr<MyUserSettings> myLocalUserSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_LOCAL);
+        AZStd::intrusive_ptr<MyUserSettings> myLocalUserSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_LOCAL);
         AZ_TEST_ASSERT(myLocalUserSettings);
         myLocalUserSettings->m_intOption1 = 20;
-        AZStd::intrusive_ptr<MyUserSettings> storedLocalSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_LOCAL);
+        AZStd::intrusive_ptr<MyUserSettings> storedLocalSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_LOCAL);
         AZ_TEST_ASSERT(myLocalUserSettings == storedLocalSettings);
         AZ_TEST_ASSERT(storedLocalSettings->m_intOption1 == 20);
 
@@ -1146,23 +1146,23 @@ namespace UnitTest
         systemEntity->Deactivate();
 
         // Deactivate() should have cleared all the registered user options
-        storedGlobalSettings = UserSettings::Find<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_GLOBAL);
+        storedGlobalSettings = UserSettings::Find<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_GLOBAL);
         AZ_TEST_ASSERT(!storedGlobalSettings);
-        storedLocalSettings = UserSettings::Find<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_LOCAL);
+        storedLocalSettings = UserSettings::Find<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_LOCAL);
         AZ_TEST_ASSERT(!storedLocalSettings);
 
         systemEntity->Activate();
 
         // Verify that upon re-activation, we successfully loaded all settings saved during deactivation
-        storedGlobalSettings = UserSettings::Find<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_GLOBAL);
+        storedGlobalSettings = UserSettings::Find<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_GLOBAL);
         AZ_TEST_ASSERT(storedGlobalSettings);
-        myGlobalUserSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_GLOBAL);
+        myGlobalUserSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_GLOBAL);
         AZ_TEST_ASSERT(myGlobalUserSettings == storedGlobalSettings);
         AZ_TEST_ASSERT(storedGlobalSettings->m_intOption1 == 10);
 
-        storedLocalSettings = UserSettings::Find<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_LOCAL);
+        storedLocalSettings = UserSettings::Find<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_LOCAL);
         AZ_TEST_ASSERT(storedLocalSettings);
-        myLocalUserSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC("MyUserSettings", 0x65286904), UserSettings::CT_LOCAL);
+        myLocalUserSettings = UserSettings::CreateFind<MyUserSettings>(AZ_CRC_CE("MyUserSettings"), UserSettings::CT_LOCAL);
         AZ_TEST_ASSERT(myLocalUserSettings == storedLocalSettings);
         AZ_TEST_ASSERT(storedLocalSettings->m_intOption1 == 20);
 
@@ -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

@@ -182,7 +182,7 @@ namespace SerializeTestClasses {
                 for (int i = 0; i < classElement.GetNumSubElements(); )
                 {
                     AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(i);
-                    if (elementNode.GetName() == AZ_CRC("dataMix", 0x041bcc8d))
+                    if (elementNode.GetName() == AZ_CRC_CE("dataMix"))
                     {
                         classElement.RemoveElement(i);
                         continue;
@@ -193,7 +193,7 @@ namespace SerializeTestClasses {
                         for (int j = 0; j < elementNode.GetNumSubElements(); ++j)
                         {
                             AZ::SerializeContext::DataElementNode& dataNode = elementNode.GetSubElement(j);
-                            if (dataNode.GetName() == AZ_CRC("data", 0xadf3f363))
+                            if (dataNode.GetName() == AZ_CRC_CE("data"))
                             {
                                 float data;
                                 bool result = dataNode.GetData(data);
@@ -783,7 +783,7 @@ namespace SerializeTestClasses
                 for (int i = 0; i < classElement.GetNumSubElements(); )
                 {
                     AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(i);
-                    if (elementNode.GetName() == AZ_CRC("textData", 0xf322c69d))
+                    if (elementNode.GetName() == AZ_CRC_CE("textData"))
                     {
                         AZStd::string text;
                         bool result = elementNode.GetData(text);
@@ -797,7 +797,7 @@ namespace SerializeTestClasses
                         }
                         classElement.RemoveElement(i);
                     }
-                    else if (elementNode.GetName() == AZ_CRC("emptyTextData", 0x61d55942))
+                    else if (elementNode.GetName() == AZ_CRC_CE("emptyTextData"))
                     {
                         AZStd::string text;
                         bool result = elementNode.GetData(text);
@@ -806,7 +806,7 @@ namespace SerializeTestClasses
 
                         classElement.RemoveElement(i);
                     }
-                    else if (elementNode.GetName() == AZ_CRC("vectorInt", 0xe61292a9))
+                    else if (elementNode.GetName() == AZ_CRC_CE("vectorInt"))
                     {
                         int memberIdx = classElement.AddElement<AZStd::vector<int> >(context, "vectorInt2");
                         if (memberIdx != -1)
@@ -827,7 +827,7 @@ namespace SerializeTestClasses
                         }
                         classElement.RemoveElement(i);
                     }
-                    else if (elementNode.GetName() == AZ_CRC("vectorIntVector", 0xd9c44f0b))
+                    else if (elementNode.GetName() == AZ_CRC_CE("vectorIntVector"))
                     {
                         // add a new element
                         int newListIntList = classElement.AddElement<AZStd::list<AZStd::list<int> > >(context, "listIntList");
@@ -858,22 +858,22 @@ namespace SerializeTestClasses
                         }
                         classElement.RemoveElement(i);
                     }
-                    else if (elementNode.GetName() == AZ_CRC("emptyInitTextData", 0x17b55a4f)
-                            || elementNode.GetName() == AZ_CRC("listInt", 0x4fbe090a)
-                            || elementNode.GetName() == AZ_CRC("setInt", 0x62eb1299)
-                            || elementNode.GetName() == AZ_CRC("usetInt")
-                            || elementNode.GetName() == AZ_CRC("umultisetInt")
-                            || elementNode.GetName() == AZ_CRC("mapIntFloat", 0xb558ac3f)
-                            || elementNode.GetName() == AZ_CRC("umapIntFloat")
-                            || elementNode.GetName() == AZ_CRC("umultimapIntFloat")
-                            || elementNode.GetName() == AZ_CRC("byteStream", 0xda272a22)
-                            || elementNode.GetName() == AZ_CRC("bitSet", 0x9dd4d1cb)
-                            || elementNode.GetName() == AZ_CRC("sharedPtr", 0x033de7f0)
-                            || elementNode.GetName() == AZ_CRC("intrusivePtr", 0x20733e45)
-                            || elementNode.GetName() == AZ_CRC("uniquePtr", 0xdb6f5bd3)
-                            || elementNode.GetName() == AZ_CRC("forwardListInt", 0xf54c1600)
-                            || elementNode.GetName() == AZ_CRC("fixedVectorInt", 0xf7108293)
-                            || elementNode.GetName() == AZ_CRC("vectorEnum"))
+                    else if (elementNode.GetName() == AZ_CRC_CE("emptyInitTextData")
+                            || elementNode.GetName() == AZ_CRC_CE("listInt")
+                            || elementNode.GetName() == AZ_CRC_CE("setInt")
+                            || elementNode.GetName() == AZ_CRC_CE("usetInt")
+                            || elementNode.GetName() == AZ_CRC_CE("umultisetInt")
+                            || elementNode.GetName() == AZ_CRC_CE("mapIntFloat")
+                            || 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")
+                            || elementNode.GetName() == AZ_CRC_CE("intrusivePtr")
+                            || elementNode.GetName() == AZ_CRC_CE("uniquePtr")
+                            || elementNode.GetName() == AZ_CRC_CE("forwardListInt")
+                            || elementNode.GetName() == AZ_CRC_CE("fixedVectorInt")
+                            || elementNode.GetName() == AZ_CRC_CE("vectorEnum"))
                     {
                         classElement.RemoveElement(i);
                     }
@@ -2567,7 +2567,7 @@ TEST_F(SerializeBasicTest, BasicTypeTest_Succeed)
 
                         AZ::SerializeContext::VersionConverter converter = [](AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement) -> bool
                         {
-                            const int idx = classElement.FindElement(AZ_CRC("Pointer", 0x320468a8));
+                            const int idx = classElement.FindElement(AZ_CRC_CE("Pointer"));
                             classElement.GetSubElement(idx).Convert<SimpleDerivedClass2>(context);
                             return true;
                         };
@@ -2722,10 +2722,10 @@ TEST_F(SerializeBasicTest, BasicTypeTest_Succeed)
                 : public DataOverlayProviderBus::Handler
             {
             public:
-                static DataOverlayProviderId    GetProviderId() { return AZ_CRC("DataOverlayProviderExample", 0x60dafdbd); }
-                static u32                      GetIntToken() { return AZ_CRC("int_data", 0xd74868f3); }
-                static u32                      GetVectorToken() { return AZ_CRC("vector_data", 0x0aca20c0); }
-                static u32                      GetPointerToken() { return AZ_CRC("pointer_data", 0xa46a746e); }
+                static DataOverlayProviderId    GetProviderId() { return AZ_CRC_CE("DataOverlayProviderExample"); }
+                static u32                      GetIntToken() { return AZ_CRC_CE("int_data"); }
+                static u32                      GetVectorToken() { return AZ_CRC_CE("vector_data"); }
+                static u32                      GetPointerToken() { return AZ_CRC_CE("pointer_data"); }
 
                 DataOverlayProviderExample()
                 {
@@ -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;
@@ -4127,18 +4127,18 @@ namespace UnitTest
                     EXPECT_EQ( 2, classData->m_editData->m_elements.size() );
                     EXPECT_EQ( 0, strcmp(classData->m_editData->m_elements.front().m_description, "Special data group") );
                     EXPECT_EQ( 1, classData->m_editData->m_elements.front().m_attributes.size() );
-                    EXPECT_TRUE(classData->m_editData->m_elements.front().m_attributes[0].first == AZ_CRC("Callback", 0x79f97426) );
+                    EXPECT_TRUE(classData->m_editData->m_elements.front().m_attributes[0].first == AZ_CRC_CE("Callback") );
                 }
                 else if (classElement && classElement->m_editData && strcmp(classElement->m_editData->m_description, "Type") == 0)
                 {
                     EXPECT_EQ( 2, classElement->m_editData->m_attributes.size() );
                     // Number of options attribute
-                    EXPECT_EQ(classElement->m_editData->m_attributes[0].first, AZ_CRC("NumOptions", 0x90274abc));
+                    EXPECT_EQ(classElement->m_editData->m_attributes[0].first, AZ_CRC_CE("NumOptions"));
                     Edit::AttributeData<int>* intData = azrtti_cast<Edit::AttributeData<int>*>(classElement->m_editData->m_attributes[0].second);
                     EXPECT_TRUE(intData != nullptr);
                     EXPECT_EQ( 3, intData->Get(instance) );
                     // Get options attribute
-                    EXPECT_EQ( classElement->m_editData->m_attributes[1].first, AZ_CRC("Options", 0xd035fa87));
+                    EXPECT_EQ( classElement->m_editData->m_attributes[1].first, AZ_CRC_CE("Options"));
                     Edit::AttributeFunction<int(int)>* funcData = azrtti_cast<Edit::AttributeFunction<int(int)>*>(classElement->m_editData->m_attributes[1].second);
                     EXPECT_TRUE(funcData != nullptr);
                     EXPECT_EQ( 20, funcData->Invoke(instance, 10) );
@@ -4371,7 +4371,7 @@ namespace UnitTest
                     {
                         AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(i);
 
-                        if (elementNode.GetName() == AZ_CRC("m_textData", 0xfc7870e5))
+                        if (elementNode.GetName() == AZ_CRC_CE("m_textData"))
                         {
                             bool result = elementNode.GetData(newData);
                             EXPECT_TRUE(result);
@@ -4383,7 +4383,7 @@ namespace UnitTest
                     for (int i = 0; i < classElement.GetNumSubElements(); ++i)
                     {
                         AZ::SerializeContext::DataElementNode& elementNode = classElement.GetSubElement(i);
-                        if (elementNode.GetName() == AZ_CRC("m_newTextData", 0x3feafc3d))
+                        if (elementNode.GetName() == AZ_CRC_CE("m_newTextData"))
                         {
                             elementNode.SetData(context, newData);
                             break;
@@ -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/AzCore/Tests/Statistics.cpp

@@ -193,10 +193,10 @@ namespace UnitTest
     TEST_F(StatisticsTest, StatisticsManagerCrc32_DistributeSamplesAcrossStatistics_StatisticsAreCorrect)
     {
         Statistics::StatisticsManager<AZ::Crc32> statsManager;
-        AZ::Crc32 statName0 = AZ_CRC("stat0", 0xb8927780);
-        AZ::Crc32 statName1 = AZ_CRC("stat1", 0xcf954716);
-        AZ::Crc32 statName2 = AZ_CRC("stat2", 0x569c16ac);
-        AZ::Crc32 statName3 = AZ_CRC("stat3", 0x219b263a);
+        AZ::Crc32 statName0 = AZ_CRC_CE("stat0");
+        AZ::Crc32 statName1 = AZ_CRC_CE("stat1");
+        AZ::Crc32 statName2 = AZ_CRC_CE("stat2");
+        AZ::Crc32 statName3 = AZ_CRC_CE("stat3");
 
         EXPECT_TRUE(statsManager.AddStatistic(statName3) != nullptr);
         EXPECT_TRUE(statsManager.AddStatistic(statName0) != nullptr);

Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.cpp

@@ -25,7 +25,7 @@ namespace AzFramework
         if (classElement.GetVersion() == 1)
         {
             // Old asset path field is gone.
-            const int assetRootIndex = classElement.FindElement(AZ_CRC("AssetRoot", 0x3195232d));
+            const int assetRootIndex = classElement.FindElement(AZ_CRC_CE("AssetRoot"));
             if (assetRootIndex >= 0)
             {
                 classElement.RemoveElement(assetRootIndex);

Code/Framework/AzFramework/AzFramework/Asset/AssetCatalogComponent.h

@@ -40,19 +40,19 @@ namespace AzFramework
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("ScannerCatalogService", 0x74e0c82c));
-            provided.push_back(AZ_CRC("AssetCatalogService", 0xc68ffc57));
+            provided.push_back(AZ_CRC_CE("ScannerCatalogService"));
+            provided.push_back(AZ_CRC_CE("AssetCatalogService"));
         }
 
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("ScannerCatalogService", 0x74e0c82c));
-            incompatible.push_back(AZ_CRC("AssetCatalogService", 0xc68ffc57));
+            incompatible.push_back(AZ_CRC_CE("ScannerCatalogService"));
+            incompatible.push_back(AZ_CRC_CE("AssetCatalogService"));
         }
 
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
-            required.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
+            required.push_back(AZ_CRC_CE("AssetDatabaseService"));
         }
 
     protected:

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

@@ -74,7 +74,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(NegotiationMessage, AZ::OSAllocator);
             AZ_RTTI(NegotiationMessage, "{BA6336E4-4DF5-49EF-A184-FE8F5BC73731}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::Negotiation", 0x141ebc28);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::Negotiation");
 
             NegotiationMessage() = default;
             unsigned int GetMessageType() const override;
@@ -93,7 +93,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(RequestPing, AZ::OSAllocator);
             AZ_RTTI(RequestPing, "{E06F6663-A168-439A-83E1-6F2215BAC0B6}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::RequestPing", 0xa6124cfb);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::RequestPing");
 
             RequestPing() = default;
             unsigned int GetMessageType() const override;
@@ -126,7 +126,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(RequestAssetStatus, AZ::OSAllocator);
             AZ_RTTI(RequestAssetStatus, "{0CBE6A7C-9D19-4D41-B29C-A52476BB337A}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::RequestAssetStatus", 0x63146187);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::RequestAssetStatus");
             explicit RequestAssetStatus(bool requireFencing = true);
             RequestAssetStatus(const char* sourceData, bool isStatusRequest, bool requireFencing = true, int searchType = SearchType::Default);
             RequestAssetStatus(const AZ::Data::AssetId& assetId, bool isStatusRequest, bool requireFencing = true);
@@ -164,7 +164,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(RequestEscalateAsset, AZ::OSAllocator);
             AZ_RTTI(RequestEscalateAsset, "{E95C5422-5F00-478B-A984-C041DE70484F}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::RequestEscalateAsset", 0x1894d94e);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::RequestEscalateAsset");
 
             RequestEscalateAsset() = default;
             ~RequestEscalateAsset() override = default;
@@ -187,7 +187,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(RequestAssetProcessorStatus, AZ::OSAllocator);
             AZ_RTTI(RequestAssetProcessorStatus, "{DEC6CF93-0A16-4D83-AA6D-97FB86340525}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::RequestAssetProcessorStatus", 0x5172b959);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::RequestAssetProcessorStatus");
 
             RequestAssetProcessorStatus() = default;
             unsigned int GetMessageType() const override;
@@ -218,7 +218,7 @@ namespace AzFramework
             AZ_RTTI(GetUnresolvedDependencyCountsRequest, "{DE432E6F-72D8-48A7-857C-51D1D41EB880}", BaseAssetProcessorMessage);
 
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::GetUnresolvedDependencyCountsRequest", 0xb430e444);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::GetUnresolvedDependencyCountsRequest");
 
             GetUnresolvedDependencyCountsRequest() = default;
             explicit GetUnresolvedDependencyCountsRequest(AZ::Data::AssetId assetId)
@@ -259,7 +259,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(GetRelativeProductPathFromFullSourceOrProductPathRequest, AZ::OSAllocator);
             AZ_RTTI(GetRelativeProductPathFromFullSourceOrProductPathRequest, "{2ED7888B-959C-451C-90B6-8EF7B0B4E385}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::GetRelativeProductPathFromFullSourceOrProductPath", 0x53293a7a);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::GetRelativeProductPathFromFullSourceOrProductPath");
 
             GetRelativeProductPathFromFullSourceOrProductPathRequest() = default;
             GetRelativeProductPathFromFullSourceOrProductPathRequest(const AZ::OSString& sourceOrProductPath);
@@ -332,7 +332,7 @@ namespace AzFramework
             AZ_RTTI(GetFullSourcePathFromRelativeProductPathRequest, "{F48E2159-4711-4D0E-838F-91B472AE10FF}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
 
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::GetFullSourcePathFromRelativeProductPath", 0x08057afe);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::GetFullSourcePathFromRelativeProductPath");
 
             GetFullSourcePathFromRelativeProductPathRequest() = default;
             GetFullSourcePathFromRelativeProductPathRequest(const AZ::OSString& relativeProductPath);
@@ -367,7 +367,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(SourceAssetInfoRequest, AZ::OSAllocator);
             AZ_RTTI(SourceAssetInfoRequest, "{e92cd74f-11e0-4ad8-a786-61d3b9715e35}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::SourceAssetInfoRequest", 0x350a86f3);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::SourceAssetInfoRequest");
 
             SourceAssetInfoRequest() = default;
 
@@ -414,7 +414,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(AssetInfoRequest, AZ::OSAllocator);
             AZ_RTTI(AssetInfoRequest, "{AB1468DB-99B5-4666-A619-4D3F746805A5}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::AssetInfoRequest", 0xfe3e020a);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::AssetInfoRequest");
 
             AssetInfoRequest() = default;
 
@@ -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;
 
@@ -528,7 +528,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(RegisterSourceAssetRequest, AZ::OSAllocator);
             AZ_RTTI(RegisterSourceAssetRequest, "{189c6045-e1d4-4d78-b0e7-2bb7bd05fde1}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::RegisterSourceAssetRequest", 0x5f414e59);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::RegisterSourceAssetRequest");
 
             RegisterSourceAssetRequest() = default;
             RegisterSourceAssetRequest(const AZ::Data::AssetType& assetType, const char* assetFileFilter);
@@ -548,7 +548,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(UnregisterSourceAssetRequest, AZ::OSAllocator);
             AZ_RTTI(UnregisterSourceAssetRequest, "{ce3cf055-cf91-4851-9e2c-cb24b2b172d3}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::UnregisterSourceAssetRequest", 0xfbe53ee1);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::UnregisterSourceAssetRequest");
 
             UnregisterSourceAssetRequest() = default;
             UnregisterSourceAssetRequest(const AZ::Data::AssetType& assetType);
@@ -567,7 +567,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(ShowAssetProcessorRequest, AZ::OSAllocator);
             AZ_RTTI(ShowAssetProcessorRequest, "{509CA545-1213-4064-9B58-6FFE3DDD27D3}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::ShowWindow", 0x33a6cd1f);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::ShowWindow");
 
             ShowAssetProcessorRequest() = default;
             unsigned int GetMessageType() const override;
@@ -582,7 +582,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(UpdateSourceControlStatusRequest, AZ::OSAllocator);
             AZ_RTTI(UpdateSourceControlStatusRequest, "{B313400A-3E5D-496F-BD91-09B9C10EBDF0}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::UpdateSourceControlStatusRequest", 0x42f7a516);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::UpdateSourceControlStatusRequest");
 
             UpdateSourceControlStatusRequest() = default;
             unsigned int GetMessageType() const override;
@@ -599,7 +599,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(ShowAssetInAssetProcessorRequest, AZ::OSAllocator);
             AZ_RTTI(ShowAssetInAssetProcessorRequest, "{04A068A0-58D7-4404-ABAD-AED72287FFE8}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::ShowAssetInAssetProcessor", 0x3c9d1be0);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::ShowAssetInAssetProcessor");
 
             ShowAssetInAssetProcessorRequest() = default;
             unsigned int GetMessageType() const override;
@@ -629,7 +629,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(AssetNotificationMessage, AZ::OSAllocator);
             AZ_RTTI(AssetNotificationMessage, "{09EDFFA4-6851-4AB2-B018-51F0F671D9D5}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessorManager::AssetNotification", 0xd6191df5);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessorManager::AssetNotification");
 
             AssetNotificationMessage() = default;
             AssetNotificationMessage(const AZ::OSString& data, NotificationType type, const AZ::Data::AssetType& assetType, const AZ::OSString& platform);
@@ -671,7 +671,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(SaveAssetCatalogRequest, AZ::OSAllocator);
             AZ_RTTI(SaveAssetCatalogRequest, "{12B0C076-97A8-4FAE-9F56-22A890766272}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessorManager::SaveCatalogRequest", 0x79e0f02f);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessorManager::SaveCatalogRequest");
             SaveAssetCatalogRequest() = default;
             unsigned int GetMessageType() const override;
         };
@@ -701,7 +701,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileOpenRequest, AZ::OSAllocator);
             AZ_RTTI(FileOpenRequest, "{C230ADF3-970D-4A4D-A128-112C9E2DC164}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileOpen", 0x344f46ca);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileOpen");
 
             FileOpenRequest() = default;
             FileOpenRequest(const char* filePath, AZ::u32 mode);
@@ -734,7 +734,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileCloseRequest, AZ::OSAllocator);
             AZ_RTTI(FileCloseRequest, "{D294976E-7664-436F-ACA4-7BCABAA2F5EC}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileClose", 0xb99bf25e);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileClose");
 
             FileCloseRequest() = default;
             FileCloseRequest(AZ::u32 fileHandle);
@@ -750,7 +750,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileReadRequest, AZ::OSAllocator);
             AZ_RTTI(FileReadRequest, "{9FC866C7-A9C0-41CB-BC41-A333240D3C7E}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileRead", 0x08688409);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileRead");
 
             FileReadRequest() = default;
             FileReadRequest(AZ::u32 fileHandle, AZ::u64 bytesToRead, bool failOnFewerRead = false);
@@ -784,7 +784,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileWriteRequest, AZ::OSAllocator);
             AZ_RTTI(FileWriteRequest, "{4CB9EBC7-ACB9-45DC-9D58-2E8BDF975E12}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileWrite", 0xd7f109c5);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileWrite");
 
             FileWriteRequest() = default;
             FileWriteRequest(AZ::u32 fileHandle, const void* data, AZ::u64 dataLength);
@@ -817,7 +817,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileTellRequest, AZ::OSAllocator);
             AZ_RTTI(FileTellRequest, "{EF11067E-5C35-4A3F-8BB2-FEC57C037E3F}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileTell", 0x96762daa);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileTell");
 
             FileTellRequest() = default;
             FileTellRequest(AZ::u32 fileHandle);
@@ -849,7 +849,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileSeekRequest, AZ::OSAllocator);
             AZ_RTTI(FileSeekRequest, "{B6E9C144-8033-416D-8E90-0260BE32E164}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileSeek", 0x44073bf9);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileSeek");
 
             FileSeekRequest() = default;
             FileSeekRequest(AZ::u32 fileHandle, AZ::u32 mode, AZ::s64 offset);
@@ -882,7 +882,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileIsReadOnlyRequest, AZ::OSAllocator);
             AZ_RTTI(FileIsReadOnlyRequest, "{408CBD3D-582B-4C78-968D-00BDA9B7CBF3}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::IsReadOnly", 0x6ee110cf);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::IsReadOnly");
 
             FileIsReadOnlyRequest() = default;
             FileIsReadOnlyRequest(const AZ::OSString& filePath);
@@ -913,7 +913,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(PathIsDirectoryRequest, AZ::OSAllocator);
             AZ_RTTI(PathIsDirectoryRequest, "{0F35F08C-4F93-4EA5-8C98-7FB923160A39}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::IsDirectory", 0xfe975e0e);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::IsDirectory");
 
             PathIsDirectoryRequest() = default;
             PathIsDirectoryRequest(const AZ::OSString& path);
@@ -944,7 +944,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileSizeRequest, AZ::OSAllocator);
             AZ_RTTI(FileSizeRequest, "{08F67CF7-A91A-498E-A010-7E3FCDE959FC}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileSize", 0x67ffe104);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileSize");
 
             FileSizeRequest() = default;
             FileSizeRequest(const AZ::OSString& filePath);
@@ -976,7 +976,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileModTimeRequest, AZ::OSAllocator);
             AZ_RTTI(FileModTimeRequest, "{AFE37457-7EBE-4432-A6CA-78EEDF82F760}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileModTime", 0xee6f318c);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileModTime");
 
             FileModTimeRequest() = default;
             FileModTimeRequest(const AZ::OSString& filePath);
@@ -1007,7 +1007,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileExistsRequest, AZ::OSAllocator);
             AZ_RTTI(FileExistsRequest, "{82751F22-4441-42E7-8187-4D84B97BD2AD}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileExists", 0xa2ef8699);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileExists");
 
             FileExistsRequest() = default;
             FileExistsRequest(const AZ::OSString& filePath);
@@ -1038,7 +1038,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileFlushRequest, AZ::OSAllocator);
             AZ_RTTI(FileFlushRequest, "{0313BA96-2844-4007-9EB8-B98831CA68C7}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileFlush", 0x1e7b2735);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileFlush");
 
             FileFlushRequest() = default;
             FileFlushRequest(AZ::u32 fileHandle);
@@ -1069,7 +1069,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(PathCreateRequest, AZ::OSAllocator);
             AZ_RTTI(PathCreateRequest, "{C7DF8777-2497-4473-8F33-AFD5A4015497}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::PathCreate", 0xc047183b);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::PathCreate");
 
             PathCreateRequest() = default;
             PathCreateRequest(const AZ::OSString& path);
@@ -1100,7 +1100,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(PathDestroyRequest, AZ::OSAllocator);
             AZ_RTTI(PathDestroyRequest, "{628A4C23-1F32-4A35-91F0-C7DFB76FAA9C}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::PathDestroy", 0xe761d533);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::PathDestroy");
 
             PathDestroyRequest() = default;
             PathDestroyRequest(const AZ::OSString& path);
@@ -1131,7 +1131,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileRemoveRequest, AZ::OSAllocator);
             AZ_RTTI(FileRemoveRequest, "{3EB05CEF-D98A-47EC-A688-A485EFB11DC6}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileRemove", 0x78f0fd19);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileRemove");
 
             FileRemoveRequest() = default;
             FileRemoveRequest(const AZ::OSString& filePath);
@@ -1162,7 +1162,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileCopyRequest, AZ::OSAllocator);
             AZ_RTTI(FileCopyRequest, "{2107C8FD-8150-44A1-B984-AA70D9FD36E2}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileCopy", 0xdd857eec);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileCopy");
 
             FileCopyRequest() = default;
             FileCopyRequest(const AZ::OSString& srcPath, const AZ::OSString& destPath);
@@ -1194,7 +1194,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileRenameRequest, AZ::OSAllocator);
             AZ_RTTI(FileRenameRequest, "{188FD344-DDE2-4C25-BBE0-360F2022B276}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileRename", 0xc9edb467);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileRename");
 
             FileRenameRequest() = default;
             FileRenameRequest(const AZ::OSString& srcPath, const AZ::OSString& destPath);
@@ -1226,7 +1226,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FindFilesRequest, AZ::OSAllocator);
             AZ_RTTI(FindFilesRequest, "{66355EF6-B91F-4E2E-B50A-F59F6E46712D}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FindFiles", 0xf06cf14f);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FindFiles");
 
             FindFilesRequest() = default;
             FindFilesRequest(const AZ::OSString& path, const AZ::OSString& filter);
@@ -1261,7 +1261,7 @@ namespace AzFramework
             AZ_CLASS_ALLOCATOR(FileTreeRequest, AZ::OSAllocator);
             AZ_RTTI(FileTreeRequest, "{6838CC3C-2CF1-443C-BFBF-A530003B6A71}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::FileTree", 0x27019bb2);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::FileTree");
 
             FileTreeRequest() = default;
             unsigned int GetMessageType() const override;

Code/Framework/AzFramework/AzFramework/Asset/AssetSystemComponent.cpp

@@ -336,12 +336,12 @@ namespace AzFramework
 
         void AssetSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("AssetProcessorConnection", 0xf0cd75cd));
+            provided.push_back(AZ_CRC_CE("AssetProcessorConnection"));
         }
 
         void AssetSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("AssetProcessorConnection", 0xf0cd75cd));
+            incompatible.push_back(AZ_CRC_CE("AssetProcessorConnection"));
         }
 
         void AssetSystemComponent::EnableSocketConnection()

Code/Framework/AzFramework/AzFramework/Components/AzFrameworkConfigurationSystemComponent.cpp

@@ -77,18 +77,18 @@ namespace AzFramework
 
     void AzFrameworkConfigurationSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("AzFrameworkConfigurationSystemComponentService", 0xcc49c96e));
+        provided.push_back(AZ_CRC_CE("AzFrameworkConfigurationSystemComponentService"));
     }
 
     void AzFrameworkConfigurationSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("AzFrameworkConfigurationSystemComponentService", 0xcc49c96e));
+        incompatible.push_back(AZ_CRC_CE("AzFrameworkConfigurationSystemComponentService"));
     }
 
     void AzFrameworkConfigurationSystemComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
     {
-        dependent.push_back(AZ_CRC("SceneSystemComponentService", 0xd8975435));
-        dependent.push_back(AZ_CRC("GameEntityContextService", 0xa6f2c885));
+        dependent.push_back(AZ_CRC_CE("SceneSystemComponentService"));
+        dependent.push_back(AZ_CRC_CE("GameEntityContextService"));
     }
 
 } // AzFramework

Code/Framework/AzFramework/AzFramework/Components/TransformComponent.cpp

@@ -99,7 +99,7 @@ namespace AzFramework
             // However, some data may have been exported with this field present, so 
             // remove it if its found, but only in this version which the change was present in, so that
             // future re-additions of it won't remove it (as long as they bump the version number.)
-            classElement.RemoveElementByName(AZ_CRC("InterpolateScale", 0x9d00b831));
+            classElement.RemoveElementByName(AZ_CRC_CE("InterpolateScale"));
         }
 
         return true;
@@ -704,7 +704,7 @@ namespace AzFramework
 
     void TransformComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("TransformService", 0x8ee22c50));
+        provided.push_back(AZ_CRC_CE("TransformService"));
     }
 
     void TransformComponent::Reflect(AZ::ReflectContext* reflection)

Code/Framework/AzFramework/AzFramework/Entity/GameEntityContextComponent.h

@@ -78,15 +78,15 @@ namespace AzFramework
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("GameEntityContextService", 0xa6f2c885));
+            provided.push_back(AZ_CRC_CE("GameEntityContextService"));
         }
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("GameEntityContextService", 0xa6f2c885));
+            incompatible.push_back(AZ_CRC_CE("GameEntityContextService"));
         }
         static void GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
-            required.push_back(AZ_CRC("SliceSystemService", 0x1a5b7aad));
+            required.push_back(AZ_CRC_CE("SliceSystemService"));
         }
 
     private:

Code/Framework/AzFramework/AzFramework/Input/Contexts/InputContextComponent.cpp

@@ -20,7 +20,7 @@ namespace AzFramework
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void InputContextComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("InputContextService", 0xa2734425));
+        provided.push_back(AZ_CRC_CE("InputContextService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
@@ -44,7 +44,7 @@ namespace AzFramework
                     ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::Category, "Input")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
                     ->DataElement(AZ::Edit::UIHandlers::Default, &InputContextComponent::m_uniqueName, "Unique Name",
                         "The name of the input context, unique among all active input contexts and input devices.\n"
                         "This will be truncated if its length exceeds that of InputDeviceId::MAX_NAME_LENGTH = 64")

Code/Framework/AzFramework/AzFramework/Input/System/InputSystemComponent.cpp

@@ -153,13 +153,13 @@ namespace AzFramework
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void InputSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("InputSystemService", 0x5438d51a));
+        provided.push_back(AZ_CRC_CE("InputSystemService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////
     void InputSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("InputSystemService", 0x5438d51a));
+        incompatible.push_back(AZ_CRC_CE("InputSystemService"));
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////

Code/Framework/AzFramework/AzFramework/Logging/LoggingComponent.cpp

@@ -185,12 +185,12 @@ namespace AzFramework
 
     void LogComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("LoggingService", 0x64b9f716));
+        provided.push_back(AZ_CRC_CE("LoggingService"));
     }
 
     void LogComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("LoggingService", 0x64b9f716));
+        incompatible.push_back(AZ_CRC_CE("LoggingService"));
     }
 
     void LogComponent::SetMachineReadable(bool newValue)

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/Render/GameIntersectorComponent.h

@@ -32,7 +32,7 @@ namespace AzFramework
 
             static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
             {
-                dependent.push_back(AZ_CRC("GameEntityContextService", 0xa6f2c885));
+                dependent.push_back(AZ_CRC_CE("GameEntityContextService"));
             }
 
         private:

Code/Framework/AzFramework/AzFramework/Scene/SceneSystemComponent.cpp

@@ -44,12 +44,12 @@ namespace AzFramework
 
     void SceneSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("SceneSystemComponentService", 0xd8975435));
+        provided.push_back(AZ_CRC_CE("SceneSystemComponentService"));
     }
 
     void SceneSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("SceneSystemComponentService", 0xd8975435));
+        incompatible.push_back(AZ_CRC_CE("SceneSystemComponentService"));
     }
 
     AZ::Outcome<AZStd::shared_ptr<Scene>, AZStd::string> SceneSystemComponent::CreateScene(AZStd::string_view name)

Code/Framework/AzFramework/AzFramework/Script/ScriptComponent.cpp

@@ -884,7 +884,7 @@ namespace AzFramework
                     // If version 2, remove SourceScriptName
                     if (node.GetVersion() == 2)
                     {
-                        int index = node.FindElement(AZ_CRC("SourceScriptName", 0x3654ac50));
+                        int index = node.FindElement(AZ_CRC_CE("SourceScriptName"));
                         if (index != -1)
                         {
                             node.RemoveElement(index);

Code/Framework/AzFramework/AzFramework/Script/ScriptDebugMsgReflection.h

@@ -32,12 +32,12 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugRequest, "{2137E01A-F2AE-4137-A17E-6B82F3B7E4DE}", RemoteToolsMessage);
 
         ScriptDebugRequest()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugAgent", 0xb6be0836)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugAgent")) {}
         ScriptDebugRequest(AZ::u32 request)
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugAgent", 0xb6be0836))
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugAgent"))
             , m_request(request) {}
         ScriptDebugRequest(AZ::u32 request, const char* context)
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugAgent", 0xb6be0836))
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugAgent"))
             , m_request(request)
             , m_context(context) {}
 
@@ -68,7 +68,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugSetValue, "{11E0E012-BD54-457D-A44B-FDDA55736ED3}", RemoteToolsMessage);
 
         ScriptDebugSetValue()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugAgent", 0xb6be0836)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugAgent")) {}
 
         AZ::ScriptContextDebug::DebugValue  m_value;
     };
@@ -81,7 +81,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugAck, "{0CA1671A-BAFD-499C-B2CD-7B7E3DD5E2A8}", RemoteToolsMessage);
 
         ScriptDebugAck(AZ::u32 request = 0, AZ::u32 ackCode = 0)
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e))
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger"))
             , m_request(request)
             , m_ackCode(ackCode)
         {}
@@ -98,7 +98,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugAckBreakpoint, "{D9644B8A-92FD-43B6-A579-77E123A72EC2}",  RemoteToolsMessage);
 
         ScriptDebugAckBreakpoint()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         AZ::u32         m_id;
         AZStd::string   m_moduleName;
@@ -113,7 +113,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugAckExecute, "{F5B24F7E-85DA-4FE8-B720-AABE35CE631D}", RemoteToolsMessage);
 
         ScriptDebugAckExecute()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         AZStd::string   m_moduleName;
         bool            m_result;
@@ -127,7 +127,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugEnumLocalsResult, "{201701DD-0B74-4886-AB84-93BDB338A8DD}", RemoteToolsMessage);
 
         ScriptDebugEnumLocalsResult()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         AZStd::vector<AZStd::string>    m_names;
     };
@@ -140,7 +140,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugEnumContextsResult, "{8CE74569-9B7D-4993-AFE8-38BB8CE419F5}", RemoteToolsMessage);
 
         ScriptDebugEnumContextsResult()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         AZStd::vector<AZStd::string>    m_names;
     };
@@ -153,7 +153,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugGetValueResult, "{B10720F1-B8FE-476F-A39D-6E80711580FD}", RemoteToolsMessage);
 
         ScriptDebugGetValueResult()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         AZ::ScriptContextDebug::DebugValue  m_value;
     };
@@ -166,7 +166,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugSetValueResult, "{2E2BD168-1805-43D6-8602-FDE14CED8E53}", RemoteToolsMessage);
 
         ScriptDebugSetValueResult()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         AZStd::string   m_name;
         bool            m_result;
@@ -180,7 +180,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugCallStackResult, "{B2606AC6-F966-4991-8144-BA6117F4A54E}", RemoteToolsMessage);
 
         ScriptDebugCallStackResult()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         AZStd::string   m_callstack;
     };
@@ -193,7 +193,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugRegisteredGlobalsResult, "{CEE4E889-0249-4D59-9D56-CD4BD159E411}", RemoteToolsMessage);
 
         ScriptDebugRegisteredGlobalsResult()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         ScriptUserMethodList    m_methods;
         ScriptUserPropertyList  m_properties;
@@ -207,7 +207,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugRegisteredClassesResult, "{7DF455AB-9AB1-4A95-B906-5DB1D1087EBB}", RemoteToolsMessage);
 
         ScriptDebugRegisteredClassesResult()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         ScriptUserClassList m_classes;
     };
@@ -220,7 +220,7 @@ namespace AzFramework
         AZ_RTTI(ScriptDebugRegisteredEBusesResult, "{D2B5D77C-09F3-476D-A611-49B0A1B9EDFB}", RemoteToolsMessage);
 
         ScriptDebugRegisteredEBusesResult()
-            : RemoteToolsMessage(AZ_CRC("ScriptDebugger", 0xf8ab685e)) {}
+            : RemoteToolsMessage(AZ_CRC_CE("ScriptDebugger")) {}
 
         ScriptUserEBusList m_ebusList;
     };

Code/Framework/AzFramework/AzFramework/Script/ScriptRemoteDebugging.cpp

@@ -354,7 +354,7 @@ namespace AzFramework
 
                 // Notify debugger that we successfully connected
                 RemoteToolsInterface::Get()->SendRemoteToolsMessage(
-                    ti, ScriptDebugAck(AZ_CRC("AttachDebugger", 0x6590ff36), AZ_CRC("Ack", 0x22e4f8b1)));
+                    ti, ScriptDebugAck(AZ_CRC_CE("AttachDebugger"), AZ_CRC_CE("Ack")));
                 AZ_TracePrintf("LUA", "Remote debugger %s has attached to context %s.\n", m_debugger.GetDisplayName(), it->m_name.c_str());
                 m_executionState = SDA_STATE_RUNNING;
 
@@ -363,13 +363,13 @@ namespace AzFramework
         }
         // Failed to find context, notify debugger that the connection was rejected.
         RemoteToolsInterface::Get()->SendRemoteToolsMessage(
-            ti, ScriptDebugAck(AZ_CRC("AttachDebugger", 0x6590ff36), AZ_CRC("IllegalOperation", 0x437dc900)));
+            ti, ScriptDebugAck(AZ_CRC_CE("AttachDebugger"), AZ_CRC_CE("IllegalOperation")));
     }
     //-------------------------------------------------------------------------
     void ScriptDebugAgent::Detach()
     {
         RemoteToolsInterface::Get()->SendRemoteToolsMessage(
-            m_debugger, ScriptDebugAck(AZ_CRC("DetachDebugger", 0x88a2ee04), AZ_CRC("Ack", 0x22e4f8b1)));
+            m_debugger, ScriptDebugAck(AZ_CRC_CE("DetachDebugger"), AZ_CRC_CE("Ack")));
 
         // TODO: We need to make sure we are thread safe if the contexts are running on
         // different threads.
@@ -439,7 +439,7 @@ namespace AzFramework
 #endif
 
             ScriptDebugAckBreakpoint response;
-            response.m_id = AZ_CRC("BreakpointHit", 0xf1a38e0b);
+            response.m_id = AZ_CRC_CE("BreakpointHit");
             response.m_moduleName = breakpoint->m_sourceName;
             response.m_line = static_cast<AZ::u32>(breakpoint->m_lineNumber);
             RemoteToolsInterface::Get()->SendRemoteToolsMessage(m_debugger, response);
@@ -495,13 +495,13 @@ namespace AzFramework
             {
                 ScriptDebugRequest* request = azdynamic_cast<ScriptDebugRequest*>(msg.get());
                 if (!request ||
-                    (request->m_request != AZ_CRC("AttachDebugger", 0x6590ff36) &&
-                     request->m_request != AZ_CRC("EnumContexts", 0xbdb959ba)))
+                    (request->m_request != AZ_CRC_CE("AttachDebugger") &&
+                     request->m_request != AZ_CRC_CE("EnumContexts")))
                 {
                     AZ_TracePrintf(
                         "LUA", "Rejecting msg 0x%x (%s is not the attached debugger)\n", request->m_request, sender.GetDisplayName());
                     RemoteToolsInterface::Get()->SendRemoteToolsMessage(
-                        sender, ScriptDebugAck(request->m_request, AZ_CRC("AccessDenied", 0xde72ce21)));
+                        sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("AccessDenied")));
                     continue;
                 }
             }
@@ -514,12 +514,12 @@ namespace AzFramework
                 bp.m_sourceName = request->m_context.c_str();
                 bp.m_lineNumber = request->m_line;
 
-                if (request->m_request == AZ_CRC("AddBreakpoint", 0xba71daa4))
+                if (request->m_request == AZ_CRC_CE("AddBreakpoint"))
                 {
                     AZ_TracePrintf("LUA", "Adding breakpoint %s:%d\n", bp.m_sourceName.c_str(), bp.m_lineNumber);
                     dbgContext->AddBreakpoint(bp);
                 }
-                else if (request->m_request == AZ_CRC("RemoveBreakpoint", 0x90ade500))
+                else if (request->m_request == AZ_CRC_CE("RemoveBreakpoint"))
                 {
                     AZ_TracePrintf("LUA", "Removing breakpoint %s:%d\n", bp.m_sourceName.c_str(), bp.m_lineNumber);
                     dbgContext->RemoveBreakpoint(bp);
@@ -544,7 +544,7 @@ namespace AzFramework
                 else
                 {
                     AZ_TracePrintf("LUA", "Command rejected. 'SetValue' can only be issued while on a breakpoint.\n");
-                    RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(AZ_CRC("SetValue", 0xd595caa6), AZ_CRC("IllegalOperation", 0x437dc900)));
+                    RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(AZ_CRC_CE("SetValue"), AZ_CRC_CE("IllegalOperation")));
                 }
             }
             else if (azrtti_istypeof<ScriptDebugRequest*>(msg.get()))
@@ -552,7 +552,7 @@ namespace AzFramework
                 ScriptDebugRequest* request = azdynamic_cast<ScriptDebugRequest*>(msg.get());
                 // Check request type
                 // EnumLocals
-                if (request->m_request == AZ_CRC("EnumLocals", 0x4aa29dcf))     // enumerates local variables
+                if (request->m_request == AZ_CRC_CE("EnumLocals"))     // enumerates local variables
                 {
                     if (m_executionState == SDA_STATE_PAUSED)
                     {
@@ -564,11 +564,11 @@ namespace AzFramework
                     else
                     {
                         AZ_TracePrintf("LUA", "Command rejected. 'EnumLocals' can only be issued while on a breakpoint.\n");
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("IllegalOperation", 0x437dc900)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("IllegalOperation")));
                     }
                     // GetValue
                 }
-                else if (request->m_request == AZ_CRC("GetValue", 0x2d64f577))
+                else if (request->m_request == AZ_CRC_CE("GetValue"))
                 {
                     ScriptDebugGetValueResult response;
                     response.m_value.m_name = request->m_context;
@@ -576,66 +576,66 @@ namespace AzFramework
                     RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, response);
                     // StepOver
                 }
-                else if (request->m_request == AZ_CRC("StepOver", 0x6b89bf41))
+                else if (request->m_request == AZ_CRC_CE("StepOver"))
                 {
                     if (m_executionState == SDA_STATE_PAUSED)
                     {
                         dbgContext->StepOver();
                         m_executionState = SDA_STATE_RUNNING;
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("Ack", 0x22e4f8b1)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("Ack")));
                     }
                     else
                     {
                         AZ_TracePrintf("LUA", "Command rejected. 'StepOver' can only be issued while on a breakpoint.\n");
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("IllegalOperation", 0x437dc900)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("IllegalOperation")));
                     }
                     // StepIn
                 }
-                else if (request->m_request == AZ_CRC("StepIn", 0x761a6b13))
+                else if (request->m_request == AZ_CRC_CE("StepIn"))
                 {
                     if (m_executionState == SDA_STATE_PAUSED)
                     {
                         dbgContext->StepInto();
                         m_executionState = SDA_STATE_RUNNING;
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("Ack", 0x22e4f8b1)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("Ack")));
                     }
                     else
                     {
                         AZ_TracePrintf("LUA", "Command rejected. 'StepIn' can only be issued while on a breakpoint.\n");
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("IllegalOperation", 0x437dc900)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("IllegalOperation")));
                     }
                     // StepOut
                 }
-                else if (request->m_request == AZ_CRC("StepOut", 0xac19b635))
+                else if (request->m_request == AZ_CRC_CE("StepOut"))
                 {
                     if (m_executionState == SDA_STATE_PAUSED)
                     {
                         dbgContext->StepOut();
                         m_executionState = SDA_STATE_RUNNING;
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("Ack", 0x22e4f8b1)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("Ack")));
                     }
                     else
                     {
                         AZ_TracePrintf("LUA", "Command rejected. 'StepOut' can only be issued while on a breakpoint.\n");
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("IllegalOperation", 0x437dc900)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("IllegalOperation")));
                     }
                     // Continue
                 }
-                else if (request->m_request == AZ_CRC("Continue", 0x13e32adf))
+                else if (request->m_request == AZ_CRC_CE("Continue"))
                 {
                     if (m_executionState == SDA_STATE_PAUSED)
                     {
                         m_executionState = SDA_STATE_RUNNING;
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("Ack", 0x22e4f8b1)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("Ack")));
                     }
                     else
                     {
                         AZ_TracePrintf("LUA", "Command rejected. 'Continue' can only be issued while on a breakpoint.\n");
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("IllegalOperation", 0x437dc900)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("IllegalOperation")));
                     }
                     // GetCallstack
                 }
-                else if (request->m_request == AZ_CRC("GetCallstack", 0x343b24f3))
+                else if (request->m_request == AZ_CRC_CE("GetCallstack"))
                 {
                     if (m_executionState == SDA_STATE_PAUSED)
                     {
@@ -648,32 +648,32 @@ namespace AzFramework
                     else
                     {
                         AZ_TracePrintf("LUA", "Command rejected. 'GetCallstack' can only be issued while on a breakpoint.\n");
-                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("IllegalOperation", 0x437dc900)));
+                        RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("IllegalOperation")));
                     }
                     // enumerates global C++ functions that have been exposed to script
                 }
-                else if (request->m_request == AZ_CRC("EnumRegisteredGlobals", 0x80d1e6af))
+                else if (request->m_request == AZ_CRC_CE("EnumRegisteredGlobals"))
                 {
                     ScriptDebugRegisteredGlobalsResult response;
                     dbgContext->EnumRegisteredGlobals(&ScriptDebugAgentInternal::EnumGlobalMethod, &ScriptDebugAgentInternal::EnumGlobalProperty, &response);
                     RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, response);
                     // enumerates C++ classes that have been exposed to script
                 }
-                else if (request->m_request == AZ_CRC("EnumRegisteredClasses", 0xed6b8070))
+                else if (request->m_request == AZ_CRC_CE("EnumRegisteredClasses"))
                 {
                     ScriptDebugRegisteredClassesResult response;
                     dbgContext->EnumRegisteredClasses(&ScriptDebugAgentInternal::EnumClass, &ScriptDebugAgentInternal::EnumClassMethod, &ScriptDebugAgentInternal::EnumClassProperty, &response.m_classes);
                     RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, response);
                     // enumerates C++ busses that have been exposed to script
                 }
-                else if (request->m_request == AZ_CRC("EnumRegisteredEBuses", 0x8237bde7))
+                else if (request->m_request == AZ_CRC_CE("EnumRegisteredEBuses"))
                 {
                     ScriptDebugRegisteredEBusesResult response;
                     dbgContext->EnumRegisteredEBuses(&ScriptDebugAgentInternal::EnumEBus, &ScriptDebugAgentInternal::EnumEBusSender, &response.m_ebusList);
                     RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, response);
                     // ExecuteScript
                 }
-                else if (request->m_request == AZ_CRC("ExecuteScript", 0xc35e01e7))
+                else if (request->m_request == AZ_CRC_CE("ExecuteScript"))
                 {
                     if (sender.IsSelf() && m_debugger.IsSelf() && m_executionState == SDA_STATE_RUNNING)
                     {
@@ -688,11 +688,11 @@ namespace AzFramework
                     {
                         AZ_TracePrintf("LUA", "Command rejected. 'ExecuteScript' cannot be issued while on a breakpoint or remotely.\n");
                         RemoteToolsInterface::Get()->SendRemoteToolsMessage(
-                            sender, ScriptDebugAck(request->m_request, AZ_CRC("IllegalOperation", 0x437dc900)));
+                            sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("IllegalOperation")));
                     }
                     // AttachDebugger
                 }
-                else if (request->m_request == AZ_CRC("AttachDebugger", 0x6590ff36))
+                else if (request->m_request == AZ_CRC_CE("AttachDebugger"))
                 {
                     if (m_executionState == SDA_STATE_DETACHED)
                     {
@@ -712,7 +712,7 @@ namespace AzFramework
                     return;
                     // DetachDebugger
                 }
-                else if (request->m_request == AZ_CRC("DetachDebugger", 0x88a2ee04))
+                else if (request->m_request == AZ_CRC_CE("DetachDebugger"))
                 {
                     // We need to switch contexts before any more processing, keep remaining messages
                     // in the queue and return.
@@ -723,7 +723,7 @@ namespace AzFramework
                     return;
                     // EnumContexts
                 }
-                else if (request->m_request == AZ_CRC("EnumContexts", 0xbdb959ba))
+                else if (request->m_request == AZ_CRC_CE("EnumContexts"))
                 {
                     AZ_TracePrintf("LUA", "Received EnumContexts request\n");
                     ScriptDebugEnumContextsResult response;
@@ -737,7 +737,7 @@ namespace AzFramework
                 else
                 {
                     AZ_TracePrintf("LUA", "Received invalid command 0x%x.\n", request->m_request);
-                    RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC("InvalidCmd", 0x926abd27)));
+                    RemoteToolsInterface::Get()->SendRemoteToolsMessage(sender, ScriptDebugAck(request->m_request, AZ_CRC_CE("InvalidCmd")));
                 }
             }
             else
@@ -758,17 +758,17 @@ namespace AzFramework
     //-------------------------------------------------------------------------
     void ScriptDebugAgent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("ScriptDebugService", 0x5b0c3898));
+        provided.push_back(AZ_CRC_CE("ScriptDebugService"));
     }
     //-------------------------------------------------------------------------
     void ScriptDebugAgent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("ScriptDebugService", 0x5b0c3898));
+        incompatible.push_back(AZ_CRC_CE("ScriptDebugService"));
     }
     //-------------------------------------------------------------------------
     void ScriptDebugAgent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
     {
-        dependent.push_back(AZ_CRC("ScriptService", 0x787235ab));
+        dependent.push_back(AZ_CRC_CE("ScriptService"));
     }
     //-------------------------------------------------------------------------
     void ScriptDebugAgent::Reflect(AZ::ReflectContext* context)
@@ -810,7 +810,7 @@ namespace AzFramework
     //public:
     //    AZ_CLASS_ALLOCATOR(ScriptDebugAgentFactory, AZ::SystemAllocator,0);
 
-    //    ScriptDebugAgentFactory() : AZ::ComponentFactory<ScriptDebugAgent>(AZ_CRC("ScriptDebugAgent", 0xb6be0836))
+    //    ScriptDebugAgentFactory() : AZ::ComponentFactory<ScriptDebugAgent>(AZ_CRC_CE("ScriptDebugAgent"))
     //    {
     //    }
 

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/StreamingInstall/StreamingInstall.cpp

@@ -124,13 +124,13 @@ namespace AzFramework
         ////////////////////////////////////////////////////////////////////////////////////////
         void StreamingInstallSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("StreamingInstallService", 0xb3cf7bef));
+            provided.push_back(AZ_CRC_CE("StreamingInstallService"));
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////
         void StreamingInstallSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("StreamingInstallService", 0xb3cf7bef));
+            incompatible.push_back(AZ_CRC_CE("StreamingInstallService"));
         }
 
         ////////////////////////////////////////////////////////////////////////////////////////

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/AzQtComponents/AzQtComponents/DragAndDrop/MainWindowDragAndDrop.h

@@ -16,7 +16,7 @@ namespace AzQtComponents
     {
         // this will be the context ID (used to connect to the drag and drop bus) if you care about events 
         // that cover the entire main window.
-        static const AZ::u32 EditorMainWindow = AZ_CRC("EditorMainWindow", 0x82a58b05);
+        static const AZ::u32 EditorMainWindow = AZ_CRC_CE("EditorMainWindow");
     }
 
 }

Code/Framework/AzQtComponents/AzQtComponents/DragAndDrop/ViewportDragAndDrop.h

@@ -17,7 +17,7 @@ namespace AzQtComponents
 {
     namespace DragAndDropContexts 
     {
-        static const AZ::u32 EditorViewport = AZ_CRC("EditorViewport", 0x17395aca);
+        static const AZ::u32 EditorViewport = AZ_CRC_CE("EditorViewport");
     }
 
     /**

Code/Framework/AzToolsFramework/AzToolsFramework/API/EntityCompositionRequestBus.h

@@ -264,14 +264,14 @@ namespace AzToolsFramework
                         AZStd::vector<AZ::Crc32> classEntityTypes;
                         if (reader.Read<AZ::Crc32>(classEntityType))
                         {
-                            if (classEntityType == AZ_CRC("Game", 0x232b318c))
+                            if (classEntityType == AZ_CRC_CE("Game"))
                             {
                                 return true;
                             }
                         }
                         else if (reader.Read<AZStd::vector<AZ::Crc32>>(classEntityTypes))
                         {
-                            if (AZStd::find(classEntityTypes.begin(), classEntityTypes.end(), AZ_CRC("Game", 0x232b318c)) != classEntityTypes.end())
+                            if (AZStd::find(classEntityTypes.begin(), classEntityTypes.end(), AZ_CRC_CE("Game")) != classEntityTypes.end())
                             {
                                 return true;
                             }
@@ -293,12 +293,12 @@ namespace AzToolsFramework
 
     inline bool AppearsInLayerComponentMenu(const AZ::SerializeContext::ClassData& classData)
     {
-        return AppearsInAddComponentMenu(classData, AZ_CRC("Layer", 0xe4db211a));
+        return AppearsInAddComponentMenu(classData, AZ_CRC_CE("Layer"));
     }
 
     inline bool AppearsInLevelComponentMenu(const AZ::SerializeContext::ClassData& classData)
     {
-        return AppearsInAddComponentMenu(classData, AZ_CRC("Level", 0x9aeacc13));
+        return AppearsInAddComponentMenu(classData, AZ_CRC_CE("Level"));
     }
 
     inline bool AppearsInAnyComponentMenu(const AZ::SerializeContext::ClassData& classData)

Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.cpp

@@ -361,7 +361,7 @@ namespace AzToolsFramework
 
         unsigned FileInfosNotificationMessage::GetMessageType() const
         {
-            static unsigned int messageType = AZ_CRC("FileProcessor::FileInfosNotification", 0x001c43f5);
+            static unsigned int messageType = AZ_CRC_CE("FileProcessor::FileInfosNotification");
             return messageType;
         }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetProcessorMessages.h

@@ -67,7 +67,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(AssetJobsInfoRequest, AZ::OSAllocator);
             AZ_RTTI(AssetJobsInfoRequest, "{E5DEF45C-C4CF-47ED-843F-97B3C4A3D5B3}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::AssetJobsInfoRequest", 0xbd18de74);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::AssetJobsInfoRequest");
 
             explicit AssetJobsInfoRequest(bool requireFencing = true);
             explicit AssetJobsInfoRequest(const AZ::Data::AssetId& assetId, bool m_escalateJobs = true, bool requireFencing = true);
@@ -106,7 +106,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(AssetJobLogRequest, AZ::OSAllocator);
             AZ_RTTI(AssetJobLogRequest, "{8E69F76E-F25D-486E-BC3F-26BB3FF5A3A3}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::AssetJobLogRequest", 0xfbb80fd3);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::AssetJobLogRequest");
             explicit AssetJobLogRequest(bool requireFencing = true);
             explicit AssetJobLogRequest(AZ::u64 jobRunKey, bool requireFencing = true);
             unsigned int GetMessageType() const override;
@@ -146,7 +146,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(SourceFileNotificationMessage, AZ::OSAllocator);
             AZ_RTTI(SourceFileNotificationMessage, "{61126952-242A-4299-B1D6-4D0E24DB1B06}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessorManager::SourceFileNotification", 0x8bfc4d1c);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessorManager::SourceFileNotification");
 
             SourceFileNotificationMessage() = default;
             SourceFileNotificationMessage(const AZ::OSString& relPath, const AZ::OSString& scanFolder, NotificationType type, AZ::Uuid sourceUUID);
@@ -165,7 +165,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(GetAbsoluteAssetDatabaseLocationRequest, AZ::OSAllocator);
             AZ_RTTI(GetAbsoluteAssetDatabaseLocationRequest, "{8696976E-F19D-48E3-BDDF-2GB63FA1AF23}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::GetAbsoluteAssetDatabaseLocationRequest", 0xb3aa4931);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::GetAbsoluteAssetDatabaseLocationRequest");
             GetAbsoluteAssetDatabaseLocationRequest() = default;
             unsigned int GetMessageType() const override;
         };
@@ -192,7 +192,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(GetScanFoldersRequest, AZ::OSAllocator);
             AZ_RTTI(GetScanFoldersRequest, "{A3D7FD31-C260-4D6C-B970-D565B43F1316}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::GetScanFoldersRequest", 0x01274152);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::GetScanFoldersRequest");
 
             ~GetScanFoldersRequest() override = default;
 
@@ -225,7 +225,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(GetAssetSafeFoldersRequest, AZ::OSAllocator);
             AZ_RTTI(GetAssetSafeFoldersRequest, "{9A7951B1-257C-45F0-B334-A52A42A5A871}", AzFramework::AssetSystem::BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::GetAssetSafeFoldersRequest", 0xf58fd05c);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::GetAssetSafeFoldersRequest");
 
             ~GetAssetSafeFoldersRequest() override = default;
 
@@ -281,7 +281,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(AssetProcessorPlatformStatusRequest, AZ::OSAllocator);
             AZ_RTTI(AssetProcessorPlatformStatusRequest, "{529A8549-DD78-4E66-9BEA-D633846115C6}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::AssetProcessorPlatformStatusRequest", 0x036e116e);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::AssetProcessorPlatformStatusRequest");
 
             AssetProcessorPlatformStatusRequest() = default;
             unsigned int GetMessageType() const override;
@@ -312,7 +312,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(AssetProcessorPendingPlatformAssetsRequest, AZ::OSAllocator);
             AZ_RTTI(AssetProcessorPendingPlatformAssetsRequest, "{5B16F6F2-0F94-4BAE-8238-1E8F3E66D507}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::AssetProcessorPendingPlatformAssetsRequest", 0x9582a76c);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::AssetProcessorPendingPlatformAssetsRequest");
 
             AssetProcessorPendingPlatformAssetsRequest() = default;
             unsigned int GetMessageType() const override;
@@ -343,7 +343,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(WantAssetBrowserShowRequest, AZ::OSAllocator);
             AZ_RTTI(WantAssetBrowserShowRequest, "{C66852BF-1A8C-47AC-9CFF-183CC4241075}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::WantAssetBrowserShowRequest", 0xa861bc09);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::WantAssetBrowserShowRequest");
 
             WantAssetBrowserShowRequest() = default;
             unsigned int GetMessageType() const override;
@@ -357,7 +357,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(WantAssetBrowserShowResponse, AZ::OSAllocator);
             AZ_RTTI(WantAssetBrowserShowResponse, "{B3015EF2-A91F-4E7D-932A-DA6043EDB678}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::WantAssetBrowserShowResponse", 0x2784cbb9);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::WantAssetBrowserShowResponse");
 
             WantAssetBrowserShowResponse() = default;
             unsigned int GetMessageType() const override;
@@ -373,7 +373,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(AssetBrowserShowRequest, AZ::OSAllocator);
             AZ_RTTI(AssetBrowserShowRequest, "{D44903DD-45D8-4CBA-8A9D-C9D5E7FFB0A6}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetSystem::AssetBrowserShowRequest", 0xb2768047);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetSystem::AssetBrowserShowRequest");
 
             AssetBrowserShowRequest() = default;
             unsigned int GetMessageType() const override;
@@ -389,7 +389,7 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(SourceAssetProductsInfoRequest, AZ::OSAllocator);
             AZ_RTTI(SourceAssetProductsInfoRequest, "{14D0994C-7096-44D9-A239-2A7B51DDC95A}", BaseAssetProcessorMessage);
             static void Reflect(AZ::ReflectContext* context);
-            static constexpr unsigned int MessageType = AZ_CRC("AssetProcessor::SourceAssetProductsInfoRequest", 0x97f169fc);
+            static constexpr unsigned int MessageType = AZ_CRC_CE("AssetProcessor::SourceAssetProductsInfoRequest");
 
             SourceAssetProductsInfoRequest() = default;
             explicit SourceAssetProductsInfoRequest(const AZ::Data::AssetId& assetId);

Code/Framework/AzToolsFramework/AzToolsFramework/Asset/AssetSystemComponent.cpp

@@ -110,7 +110,7 @@ namespace AzToolsFramework
             AZ_Assert(socketConn, "AzToolsFramework::AssetSystem::AssetSystemComponent requires a valid socket conection!");
             if (socketConn)
             {
-                m_cbHandle = socketConn->AddMessageHandler(AZ_CRC("AssetProcessorManager::SourceFileNotification", 0x8bfc4d1c),
+                m_cbHandle = socketConn->AddMessageHandler(AZ_CRC_CE("AssetProcessorManager::SourceFileNotification"),
                     [context](unsigned int typeId, unsigned int /*serial*/, const void* data, unsigned int dataLength)
                 {
                     OnAssetSystemMessage(typeId, data, dataLength, context);
@@ -156,7 +156,7 @@ namespace AzToolsFramework
             {
                 socketConn->RemoveMessageHandler(AssetSystem::WantAssetBrowserShowRequest::MessageType, m_wantShowAssetBrowserCBHandle);
                 socketConn->RemoveMessageHandler(AssetSystem::AssetBrowserShowRequest::MessageType, m_showAssetBrowserCBHandle);
-                socketConn->RemoveMessageHandler(AZ_CRC("AssetProcessorManager::SourceFileNotification", 0x8bfc4d1c), m_cbHandle);
+                socketConn->RemoveMessageHandler(AZ_CRC_CE("AssetProcessorManager::SourceFileNotification"), m_cbHandle);
             }
 
             AssetSystemBus::AllowFunctionQueuing(false);
@@ -228,17 +228,17 @@ namespace AzToolsFramework
 
         void AssetSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("AssetProcessorToolsConnection", 0x734669bc));
+            provided.push_back(AZ_CRC_CE("AssetProcessorToolsConnection"));
         }
 
         void AssetSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("AssetProcessorToolsConnection", 0x734669bc));
+            incompatible.push_back(AZ_CRC_CE("AssetProcessorToolsConnection"));
         }
 
         void AssetSystemComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
-            required.push_back(AZ_CRC("AssetProcessorConnection", 0xf0cd75cd));
+            required.push_back(AZ_CRC_CE("AssetProcessorConnection"));
         }
 
         bool AssetSystemComponent::GetRelativeProductPathFromFullSourceOrProductPath(const AZStd::string& fullPath, AZStd::string& outputPath)

Code/Framework/AzToolsFramework/AzToolsFramework/AssetBrowser/AssetBrowserComponent.cpp

@@ -84,7 +84,7 @@ namespace AzToolsFramework
             AZ_Assert(socketConn, "AzToolsFramework::AssetBrowser::AssetBrowserComponent requires a valid socket conection!");
             if (socketConn)
             {
-                m_cbHandle = socketConn->AddMessageHandler(AZ_CRC("FileProcessor::FileInfosNotification", 0x001c43f5),
+                m_cbHandle = socketConn->AddMessageHandler(AZ_CRC_CE("FileProcessor::FileInfosNotification"),
                     [this](unsigned int /*typeId*/, unsigned int /*serial*/, const void* buffer, unsigned int bufferSize)
                 {
                     HandleFileInfoNotification(buffer, bufferSize);
@@ -127,17 +127,17 @@ namespace AzToolsFramework
 
         void AssetBrowserComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType & services)
         {
-            services.push_back(AZ_CRC("AssetBrowserService", 0x1e54fffb));
+            services.push_back(AZ_CRC_CE("AssetBrowserService"));
         }
 
         void AssetBrowserComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& required)
         {
-            required.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
+            required.push_back(AZ_CRC_CE("ThumbnailerService"));
         }
 
         void AssetBrowserComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("AssetBrowserService", 0x1e54fffb));
+            incompatible.push_back(AZ_CRC_CE("AssetBrowserService"));
         }
 
         void AssetBrowserComponent::OnDatabaseInitialized()

Code/Framework/AzToolsFramework/AzToolsFramework/AssetEditor/AssetEditorWidget.cpp

@@ -111,7 +111,7 @@ namespace AzToolsFramework
         // AssetEditorWidget
         //////////////////////////////////////////////////////////////////////////
 
-        const AZ::Crc32 k_assetEditorWidgetSettings = AZ_CRC("AssetEditorSettings", 0xfe740dee);
+        const AZ::Crc32 k_assetEditorWidgetSettings = AZ_CRC_CE("AssetEditorSettings");
 
         AssetEditorWidget::AssetEditorWidget(QWidget* parent)
             : QWidget(parent)

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityActionComponent.cpp

@@ -1075,12 +1075,12 @@ namespace AzToolsFramework
 
         void EditorEntityActionComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("EntityCompositionRequests", 0x29838b44));
+            provided.push_back(AZ_CRC_CE("EntityCompositionRequests"));
         }
 
         void EditorEntityActionComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("EntityCompositionRequests", 0x29838b44));
+            incompatible.push_back(AZ_CRC_CE("EntityCompositionRequests"));
         }
 
         void EditorEntityActionComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& /*required*/)

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityFixupComponent.cpp

@@ -18,7 +18,7 @@ namespace AzToolsFramework
         {
             serializeContext->Class<EditorEntityFixupComponent, AZ::Component>()
                 ->Version(1)
-                ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AZ_CRC("AssetBuilder", 0xc739c7d7) }));
+                ->Attribute(AZ::Edit::Attributes::SystemComponentTags, AZStd::vector<AZ::Crc32>({ AZ_CRC_CE("AssetBuilder") }));
         }
     }
 

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntityModelComponent.cpp

@@ -66,17 +66,17 @@ namespace AzToolsFramework
 
         void EditorEntityModelComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorEntityModelService", 0x9d215543));
+            services.push_back(AZ_CRC_CE("EditorEntityModelService"));
         }
 
         void EditorEntityModelComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorEntityModelService", 0x9d215543));
+            services.push_back(AZ_CRC_CE("EditorEntityModelService"));
         }
 
         void EditorEntityModelComponent::GetRequiredServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorEntityContextService", 0x28d93a43));
+            services.push_back(AZ_CRC_CE("EditorEntityContextService"));
         }
 
         void EditorEntityModelComponent::Activate()

Code/Framework/AzToolsFramework/AzToolsFramework/Entity/EditorEntitySortComponent.cpp

@@ -66,12 +66,12 @@ namespace AzToolsFramework
 
         void EditorEntitySortComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorChildEntitySortService", 0x916caa82));
+            services.push_back(AZ_CRC_CE("EditorChildEntitySortService"));
         }
 
         void EditorEntitySortComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorChildEntitySortService", 0x916caa82));
+            services.push_back(AZ_CRC_CE("EditorChildEntitySortService"));
         }
 
         bool EditorEntitySortComponent::SerializationConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
@@ -80,7 +80,7 @@ namespace AzToolsFramework
             if (classElement.GetVersion() <= 1)
             {
                 // Convert the vector of entity ids to an array of order entries
-                auto entityOrderArrayElement = classElement.FindSubElement(AZ_CRC("ChildEntityOrderArray", 0xc37d344b));
+                auto entityOrderArrayElement = classElement.FindSubElement(AZ_CRC_CE("ChildEntityOrderArray"));
                 if (!entityOrderArrayElement)
                 {
                     return false;
@@ -102,7 +102,7 @@ namespace AzToolsFramework
                 AZ_Error("EditorEntitySortComponent", entityOrderArray.size() == entityOrderArrayElement->GetNumSubElements(), "Unable to get all the expected elements for the old entity order array");
 
                 // Get rid of the old array
-                classElement.RemoveElementByName(AZ_CRC("ChildEntityOrderArray", 0xc37d344b));
+                classElement.RemoveElementByName(AZ_CRC_CE("ChildEntityOrderArray"));
 
                 // Add a new empty array (unable to use AddElementWithData, fails stating that AZStd::vector is not registered)
                 int newArrayElementIndex = classElement.AddElement<EntityOrderEntryArray>(context, "ChildEntityOrderEntryArray");

Code/Framework/AzToolsFramework/AzToolsFramework/Fingerprinting/TypeFingerprinter.cpp

@@ -27,10 +27,10 @@ namespace AzToolsFramework
         TypeFingerprint TypeFingerprinter::CreateFingerprint(const AZ::SerializeContext::ClassData& classData)
         {
             // Ensures hash will change if a service is moved from, say, required to dependent.
-            static const size_t kRequiredServiceKey = AZ_CRC("RequiredServiceKey", 0x22e125a6);
-            static const size_t kDependentServiceKey = AZ_CRC("DependentServiceKey", 0x380e6c63);
-            static const size_t kProvidedServiceKey = AZ_CRC("ProvidedServiceKey", 0xd3cc7058);
-            static const size_t kIncompatibleServiceKey = AZ_CRC("IncompatibleServiceKey", 0x95ee560f);
+            static const size_t kRequiredServiceKey = AZ_CRC_CE("RequiredServiceKey");
+            static const size_t kDependentServiceKey = AZ_CRC_CE("DependentServiceKey");
+            static const size_t kProvidedServiceKey = AZ_CRC_CE("ProvidedServiceKey");
+            static const size_t kIncompatibleServiceKey = AZ_CRC_CE("IncompatibleServiceKey");
 
             TypeFingerprint fingerprint = 0;
 

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/Render/EditorIntersectorComponent.h

@@ -32,7 +32,7 @@ namespace AzToolsFramework
 
             static void GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
             {
-                dependent.push_back(AZ_CRC("EditorEntityContextService", 0x28d93a43));
+                dependent.push_back(AZ_CRC_CE("EditorEntityContextService"));
             }
 
         private:

Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceDependencyBrowserComponent.h

@@ -63,12 +63,12 @@ namespace AzToolsFramework
 
         static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("SliceDependencyBrowserService", 0xe8f1ed19));
+            provided.push_back(AZ_CRC_CE("SliceDependencyBrowserService"));
         }
 
         static void GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("SliceDependencyBrowserService", 0xe8f1ed19));
+            incompatible.push_back(AZ_CRC_CE("SliceDependencyBrowserService"));
         }
     private:
 

Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceMetadataEntityContextComponent.cpp

@@ -226,21 +226,21 @@ namespace AzToolsFramework
     */
     void SliceMetadataEntityContextComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("SliceMetadataEntityContextService", 0xa98f0bf9));
+        provided.push_back(AZ_CRC_CE("SliceMetadataEntityContextService"));
     }
 
     /*!  Fills out a list of the component services incompatible with this context
     */
     void SliceMetadataEntityContextComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("SliceMetadataEntityContextService", 0xa98f0bf9));
+        incompatible.push_back(AZ_CRC_CE("SliceMetadataEntityContextService"));
     }
 
     /*!  Fills out a list of the component services required for this context to function
     */
     void SliceMetadataEntityContextComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
     {
-        dependent.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
+        dependent.push_back(AZ_CRC_CE("AssetDatabaseService"));
     }
 
     /*!  Adds all the required components for this context to the given entity if they don't already exist.

Code/Framework/AzToolsFramework/AzToolsFramework/Slice/SliceUtilities.cpp

@@ -2214,7 +2214,7 @@ namespace AzToolsFramework
                     }
                 }
 
-                auto settings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC("SliceUserSettings", 0x055b32eb), AZ::UserSettings::CT_LOCAL);
+                auto settings = AZ::UserSettings::CreateFind<SliceUserSettings>(AZ_CRC_CE("SliceUserSettings"), AZ::UserSettings::CT_LOCAL);
                 if (settings->m_autoNumber)
                 {
                     AZ::IO::FileIOBase* fileIO = AZ::IO::FileIOBase::GetInstance();

Code/Framework/AzToolsFramework/AzToolsFramework/SourceControl/PerforceComponent.cpp

@@ -133,13 +133,13 @@ namespace AzToolsFramework
 
     void PerforceComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("SourceControlService", 0x67f338fd));
-        provided.push_back(AZ_CRC("PerforceService", 0x74b25961));
+        provided.push_back(AZ_CRC_CE("SourceControlService"));
+        provided.push_back(AZ_CRC_CE("PerforceService"));
     }
 
     void PerforceComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("PerforceService", 0x74b25961));
+        incompatible.push_back(AZ_CRC_CE("PerforceService"));
     }
 
     void PerforceComponent::GetFileInfo(const char* fullFilePath, const SourceControlResponseCallback& respCallback)

Code/Framework/AzToolsFramework/AzToolsFramework/Thumbnails/ThumbnailerNullComponent.cpp

@@ -43,7 +43,7 @@ namespace AzToolsFramework
 
         void ThumbnailerNullComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("ThumbnailerService", 0x65422b97));
+            services.push_back(AZ_CRC_CE("ThumbnailerService"));
         }
 
         void ThumbnailerNullComponent::RegisterThumbnailProvider(AzToolsFramework::Thumbnailer::SharedThumbnailProvider /*provider*/)

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/AzToolsFrameworkConfigurationSystemComponent.cpp

@@ -96,19 +96,19 @@ namespace AzToolsFramework
 
     void AzToolsFrameworkConfigurationSystemComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
     {
-        provided.push_back(AZ_CRC("AzToolsFrameworkConfigurationSystemComponentService", 0xfc4f9667));
+        provided.push_back(AZ_CRC_CE("AzToolsFrameworkConfigurationSystemComponentService"));
     }
 
     void AzToolsFrameworkConfigurationSystemComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
     {
-        incompatible.push_back(AZ_CRC("AzToolsFrameworkConfigurationSystemComponentService", 0xfc4f9667));
+        incompatible.push_back(AZ_CRC_CE("AzToolsFrameworkConfigurationSystemComponentService"));
     }
 
     void AzToolsFrameworkConfigurationSystemComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& dependent)
     {
-        dependent.push_back(AZ_CRC("AzFrameworkConfigurationSystemComponentService", 0xcc49c96e));
-        dependent.push_back(AZ_CRC("SceneSystemComponentService", 0xd8975435));
-        dependent.push_back(AZ_CRC("EditorEntityContextService", 0x28d93a43));
+        dependent.push_back(AZ_CRC_CE("AzFrameworkConfigurationSystemComponentService"));
+        dependent.push_back(AZ_CRC_CE("SceneSystemComponentService"));
+        dependent.push_back(AZ_CRC_CE("EditorEntityContextService"));
     }
 
 } // AzToolsFramework

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorDisabledCompositionComponent.cpp

@@ -122,12 +122,12 @@ namespace AzToolsFramework
 
         void EditorDisabledCompositionComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorDisabledCompositionService", 0x277e3445));
+            services.push_back(AZ_CRC_CE("EditorDisabledCompositionService"));
         }
 
         void EditorDisabledCompositionComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorDisabledCompositionService", 0x277e3445));
+            services.push_back(AZ_CRC_CE("EditorDisabledCompositionService"));
         }
 
         void EditorDisabledCompositionComponent::GetDisabledComponents(AZ::Entity::ComponentArrayType& components)

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorEntityIconComponent.cpp

@@ -46,12 +46,12 @@ namespace AzToolsFramework
 
         void EditorEntityIconComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorEntityIconService", 0x94dff5d7));
+            services.push_back(AZ_CRC_CE("EditorEntityIconService"));
         }
 
         void EditorEntityIconComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorEntityIconService", 0x94dff5d7));
+            services.push_back(AZ_CRC_CE("EditorEntityIconService"));
         }
 
         EditorEntityIconComponent::~EditorEntityIconComponent()

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorInspectorComponent.cpp

@@ -47,12 +47,12 @@ namespace AzToolsFramework
 
         void EditorInspectorComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorInspectorService", 0xc7357f25));
+            services.push_back(AZ_CRC_CE("EditorInspectorService"));
         }
 
         void EditorInspectorComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorInspectorService", 0xc7357f25));
+            services.push_back(AZ_CRC_CE("EditorInspectorService"));
         }
 
         bool EditorInspectorComponent::SerializationConverter(AZ::SerializeContext& context, AZ::SerializeContext::DataElementNode& classElement)
@@ -61,7 +61,7 @@ namespace AzToolsFramework
             if (classElement.GetVersion() <= 1)
             {
                 // Convert the vector of component ids to an array of order entries
-                auto componentOrderArrayElement = classElement.FindSubElement(AZ_CRC("ComponentOrderArray", 0x22bd99f7));
+                auto componentOrderArrayElement = classElement.FindSubElement(AZ_CRC_CE("ComponentOrderArray"));
                 if (!componentOrderArrayElement)
                 {
                     return false;
@@ -82,7 +82,7 @@ namespace AzToolsFramework
                 AZ_Error("EditorInspectorComponent", componentOrderArray.size() == componentOrderArrayElement->GetNumSubElements(), "Unable to get all the expected elements for the old component order array");
 
                 // Get rid of the old array
-                classElement.RemoveElementByName(AZ_CRC("ComponentOrderArray", 0x22bd99f7));
+                classElement.RemoveElementByName(AZ_CRC_CE("ComponentOrderArray"));
 
                 // Add a new empty array (unable to use AddElementWithData, fails stating that AZStd::vector is not registered)
                 int newArrayElementIndex = classElement.AddElement<ComponentOrderEntryArray>(context, "ComponentOrderEntryArray");

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorLockComponent.cpp

@@ -38,12 +38,12 @@ namespace AzToolsFramework
 
         void EditorLockComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorLockService", 0x6b15eacf));
+            services.push_back(AZ_CRC_CE("EditorLockService"));
         }
 
         void EditorLockComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorLockService", 0x6b15eacf));
+            services.push_back(AZ_CRC_CE("EditorLockService"));
         }
 
         EditorLockComponent::~EditorLockComponent()

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorOnlyEntityComponent.cpp

@@ -40,12 +40,12 @@ namespace AzToolsFramework
 
         void EditorOnlyEntityComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorOnlyEntityService", 0x7010c39d));
+            services.push_back(AZ_CRC_CE("EditorOnlyEntityService"));
         }
 
         void EditorOnlyEntityComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorOnlyEntityService", 0x7010c39d));
+            services.push_back(AZ_CRC_CE("EditorOnlyEntityService"));
         }
 
         EditorOnlyEntityComponent::EditorOnlyEntityComponent()

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorPendingCompositionComponent.cpp

@@ -123,12 +123,12 @@ namespace AzToolsFramework
 
         void EditorPendingCompositionComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorPendingCompositionService", 0x6b5b794f));
+            services.push_back(AZ_CRC_CE("EditorPendingCompositionService"));
         }
 
         void EditorPendingCompositionComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorPendingCompositionService", 0x6b5b794f));
+            services.push_back(AZ_CRC_CE("EditorPendingCompositionService"));
         }
 
         void EditorPendingCompositionComponent::GetPendingComponents(AZ::Entity::ComponentArrayType& components)

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorSelectionAccentSystemComponent.h

@@ -59,7 +59,7 @@ namespace AzToolsFramework
 
             static void GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
             {
-                provided.push_back(AZ_CRC("EditorSelectionAccentingSelectionService", 0x8b5253cf));
+                provided.push_back(AZ_CRC_CE("EditorSelectionAccentingSelectionService"));
             }
 
             /**

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/EditorVisibilityComponent.cpp

@@ -39,12 +39,12 @@ namespace AzToolsFramework
 
         void EditorVisibilityComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorVisibilityService", 0x90888caf));
+            services.push_back(AZ_CRC_CE("EditorVisibilityService"));
         }
 
         void EditorVisibilityComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& services)
         {
-            services.push_back(AZ_CRC("EditorVisibilityService", 0x90888caf));
+            services.push_back(AZ_CRC_CE("EditorVisibilityService"));
         }
 
         EditorVisibilityComponent::~EditorVisibilityComponent()

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/GenericComponentWrapper.cpp

@@ -52,7 +52,7 @@ namespace AzToolsFramework
                             ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                             ->Attribute(AZ::Edit::Attributes::RuntimeExportCallback, &ExportTemplateComponent)
                         ->DataElement("", &GenericComponentWrapper::m_template, "m_template", "")
-                            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC("PropertyVisibility_ShowChildrenOnly", 0xef428f20));
+                            ->Attribute(AZ::Edit::Attributes::Visibility, AZ_CRC_CE("PropertyVisibility_ShowChildrenOnly"));
                 }
             }
         }

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ScriptEditorComponent.cpp

@@ -1021,9 +1021,9 @@ namespace AzToolsFramework
                 {
                     ec->Class<ScriptEditorComponent>("Lua Script", "The Lua Script component allows you to add arbitrary Lua logic to an entity in the form of a Lua script")
                         ->ClassElement(AZ::Edit::ClassElements::EditorData, "")
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("Game", 0x232b318c))
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("UI", 0x27ff46b0))
-                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC("CanvasUI", 0xe1e05605))
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("Game"))
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("UI"))
+                        ->Attribute(AZ::Edit::Attributes::AppearsInAddComponentMenu, AZ_CRC_CE("CanvasUI"))
                         ->Attribute(AZ::Edit::Attributes::NameLabelOverride, &ScriptEditorComponent::m_customName)
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::Category, "Scripting")

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/ToolsAssetCatalogComponent.cpp

@@ -28,12 +28,12 @@ namespace AssetProcessor
 
     void ToolsAssetCatalogComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& services)
     {
-        services.push_back(AZ_CRC("AssetCatalogService", 0xc68ffc57));
+        services.push_back(AZ_CRC_CE("AssetCatalogService"));
     }
 
     void ToolsAssetCatalogComponent::GetDependentServices(AZ::ComponentDescriptor::DependencyArrayType& services)
     {
-        services.push_back(AZ_CRC("AssetDatabaseService", 0x3abf5601));
+        services.push_back(AZ_CRC_CE("AssetDatabaseService"));
     }
 
     void ToolsAssetCatalogComponent::Activate()

Code/Framework/AzToolsFramework/AzToolsFramework/ToolsComponents/TransformComponent.cpp

@@ -49,7 +49,7 @@ namespace AzToolsFramework
     {
         namespace Internal
         {
-            const AZ::u32 ParentEntityCRC = AZ_CRC("Parent Entity", 0x5b1b276c);
+            const AZ::u32 ParentEntityCRC = AZ_CRC_CE("Parent Entity");
 
             // Decompose a transform into euler angles in degrees, uniform scale, and translation.
             void DecomposeTransform(const AZ::Transform& transform, AZ::Vector3& translation, AZ::Vector3& rotation, float& scale)
@@ -64,14 +64,14 @@ namespace AzToolsFramework
                 if (classElement.GetVersion() < 6)
                 {
                     // In v6, "Slice Transform" became slice-relative.
-                    const int sliceRelTransformIdx = classElement.FindElement(AZ_CRC("Slice Transform", 0x4f156fd1));
+                    const int sliceRelTransformIdx = classElement.FindElement(AZ_CRC_CE("Slice Transform"));
                     if (sliceRelTransformIdx >= 0)
                     {
                     // Convert slice-relative transform/root to standard parent-child relationship.
-                    const int sliceRootIdx = classElement.FindElement(AZ_CRC("Slice Root", 0x9f115e1f));
+                    const int sliceRootIdx = classElement.FindElement(AZ_CRC_CE("Slice Root"));
                     const int parentIdx = classElement.FindElement(ParentEntityCRC);
-                    const int editorTransformIdx = classElement.FindElement(AZ_CRC("Transform Data", 0xf0a2bb50));
-                    const int cachedTransformIdx = classElement.FindElement(AZ_CRC("Cached World Transform", 0x571fab30));
+                    const int editorTransformIdx = classElement.FindElement(AZ_CRC_CE("Transform Data"));
+                    const int cachedTransformIdx = classElement.FindElement(AZ_CRC_CE("Cached World Transform"));
 
                     if (editorTransformIdx >= 0 && sliceRootIdx >= 0 && parentIdx >= 0)
                     {
@@ -85,7 +85,7 @@ namespace AzToolsFramework
                         {
                             // If the entity already has a parent assigned, we don't need to fix anything up.
                             // We only need to convert slice root to parent for non-child entities.
-                            const int parentIdValueIdx = parentElement.FindElement(AZ_CRC("id", 0xbf396750));
+                            const int parentIdValueIdx = parentElement.FindElement(AZ_CRC_CE("id"));
                             AZ::u64 parentId = 0;
                             if (parentIdValueIdx >= 0)
                             {
@@ -93,7 +93,7 @@ namespace AzToolsFramework
                             }
 
                             AZ::EntityId sliceRootId;
-                            const int entityIdValueIdx = sliceRootElement.FindElement(AZ_CRC("id", 0xbf396750));
+                            const int entityIdValueIdx = sliceRootElement.FindElement(AZ_CRC_CE("id"));
 
                             if (entityIdValueIdx < 0)
                             {
@@ -128,8 +128,8 @@ namespace AzToolsFramework
                             }
 
                             // Finally, remove old fields.
-                            classElement.RemoveElementByName(AZ_CRC("Slice Transform", 0x4f156fd1));
-                            classElement.RemoveElementByName(AZ_CRC("Slice Root", 0x9f115e1f));
+                            classElement.RemoveElementByName(AZ_CRC_CE("Slice Transform"));
+                            classElement.RemoveElementByName(AZ_CRC_CE("Slice Root"));
                             }
                         }
                         }
@@ -160,7 +160,7 @@ namespace AzToolsFramework
                     // However, some data may have been exported with this field present, so
                     // remove it if its found, but only in this version which the change was present in, so that
                     // future re-additions of it won't remove it (as long as they bump the version number.)
-                    classElement.RemoveElementByName(AZ_CRC("InterpolateScale", 0x9d00b831));
+                    classElement.RemoveElementByName(AZ_CRC_CE("InterpolateScale"));
                 }
 
                 if (classElement.GetVersion() < 10)
@@ -1108,12 +1108,12 @@ namespace AzToolsFramework
 
         void TransformComponent::GetProvidedServices(AZ::ComponentDescriptor::DependencyArrayType& provided)
         {
-            provided.push_back(AZ_CRC("TransformService", 0x8ee22c50));
+            provided.push_back(AZ_CRC_CE("TransformService"));
         }
 
         void TransformComponent::GetIncompatibleServices(AZ::ComponentDescriptor::DependencyArrayType& incompatible)
         {
-            incompatible.push_back(AZ_CRC("TransformService", 0x8ee22c50));
+            incompatible.push_back(AZ_CRC_CE("TransformService"));
         }
 
         void TransformComponent::PasteOverComponent(const TransformComponent* sourceComponent, TransformComponent* destinationComponent)