diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h
index ab7a180dd1..ace16ba6ca 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Include/AtomLyIntegration/CommonFeatures/Material/MaterialComponentBus.h
@@ -33,9 +33,9 @@ namespace AZ
             virtual const MaterialAssignmentMap& GetMaterialOverrides() const = 0;
             //! Clear all material overrides
             virtual void ClearAllMaterialOverrides() = 0;
-            //! Clear non-lod material override
+            //! Clear non-lod material overrides
             virtual void ClearModelMaterialOverrides() = 0;
-            //! Clear lod material override
+            //! Clear lod material overrides
             virtual void ClearLodMaterialOverrides() = 0;
             //! Clear residual materials that don't correspond to the associated model
             virtual void ClearIncompatibleMaterialOverrides() = 0;
diff --git a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
index ab39e7f208..b7bf191bc9 100644
--- a/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
+++ b/Gems/AtomLyIntegration/CommonFeatures/Code/Source/Material/EditorMaterialComponent.cpp
@@ -364,9 +364,9 @@ namespace AZ
             EditorMaterialComponentExporter::ExportItemsContainer exportItems;
             exportItems.reserve(assetIdToSlotNameMap.size());
 
-            for (const auto& assetIdToSlotNamePair : assetIdToSlotNameMap)
+            for (const auto& [assetId, slotName] : assetIdToSlotNameMap)
             {
-                exportItems.emplace_back(assetIdToSlotNamePair.first, assetIdToSlotNamePair.second);
+                exportItems.emplace_back(assetId, slotName);
             }
 
             // Display the export dialog so that the user can configure how they want different materials to be exported