diff --git a/asm/Kyoto/Text/CSavableState.s b/asm/Kyoto/Text/CSaveableState.s
similarity index 100%
rename from asm/Kyoto/Text/CSavableState.s
rename to asm/Kyoto/Text/CSaveableState.s
diff --git a/configure.py b/configure.py
index aa7c57be..ade24b23 100755
--- a/configure.py
+++ b/configure.py
@@ -546,7 +546,7 @@ LIBS = [
             "Kyoto/Text/CPushStateInstruction",
             "Kyoto/Text/CRasterFont",
             "Kyoto/Text/CRemoveColorOverrideInstruction",
-            ["Kyoto/Text/CSavableState", True],
+            ["Kyoto/Text/CSaveableState", True],
             "Kyoto/Text/CTextExecuteBuffer",
             "Kyoto/Text/CTextInstruction",
             ["Kyoto/Text/CTextParser", False],
diff --git a/include/Kyoto/Text/CSavableState.hpp b/include/Kyoto/Text/CSaveableState.hpp
similarity index 89%
rename from include/Kyoto/Text/CSavableState.hpp
rename to include/Kyoto/Text/CSaveableState.hpp
index c8a3e1dd..e4e91d44 100644
--- a/include/Kyoto/Text/CSavableState.hpp
+++ b/include/Kyoto/Text/CSaveableState.hpp
@@ -1,5 +1,5 @@
-#ifndef _CSAVABLESTATE
-#define _CSAVABLESTATE
+#ifndef _CSAVEABLESTATE
+#define _CSAVEABLESTATE
 
 #include "Kyoto/Text/CDrawStringOptions.hpp"
 #include "Kyoto/Text/CRasterFont.hpp"
@@ -25,4 +25,4 @@ private:
   EVerticalJustification x84_vjust;
 };
 
-#endif // _CSAVABLESTATE
+#endif // _CSAVEABLESTATE
diff --git a/src/Kyoto/Text/CSavableState.cpp b/src/Kyoto/Text/CSaveableState.cpp
similarity index 91%
rename from src/Kyoto/Text/CSavableState.cpp
rename to src/Kyoto/Text/CSaveableState.cpp
index eb28f952..ac6c8230 100644
--- a/src/Kyoto/Text/CSavableState.cpp
+++ b/src/Kyoto/Text/CSaveableState.cpp
@@ -1,4 +1,4 @@
-#include "Kyoto/Text/CSavableState.hpp"
+#include "Kyoto/Text/CSaveableState.hpp"
 
 CSaveableState::CSaveableState()
 : x54_colors(3, CTextColor(0, 0, 0, 255))