diff --git a/source/core/graphics/shape_loader.cpp b/source/core/graphics/shape_loader.cpp
index 5dbcb8e..52edb09 100644
--- a/source/core/graphics/shape_loader.cpp
+++ b/source/core/graphics/shape_loader.cpp
@@ -11,9 +11,9 @@ namespace Graphics {
 
 // Inicialització de variables estàtiques
 std::unordered_map<std::string, std::shared_ptr<Shape>> ShapeLoader::cache_;
-std::string ShapeLoader::base_path = "data/shapes/";
+std::string ShapeLoader::base_path_ = "data/shapes/";
 
-static std::shared_ptr<Shape> ShapeLoader::load(const std::string& filename) {
+std::shared_ptr<Shape> ShapeLoader::load(const std::string& filename) {
     // Check cache first
     auto it = cache_.find(filename);
     if (it != cache_.end()) {
@@ -66,9 +66,9 @@ void ShapeLoader::clear_cache() {
     cache_.clear();
 }
 
-size_t ShapeLoader::getCacheSize() { return cache_.size(); }
+size_t ShapeLoader::get_cache_size() { return cache_.size(); }
 
-static std::string ShapeLoader::resolvePath(const std::string& filename) {
+std::string ShapeLoader::resolve_path(const std::string& filename) {
     // Si és un path absolut (comença amb '/'), usar-lo directament
     if (!filename.empty() && filename[0] == '/') {
         return filename;