diff --git a/src/ZSCRIPT/CLEMATIS/CLEMATIS.zsc b/src/ZSCRIPT/CLEMATIS/CLEMATIS.zsc
index 9a785c9..6330a6a 100644
--- a/src/ZSCRIPT/CLEMATIS/CLEMATIS.zsc
+++ b/src/ZSCRIPT/CLEMATIS/CLEMATIS.zsc
@@ -80,15 +80,15 @@ class Clematis abstract{
                     ..Failures+Successes.." Tests Run, "..Successes.." Tests Succeeded, "..Failures.." Test Failed".."\n");
     }
 
-    void It(Name TestCaseName, bool Condition, ZE_ErrorSeverity Severity)
+    void It(Name TestCaseName, bool Condition, Cl_EErrorSeverity Severity)
     {Results.Push(Cl_Result.Create(TestCaseName, Condition, Severity));}
 
     /////////////
     // Logging //
     /////////////
 
-    void Log(ZE_ErrorSeverity Severity, String Error, bool Verbose=false){
+    void Log(Cl_EErrorSeverity Severity, String Error, bool Verbose=false){
         if(!Verbose || Logging)
-            ZDebug.Error(GetClassName(), Error, Severity);
+            Cl_Debug.Error(GetClassName(), Error, Severity);
     }
 }
\ No newline at end of file
diff --git a/src/ZSCRIPT/CLEMATIS/DATA.zsc b/src/ZSCRIPT/CLEMATIS/DATA.zsc
index 7fca3bc..c548eec 100644
--- a/src/ZSCRIPT/CLEMATIS/DATA.zsc
+++ b/src/ZSCRIPT/CLEMATIS/DATA.zsc
@@ -3,10 +3,10 @@ class Cl_Result{
 
     Name Name;
 
-    ZE_ErrorSeverity Severity;
+    Cl_EErrorSeverity Severity;
 
     static
-    Cl_Result Create(Name Name, bool Success, ZE_ErrorSeverity Severity){
+    Cl_Result Create(Name Name, bool Success, Cl_EErrorSeverity Severity){
         Cl_Result Result=new('Cl_Result');
         Result.Name=Name;
         Result.Success=Success;
diff --git a/src/ZSCRIPT/CLEMATIS/DEBUG.zsc b/src/ZSCRIPT/CLEMATIS/DEBUG.zsc
index d134a23..8fa6739 100644
--- a/src/ZSCRIPT/CLEMATIS/DEBUG.zsc
+++ b/src/ZSCRIPT/CLEMATIS/DEBUG.zsc
@@ -1,19 +1,21 @@
-enum ZE_ErrorSeverity{
+enum Cl_EErrorSeverity{
     ERR_Info,
     ERR_Warning,
     ERR_Error,
     ERR_Fatal,
 }
 
-class ZDebug{
+class Cl_Debug{
     static
     clearscope
-    void Message(String Output, Name CVarName)
-    {if(CVar.FindCVar(CVarName).GetBool())console.printf(Output);}
+    void Message(String Output, Name CVarName){
+        if(CVar.FindCVar(CVarName).GetBool())
+            console.printf(Output);
+    }
 
     static
     clearscope
-    void Error(Name Owner, String Error, ZE_ErrorSeverity Severity){
+    void Error(Name Owner, String Error, Cl_EErrorSeverity Severity){
         switch(Severity){
             case ERR_Info:
                 Console.PrintF("%s INFO - %s", "["..Owner.."]", Error);