diff --git a/components/esm/attr.cpp b/components/esm/attr.cpp
index 3828392722..8dd491c8df 100644
--- a/components/esm/attr.cpp
+++ b/components/esm/attr.cpp
@@ -60,8 +60,8 @@ const std::string Attribute::sAttributeIcons[Attribute::Length] = {
 
 Attribute::AttributeID Attribute::stringToAttributeId(std::string_view attribute)
 {
-    for (auto id : ESM::Attribute::sAttributeIds)
-        if (Misc::StringUtils::ciEqual(ESM::Attribute::sAttributeNames[id], attribute))
+    for (auto id : sAttributeIds)
+        if (Misc::StringUtils::ciEqual(sAttributeNames[id], attribute))
             return id;
 
     throw std::logic_error("No such attribute: " + std::string(attribute));
diff --git a/components/esm3/loadskil.cpp b/components/esm3/loadskil.cpp
index fa7f7ec7b7..47bfbbbda8 100644
--- a/components/esm3/loadskil.cpp
+++ b/components/esm3/loadskil.cpp
@@ -101,8 +101,8 @@ namespace ESM
 
     Skill::SkillEnum Skill::stringToSkillId(std::string_view skill)
     {
-        for (auto id : ESM::Skill::sSkillIds)
-            if (Misc::StringUtils::ciEqual(ESM::Skill::sSkillNames[id], skill))
+        for (auto id : sSkillIds)
+            if (Misc::StringUtils::ciEqual(sSkillNames[id], skill))
                 return id;
 
         throw std::logic_error("No such skill: " + std::string(skill));