diff --git a/src/sfall_global_vars.cc b/src/sfall_global_vars.cc
index b6e2fb0..b62c0dc 100644
--- a/src/sfall_global_vars.cc
+++ b/src/sfall_global_vars.cc
@@ -6,18 +6,18 @@
 
 namespace fallout {
 
-struct State {
+struct SfallGlobalVarsState {
     std::unordered_map<uint64_t, int> vars;
 };
 
 static bool sfallGlobalVarsStore(uint64_t key, int value);
 static bool sfallGlobalVarsFetch(uint64_t key, int& value);
 
-static State* _state;
+static SfallGlobalVarsState* _state;
 
 bool sfallGlobalVarsInit()
 {
-    _state = new (std::nothrow) State();
+    _state = new (std::nothrow) SfallGlobalVarsState();
     if (_state == nullptr) {
         return false;
     }
diff --git a/src/sfall_lists.cc b/src/sfall_lists.cc
index a9022bd..a582ae2 100644
--- a/src/sfall_lists.cc
+++ b/src/sfall_lists.cc
@@ -30,16 +30,16 @@ struct List {
     size_t pos = 0;
 };
 
-struct State {
+struct SfallListsState {
     std::unordered_map<int, List> lists;
     int nextListId = kInitialListId;
 };
 
-static State* _state = nullptr;
+static SfallListsState* _state = nullptr;
 
 bool sfallListsInit()
 {
-    _state = new (std::nothrow) State();
+    _state = new (std::nothrow) SfallListsState();
     if (_state == nullptr) {
         return false;
     }