diff --git a/src/SaveTool/SaveTool_MainManager.cpp b/src/SaveTool/SaveTool_MainManager.cpp
index 23d1a1f..d5918e9 100644
--- a/src/SaveTool/SaveTool_MainManager.cpp
+++ b/src/SaveTool/SaveTool_MainManager.cpp
@@ -429,7 +429,7 @@ void SaveTool::drawMassManager() {
             ImGui::TableSetColumnIndex(0);
             ImGui::Selectable(Utility::formatString("{:.2d}", i + 1).c_str(),
                               false, ImGuiSelectableFlags_SpanAllColumns|ImGuiSelectableFlags_AllowItemOverlap);
-            if(_massManager->hangar(i).state() == MassState::Valid &&
+            if(_massManager->hangar(i).state() == Mass::State::Valid &&
                ImGui::BeginDragDropSource(ImGuiDragDropFlags_SourceNoHoldToOpenOthers))
             {
                 drag_drop_index = i;
@@ -477,13 +477,13 @@ void SaveTool::drawMassManager() {
 
             ImGui::TableSetColumnIndex(1);
             switch(_massManager->hangar(i).state()) {
-                case MassState::Empty:
+                case Mass::State::Empty:
                     ImGui::TextDisabled("<empty>");
                     break;
-                case MassState::Invalid:
+                case Mass::State::Invalid:
                     ImGui::TextDisabled("<invalid>");
                     break;
-                case MassState::Valid:
+                case Mass::State::Valid:
                     ImGui::TextUnformatted(_massManager->hangar(i).name().c_str());
                     break;
             }
@@ -494,10 +494,10 @@ void SaveTool::drawMassManager() {
                 drawTooltip("This is the currently active frame slot.");
             }
 
-            if(_massManager->hangar(i).state() != MassState::Empty) {
+            if(_massManager->hangar(i).state() != Mass::State::Empty) {
                 ImGui::TableSetColumnIndex(3);
                 ImGui::PushID(i);
-                if(_massManager->hangar(i).state() == MassState::Valid) {
+                if(_massManager->hangar(i).state() == Mass::State::Valid) {
                     if(ImGui::SmallButton(ICON_FA_SEARCH)) {
                         _currentMass = &_massManager->hangar(i);
                         _uiState = UiState::MassViewer;
@@ -595,7 +595,7 @@ auto SaveTool::drawDeleteMassPopup(int mass_index) -> ImGuiID {
         return ImGui::GetID("Confirmation##DeleteMassConfirmation");
     }
 
-    if(_massManager->hangar(mass_index).state() == MassState::Empty) {
+    if(_massManager->hangar(mass_index).state() == Mass::State::Empty) {
         ImGui::CloseCurrentPopup();
         ImGui::EndPopup();
         return 0;
@@ -608,7 +608,7 @@ auto SaveTool::drawDeleteMassPopup(int mass_index) -> ImGuiID {
     }
 
     ImGui::PushTextWrapPos(windowSize().x() * 0.40f);
-    if(_massManager->hangar(mass_index).state() == MassState::Invalid) {
+    if(_massManager->hangar(mass_index).state() == Mass::State::Invalid) {
         ImGui::Text("Are you sure you want to delete the invalid M.A.S.S. data in hangar %.2i ? This operation is irreversible.",
                     mass_index + 1);
     }