diff --git a/liblava/file/file_system.cpp b/liblava/file/file_system.cpp
index c6605f535a184209f705d2bac1181a4d948b3e53..50b799e1aec10804663c4c94b894ae7b5c19f8d1 100644
--- a/liblava/file/file_system.cpp
+++ b/liblava/file/file_system.cpp
@@ -27,7 +27,7 @@ namespace lava {
         return PHYSFS_getPrefDir(instance().org, instance().app);
     }
 
-    string file_system::get_res_dir() {
+    string file_system::get_res_dir_str() {
         string res_dir = get_base_dir();
         res_dir += instance().res_path;
         string_ref const_res_dir = res_dir;
@@ -100,13 +100,13 @@ namespace lava {
         res_path = "res/";
 #endif
 
-        if (fs::exists(str(get_res_dir())))
+        if (fs::exists(str(get_res_dir_str())))
             if (file_system::mount(str(res_path)))
-                log()->debug("mount {}", str(get_res_dir()));
+                log()->debug("mount {}", str(get_res_dir_str()));
 
         auto cwd_res_dir = fs::current_path().append("res/").lexically_normal().string();
 
-        if (fs::exists(cwd_res_dir) && (cwd_res_dir != get_res_dir()))
+        if (fs::exists(cwd_res_dir) && (cwd_res_dir != get_res_dir_str()))
             if (file_system::mount(cwd_res_dir))
                 log()->debug("mount {}", str(cwd_res_dir));
 
diff --git a/liblava/file/file_system.hpp b/liblava/file/file_system.hpp
index 89cfb80606f1282f1e7127f7a832f820041fa32d..5e5a8032b5eba9a88e068ba4f3aa798b4ff06b1d 100644
--- a/liblava/file/file_system.hpp
+++ b/liblava/file/file_system.hpp
@@ -24,7 +24,7 @@ namespace lava {
         static name get_base_dir();
         static string get_base_dir_str();
         static name get_pref_dir();
-        static string get_res_dir();
+        static string get_res_dir_str();
 
         static bool mount(string_ref path);
         static bool mount(name base_dir_path);
diff --git a/liblava/resource/mesh.cpp b/liblava/resource/mesh.cpp
index 8f0a8020125b8e6c4f59fa9e97313a2e2c9a7014..bb6793aaf855aa67ff8f0f59c45a27f64c633536 100644
--- a/liblava/resource/mesh.cpp
+++ b/liblava/resource/mesh.cpp
@@ -173,7 +173,7 @@ lava::mesh::ptr lava::load_mesh(device_ptr device, name filename) {
     return nullptr;
 }
 
-lava::mesh::ptr lava::load_mesh(device_ptr device, mesh_type type) {
+lava::mesh::ptr lava::create_mesh(device_ptr device, mesh_type type) {
     switch (type) {
     case mesh_type::cube: {
         auto cube = make_mesh();
diff --git a/liblava/resource/mesh.hpp b/liblava/resource/mesh.hpp
index 5ed09b0b4ef64172739227063a329c9e9b738b3d..c4b5b5c67b44bc5a7919dbfcfde87df7d3e765c0 100644
--- a/liblava/resource/mesh.hpp
+++ b/liblava/resource/mesh.hpp
@@ -128,7 +128,7 @@ namespace lava {
         quad
     };
 
-    mesh::ptr load_mesh(device_ptr device, mesh_type type);
+    mesh::ptr create_mesh(device_ptr device, mesh_type type);
 
     struct mesh_meta {
         string filename; // empty -> type