diff --git a/src/scripts/gendoc/gendoc.py b/src/scripts/gendoc/gendoc.py
index 359ae154eb..210450df96 100755
--- a/src/scripts/gendoc/gendoc.py
+++ b/src/scripts/gendoc/gendoc.py
@@ -46,8 +46,8 @@ args = parser.parse_args()
 
 
 # load the whole eolian db (from .eo files in source tree)
-eolian_db = eolian.Eolian()
-if not isinstance(eolian_db, eolian.Eolian):
+eolian_db = eolian.Eolian_State()
+if not isinstance(eolian_db, eolian.Eolian_State):
     raise(RuntimeError('Eolian, failed to create Eolian state'))
 
 if not eolian_db.directory_add(SCAN_FOLDER):
diff --git a/src/scripts/pyolian/eolian.py b/src/scripts/pyolian/eolian.py
index 6e338abd0b..46b4465128 100644
--- a/src/scripts/pyolian/eolian.py
+++ b/src/scripts/pyolian/eolian.py
@@ -434,7 +434,7 @@ class Eolian_Unit(EolianBaseObject):
             lib.eolian_declarations_get_by_file(self._obj, _str_to_bytes(fname)))
 
 
-class Eolian(Eolian_Unit):
+class Eolian_State(Eolian_Unit):
     def __init__(self):
         self._obj = lib.eolian_state_new()  # Eolian_State *
 
diff --git a/src/scripts/pyolian/generator.py b/src/scripts/pyolian/generator.py
index 6a78da86d9..9577fa7488 100755
--- a/src/scripts/pyolian/generator.py
+++ b/src/scripts/pyolian/generator.py
@@ -57,8 +57,8 @@ SCAN_FOLDER = os.path.join(root_path, 'src', 'lib')
 
 
 # load the whole eolian db
-eolian_db = eolian.Eolian()
-if not isinstance(eolian_db, eolian.Eolian):
+eolian_db = eolian.Eolian_State()
+if not isinstance(eolian_db, eolian.Eolian_State):
     raise(RuntimeError('Eolian, failed to create Eolian state'))
 
 if not eolian_db.directory_add(SCAN_FOLDER):
diff --git a/src/scripts/pyolian/test_eolian.py b/src/scripts/pyolian/test_eolian.py
index 92ff1350a0..82d85280a4 100755
--- a/src/scripts/pyolian/test_eolian.py
+++ b/src/scripts/pyolian/test_eolian.py
@@ -571,8 +571,8 @@ class TestEolianExpression(unittest.TestCase):
 
 if __name__ == '__main__':
     # create main eolian state
-    eolian_db = eolian.Eolian()
-    if not isinstance(eolian_db, eolian.Eolian):
+    eolian_db = eolian.Eolian_State()
+    if not isinstance(eolian_db, eolian.Eolian_State):
         raise(RuntimeError('Eolian, failed to create Eolian state'))
 
     # eolian system scan (BROKEN)