diff --git a/vns-cpp/CMakeLists.txt b/vns-cpp/CMakeLists.txt
index f4e6830..c5db8cd 100644
--- a/vns-cpp/CMakeLists.txt
+++ b/vns-cpp/CMakeLists.txt
@@ -14,7 +14,7 @@ project(vns)
 file(GLOB SOURCES "libs/*/*.h" "libs/*/*.cpp" "libs/*/*.hpp")
 
 # Add source to this project's executable.
-add_executable(vns ${SOURCES} "vns.cpp" "vns.h" "scriptProcessor.cpp" "naming.cpp" "naming.h" "content.h" "content.cpp" "contentNext.h" "contentNext.cpp" "scriptProcessor.h" "functions.h" "tests.h" "tests.cpp" "functions.cpp" "compiler.h" "compiler.cpp" "version.h" "contentManager.h" "contentManager.cpp" "decompiler.cpp" "decompiler.h")
+add_executable(vns ${SOURCES} "vns.cpp" "vns.hpp" "scriptProcessor.cpp" "naming.cpp" "naming.hpp" "content.hpp" "content.cpp" "contentNext.hpp" "contentNext.cpp" "scriptProcessor.hpp" "functions.hpp" "tests.hpp" "tests.cpp" "functions.cpp" "compiler.hpp" "compiler.cpp" "version.hpp" "contentManager.hpp" "contentManager.cpp" "decompiler.cpp" "decompiler.hpp")
 
 if (CMAKE_VERSION VERSION_GREATER 3.12)
     set_property(TARGET vns PROPERTY CXX_STANDARD 20)
diff --git a/vns-cpp/compiler.cpp b/vns-cpp/compiler.cpp
index 4b467a0..b39b7c7 100644
--- a/vns-cpp/compiler.cpp
+++ b/vns-cpp/compiler.cpp
@@ -1,9 +1,9 @@
 #include <ctime>
-#include "version.h"
-#include "compiler.h"
+#include "version.hpp"
+#include "compiler.hpp"
 #include <fstream>
 #include <iostream>
-#include "scriptProcessor.h"
+#include "scriptProcessor.hpp"
 
 // get the info of compiler
 std::unordered_map<std::string, int> Compiler::get_compiler_info()
diff --git a/vns-cpp/compiler.h b/vns-cpp/compiler.hpp
similarity index 93%
rename from vns-cpp/compiler.h
rename to vns-cpp/compiler.hpp
index 466e64b..9666ac7 100644
--- a/vns-cpp/compiler.h
+++ b/vns-cpp/compiler.hpp
@@ -1,5 +1,5 @@
-#ifndef COMPILER_H
-#define COMPILER_H
+#ifndef COMPILER_HPP
+#define COMPILER_HPP
 
 #include <filesystem>
 #include <unordered_map>
