diff --git a/gen_c_library/c_library.cpp b/gen_c_library/c_library.cpp
index e29a620..a0b3044 100644
--- a/gen_c_library/c_library.cpp
+++ b/gen_c_library/c_library.cpp
@@ -16,7 +16,7 @@ GEN_NS_END
 
 #include <cstdlib>   // for system()
 
-#include "components/fixed_arena.hpp"
+#include "components/memory.fixed_arena.hpp"
 #include "components/misc.hpp"
 
 using namespace gen;
diff --git a/gen_c_library/components/fixed_arena.hpp b/gen_c_library/components/memory.fixed_arena.hpp
similarity index 96%
rename from gen_c_library/components/fixed_arena.hpp
rename to gen_c_library/components/memory.fixed_arena.hpp
index 8f0ff21..b5958cc 100644
--- a/gen_c_library/components/fixed_arena.hpp
+++ b/gen_c_library/components/memory.fixed_arena.hpp
@@ -1,7 +1,7 @@
-// #pragma once
-// #include "../project/gen.hpp"
+#pragma once
+#include "../project/gen.hpp"
 
-// using namespace gen;
+using namespace gen;
 
 CodeBody gen_fixed_arenas()
 {
@@ -18,13 +18,13 @@ CodeBody gen_fixed_arenas()
 	char const* template_interface = stringize(
 		inline
 		void fixed_arena_init_<Name>(FixedArena_<Name>* result) {
-			zero_size(& result.memory[0], <Size>);
-			result.arena = arena_init_from_memory(& result.memory[0], <Size>);
+			zero_size(& result->memory[0], <Size>);
+			result.arena = arena_init_from_memory(& result->memory[0], <Size>);
 		}
 
 		inline
 		ssize fixed_arena_size_remaining_<Name>(FixedArena_<Name>* fixed_arena, ssize alignment) {
-			return size_remaining(fixed_arena.arena, alignment);
+			return size_remaining(fixed_arena->arena, alignment);
 		}
 	);