diff --git a/include/wrenpp/detail/guess_class_name.hpp b/include/wrenpp/detail/guess_class_name.hpp
index 087724f..ea47067 100644
--- a/include/wrenpp/detail/guess_class_name.hpp
+++ b/include/wrenpp/detail/guess_class_name.hpp
@@ -70,13 +70,13 @@ namespace wren {
 #   error "Unsupported compiler"
 #endif
 		}
-
-		template <typename T, std::size_t S=guess_class_name_impl<T>().size()>
-		static constinit dhandy::bt::string g_class_names = {guess_class_name_impl<T>()};
 	} //namespace detail
 
+	template <typename T, std::size_t S=detail::guess_class_name_impl<T>().size()>
+	constexpr dhandy::bt::string g_guessed_class_name = {detail::guess_class_name_impl<T>()};
+
 	template <typename T>
-	const char* guess_class_name() {
-		return detail::g_class_names<T>.data();
+	constexpr const char* guess_class_name() {
+		return g_guessed_class_name<T>.data();
 	}
 } //namespace wren
diff --git a/include/wrenpp/vm_fun.hpp b/include/wrenpp/vm_fun.hpp
index 4fe9aab..09e77f1 100644
--- a/include/wrenpp/vm_fun.hpp
+++ b/include/wrenpp/vm_fun.hpp
@@ -48,8 +48,8 @@ namespace wren {
 	T* make_wren_object(VM& vm, ModuleAndName mn, Args&&... args);
 
 #if defined(WRENPP_WITH_NAME_GUESSING)
-	template <typename T, typename... Args>
-	T* make_wren_object(VM& vm, const char* module, Args&&... args);
+	template <typename T, dhandy::bt::string Mod, typename... Args>
+	T* make_wren_object(VM& vm, Args&&... args);
 #endif
 
 	template <auto V>
@@ -179,11 +179,11 @@ namespace wren {
 	}
 
 #if defined(WRENPP_WITH_NAME_GUESSING)
-	template <typename T, typename... Args>
-	inline T* make_wren_object(VM& vm, const char* module, Args&&... args) {
+	template <typename T, dhandy::bt::string Mod, typename... Args>
+	inline T* make_wren_object(VM& vm, Args&&... args) {
 		return make_wren_object<T>(
 			vm,
-			ModuleAndName{module, guess_class_name<T>()},
+			MN<Mod, g_guessed_class_name<T>>,
 			std::forward<Args>(args)...
 		);
 	}