diff --git a/vns-cpp/content.cpp b/vns-cpp/content.cpp
index 4134b02..fadd69f 100644
--- a/vns-cpp/content.cpp
+++ b/vns-cpp/content.cpp
@@ -1,4 +1,4 @@
-#include "content.h"
+#include "content.hpp"
 
 Content::Content(const ContentDataType &data, const std::string &content_id)
 {
diff --git a/vns-cpp/content.h b/vns-cpp/content.hpp
similarity index 94%
rename from vns-cpp/content.h
rename to vns-cpp/content.hpp
index 17183af..40c8415 100644
--- a/vns-cpp/content.h
+++ b/vns-cpp/content.hpp
@@ -1,10 +1,10 @@
-#ifndef CONTENT_H
-#define CONTENT_H
+#ifndef CONTENT_HPP
+#define CONTENT_HPP
 
 #include <string>
 #include <unordered_map>
 #include <vector>
-#include "contentNext.h"
+#include "contentNext.hpp"
 
 using ContentDataType = std::unordered_map<std::string, std::variant<std::string, std::vector<std::string>, std::unordered_map<std::string, ContentNextValueType>>>;
 
diff --git a/vns-cpp/contentManager.cpp b/vns-cpp/contentManager.cpp
index c59f13a..fc720e2 100644
--- a/vns-cpp/contentManager.cpp
+++ b/vns-cpp/contentManager.cpp
@@ -1,4 +1,4 @@
-#include "contentManager.h"
+#include "contentManager.hpp"
 
 // If the pointer to the current dialog data does not exist, set_data the pointer
 void ContentManager::refresh_current()
diff --git a/vns-cpp/contentManager.h b/vns-cpp/contentManager.hpp
similarity index 95%
rename from vns-cpp/contentManager.h
rename to vns-cpp/contentManager.hpp
index 17ee92f..30c41ce 100644
--- a/vns-cpp/contentManager.h
+++ b/vns-cpp/contentManager.hpp
@@ -1,7 +1,7 @@
-#ifndef CONTENT_MANAGER_H
-#define CONTENT_MANAGER_H
+#ifndef CONTENT_MANAGER_HPP
+#define CONTENT_MANAGER_HPP
 
-#include "content.h"
+#include "content.hpp"
 
 class ContentManager
 {
diff --git a/vns-cpp/contentNext.cpp b/vns-cpp/contentNext.cpp
index 602b83c..b971432 100644
--- a/vns-cpp/contentNext.cpp
+++ b/vns-cpp/contentNext.cpp
@@ -1,4 +1,4 @@
-#include "contentNext.h"
+#include "contentNext.hpp"
 
 std::unordered_map<std::string, ContentNextValueType> ContentNext::to_map() const
 {
diff --git a/vns-cpp/contentNext.h b/vns-cpp/contentNext.hpp
similarity index 96%
rename from vns-cpp/contentNext.h
rename to vns-cpp/contentNext.hpp
index 7fe8894..254e955 100644
--- a/vns-cpp/contentNext.h
+++ b/vns-cpp/contentNext.hpp
@@ -1,5 +1,5 @@
-#ifndef CONTENT_NEXT_H
-#define CONTENT_NEXT_H
+#ifndef CONTENT_NEXT_HPP
+#define CONTENT_NEXT_HPP
 
 #include <string>
 #include <utility>
diff --git a/vns-cpp/decompiler.cpp b/vns-cpp/decompiler.cpp
index 1ab40f5..d271e43 100644
--- a/vns-cpp/decompiler.cpp
+++ b/vns-cpp/decompiler.cpp
@@ -1,7 +1,7 @@
 #include <fstream>
 #include <vector>
-#include "naming.h"
-#include "decompiler.h"
+#include "naming.hpp"
+#include "decompiler.hpp"
 
 
 // If input string is nullptr, convert it to "null"
diff --git a/vns-cpp/decompiler.h b/vns-cpp/decompiler.hpp
similarity index 72%
rename from vns-cpp/decompiler.h
rename to vns-cpp/decompiler.hpp
index 796d553..13b421d 100644
--- a/vns-cpp/decompiler.h
+++ b/vns-cpp/decompiler.hpp
@@ -1,7 +1,7 @@
-#ifndef DECOMPILER_H
-#define DECOMPILER_H
+#ifndef DECOMPILER_HPP
+#define DECOMPILER_HPP
 
-#include "contentManager.h" // Assuming you have a header file for ContentManager
+#include "contentManager.hpp" // Assuming you have a header file for ContentManager
 
 class Decompiler
 {
diff --git a/vns-cpp/functions.cpp b/vns-cpp/functions.cpp
index 8a9113a..df7748e 100644
--- a/vns-cpp/functions.cpp
+++ b/vns-cpp/functions.cpp
@@ -1,4 +1,4 @@
-#include "functions.h"
+#include "functions.hpp"
 #include <algorithm>
 #include <sstream>
 
diff --git a/vns-cpp/functions.h b/vns-cpp/functions.hpp
similarity index 92%
rename from vns-cpp/functions.h
rename to vns-cpp/functions.hpp
index 1b42326..a36c398 100644
--- a/vns-cpp/functions.h
+++ b/vns-cpp/functions.hpp
@@ -1,5 +1,5 @@
-#ifndef FUNCTIONS_H
-#define FUNCTIONS_H
+#ifndef FUNCTIONS_HPP
+#define FUNCTIONS_HPP
 
 #include <string>
 #include <vector>
diff --git a/vns-cpp/naming.cpp b/vns-cpp/naming.cpp
index 014ac4b..fa7a4b7 100644
--- a/vns-cpp/naming.cpp
+++ b/vns-cpp/naming.cpp
@@ -1,4 +1,4 @@
-#include "naming.h"
+#include "naming.hpp"
 #include <ranges>
 #include <sstream>
 #include "libs/nlohmann/json.hpp"
diff --git a/vns-cpp/naming.h b/vns-cpp/naming.hpp
similarity index 96%
rename from vns-cpp/naming.h
rename to vns-cpp/naming.hpp
index e8c06db..ec876d0 100644
--- a/vns-cpp/naming.h
+++ b/vns-cpp/naming.hpp
@@ -1,5 +1,5 @@
-#ifndef NAMING_H
-#define NAMING_H
+#ifndef NAMING_HPP
+#define NAMING_HPP
 
 #include <string>
 #include <unordered_map>
diff --git a/vns-cpp/scriptProcessor.cpp b/vns-cpp/scriptProcessor.cpp
index fc70046..3fc36ff 100644
--- a/vns-cpp/scriptProcessor.cpp
+++ b/vns-cpp/scriptProcessor.cpp
@@ -2,9 +2,9 @@
 #include <cassert>
 #include <stdexcept>
 #include <fstream>
-#include "functions.h"
-#include "scriptProcessor.h"
-#include "naming.h"
+#include "functions.hpp"
+#include "scriptProcessor.hpp"
+#include "naming.hpp"
 
 std::string ScriptProcessor::get_id() const
 {
diff --git a/vns-cpp/scriptProcessor.h b/vns-cpp/scriptProcessor.hpp
similarity index 96%
rename from vns-cpp/scriptProcessor.h
rename to vns-cpp/scriptProcessor.hpp
index 0198159..fc84cdf 100644
--- a/vns-cpp/scriptProcessor.h
+++ b/vns-cpp/scriptProcessor.hpp
@@ -1,10 +1,10 @@
-#ifndef PROCESSOR_H
-#define PROCESSOR_H
+#ifndef PROCESSOR_HPP
+#define PROCESSOR_HPP
 
 #include <unordered_map>
 #include <unordered_set>
 #include <filesystem>
-#include "content.h"
+#include "content.hpp"
 
 class ScriptProcessor
 {
diff --git a/vns-cpp/tests.cpp b/vns-cpp/tests.cpp
index afc6d92..d8f8b44 100644
--- a/vns-cpp/tests.cpp
+++ b/vns-cpp/tests.cpp
@@ -1,10 +1,10 @@
-#include "tests.h"
+#include "tests.hpp"
 #include <cassert>
-#include "contentNext.h"
-#include "naming.h"
+#include "contentNext.hpp"
+#include "naming.hpp"
 #include <iostream>
-#include "scriptProcessor.h"
-#include "compiler.h"
+#include "scriptProcessor.hpp"
+#include "compiler.hpp"
 
 void TestNameWithoutTag()
 {
diff --git a/vns-cpp/tests.h b/vns-cpp/tests.hpp
similarity index 85%
rename from vns-cpp/tests.h
rename to vns-cpp/tests.hpp
index bd2e453..cc7102e 100644
--- a/vns-cpp/tests.h
+++ b/vns-cpp/tests.hpp
@@ -1,5 +1,5 @@
-#ifndef TESTS_H
-#define TESTS_H
+#ifndef TESTS_HPP
+#define TESTS_HPP
 
 void TestNameWithoutTag();
 
diff --git a/vns-cpp/version.h b/vns-cpp/version.hpp
similarity index 77%
rename from vns-cpp/version.h
rename to vns-cpp/version.hpp
index 1b46219..90a0355 100644
--- a/vns-cpp/version.h
+++ b/vns-cpp/version.hpp
@@ -1,5 +1,5 @@
-#ifndef VERSION_H
-#define VERSION_H
+#ifndef VERSION_HPP
+#define VERSION_HPP
 
 // vns main version
 constexpr int VERSION = 2;
diff --git a/vns-cpp/vns.cpp b/vns-cpp/vns.cpp
index 1ca3f16..dde68af 100644
--- a/vns-cpp/vns.cpp
+++ b/vns-cpp/vns.cpp
@@ -1,12 +1,12 @@
 // vns-cpp.cpp : Defines the entry point for the application.
 //
 
-#include "vns.h"
+#include "vns.hpp"
 #include <unordered_map>
 #include <unordered_set>
-#include "tests.h"
-#include "compiler.h"
-#include "naming.h"
+#include "tests.hpp"
+#include "compiler.hpp"
+#include "naming.hpp"
 
 int main(const int argc, char **argv)
 {
diff --git a/vns-cpp/vns.h b/vns-cpp/vns.hpp
similarity index 100%
rename from vns-cpp/vns.h
rename to vns-cpp/vns.hpp
diff --git a/vns-python/pyvns/naming.pyx b/vns-python/pyvns/naming.pyx
index 05946d8..c5bdd1a 100644
--- a/vns-python/pyvns/naming.pyx
+++ b/vns-python/pyvns/naming.pyx
@@ -8,7 +8,7 @@ from libcpp.unordered_set cimport unordered_set
 cdef extern from "vns-cpp/naming.cpp":
     pass
 
-cdef extern from "vns-cpp/naming.h":
+cdef extern from "vns-cpp/naming.hpp":
     cdef cppclass Naming:
         Naming(string)
         string to_string() const