diff --git a/include/CrossLang.hpp b/include/CrossLang.hpp
index 12fe616..4eeb622 100644
--- a/include/CrossLang.hpp
+++ b/include/CrossLang.hpp
@@ -1573,7 +1573,7 @@ class GC {
 
             void EnsureCanRunInCrossLang();
 
-            TDictionary* DecodeMetadata(GCList& ls, size_t index);
+            TDictionary* MetadataDecode(GCList& ls, size_t index);
     };
     class TAssociativeArray : public THeapObject
     {
diff --git a/src/compiler/codegen.cpp b/src/compiler/codegen.cpp
index efd5efe..07cd723 100644
--- a/src/compiler/codegen.cpp
+++ b/src/compiler/codegen.cpp
@@ -145,7 +145,7 @@ namespace Tesses::CrossLang
             bytes.push_back(std::get<bool>(n) ? 1 : 0);
             return;
         }
-        if(std::holds_alternative<nullptr_t>(n))
+        if(std::holds_alternative<std::nullptr_t>(n))
         {
             bytes.push_back(2);
             return;
diff --git a/src/compiler/parser.cpp b/src/compiler/parser.cpp
index 6aedb71..927043e 100644
--- a/src/compiler/parser.cpp
+++ b/src/compiler/parser.cpp
@@ -1467,7 +1467,7 @@ namespace Tesses::CrossLang
             {
                 body = ParseNode();
             }
-            if(std::holds_alternative<nullptr_t>(item))
+            if(std::holds_alternative<std::nullptr_t>(item))
                 item = AdvancedSyntaxNode::Create(DeclareExpression,true, {
                     AdvancedSyntaxNode::Create(GetVariableExpression,true,{"item"})
                 });
diff --git a/src/vm/filereader.cpp b/src/vm/filereader.cpp
index 38716e5..754b390 100644
--- a/src/vm/filereader.cpp
+++ b/src/vm/filereader.cpp
@@ -118,7 +118,7 @@ namespace Tesses::CrossLang
         throw VMException(errorMessage);
     }
 
-    TDictionary* TFile::DecodeMetadata(GCList& ls, size_t midx)
+    TDictionary* TFile::MetadataDecode(GCList& ls, size_t midx)
     {
         if(midx >= this->metadata.size()) return nullptr;
         if(this->metadata[midx].second.empty()) return nullptr;
diff --git a/src/vm/vm.cpp b/src/vm/vm.cpp
index 30090de..60553a9 100644
--- a/src/vm/vm.cpp
+++ b/src/vm/vm.cpp
@@ -4337,7 +4337,7 @@ namespace Tesses::CrossLang {
                         int64_t index;
                         if(GetArgument(args,0, index) && (size_t)index < file->metadata.size())
                         {
-                            cse.back()->Push(gc,file->DecodeMetadata(ls,(size_t)index));
+                            cse.back()->Push(gc,file->MetadataDecode(ls,(size_t)index));
                             return false;
                         }
                     }