diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
index db555af..afa7f94 100644
--- a/MODULE.bazel.lock
+++ b/MODULE.bazel.lock
@@ -1,6 +1,6 @@
 {
   "lockFileVersion": 6,
-  "moduleFileHash": "b9a920dd39f2a4a369d1ef8d3777d6dd7c90da34f3ed6ef8935a819eee0e75fc",
+  "moduleFileHash": "e6f2e764385805292e0b26fdd67ed9b54dfa5c027804a0561838066873747886",
   "flags": {
     "cmdRegistries": [
       "https://raw.githubusercontent.com/ecsact-dev/bazel_registry/main",
diff --git a/async_reference/detail/c_execution_options/c_execution_options.cc b/async_reference/detail/c_execution_options/c_execution_options.cc
index da1468e..03fee40 100644
--- a/async_reference/detail/c_execution_options/c_execution_options.cc
+++ b/async_reference/detail/c_execution_options/c_execution_options.cc
@@ -47,7 +47,7 @@ ecsact_execution_options c_execution_options::c() {
 			entity_components.push_back(component);
 		}
 
-		create_entity_components_datas.push_back(entity_components.data());
+		create_entity_components_data.push_back(entity_components.data());
 	}
 
 	options.actions = actions.data();
@@ -67,7 +67,7 @@ ecsact_execution_options c_execution_options::c() {
 	options.remove_components_length = remove_ids.size();
 
 	options.create_entities = create_entity_placeholder_ids.data();
-	options.create_entities_components = create_entity_components_datas.data();
+	options.create_entities_components = create_entity_components_data.data();
 	options.create_entities_length = create_entities_components.size();
 	options.create_entities_components_length =
 		create_entity_components_length.data();
diff --git a/async_reference/detail/c_execution_options/c_execution_options.hh b/async_reference/detail/c_execution_options/c_execution_options.hh
index 7c2967b..3f3a178 100644
--- a/async_reference/detail/c_execution_options/c_execution_options.hh
+++ b/async_reference/detail/c_execution_options/c_execution_options.hh
@@ -42,7 +42,7 @@ private:
 	std::vector<ecsact_component> adds;
 	std::vector<ecsact_component> updates;
 
-	std::vector<ecsact_component*>             create_entity_components_datas;
+	std::vector<ecsact_component*>             create_entity_components_data;
 	std::vector<std::vector<ecsact_component>> create_entity_components;
 	std::vector<int32_t>                       create_entity_components_length;
 };
diff --git a/serialize_reference/serialize_reference.cc b/serialize_reference/serialize_reference.cc
index 9241b64..e8e77c4 100644
--- a/serialize_reference/serialize_reference.cc
+++ b/serialize_reference/serialize_reference.cc
@@ -87,7 +87,7 @@ ecsact_restore_error ecsact_restore_as_execution_options(
 ) {
 	auto placeholder_ids = std::vector<ecsact_placeholder_entity_id>{};
 	auto component_ids_list = std::vector<std::vector<ecsact_component_id>>{};
-	auto component_datas_list =
+	auto entity_component_data_list =
 		std::vector<std::vector<std::vector<std::byte>>>{};
 
 	auto read_amount = int32_t{};
@@ -103,24 +103,24 @@ ecsact_restore_error ecsact_restore_as_execution_options(
 
 	placeholder_ids.reserve(ent_count);
 	component_ids_list.reserve(ent_count);
-	component_datas_list.reserve(ent_count);
+	entity_component_data_list.reserve(ent_count);
 
 	for(int32_t ent_idx = 0; ent_count > ent_idx; ++ent_idx) {
 		placeholder_ids.push_back(static_cast<ecsact_placeholder_entity_id>(ent_idx)
 		);
 
 		auto& component_ids = component_ids_list.emplace_back();
-		auto& component_datas = component_datas_list.emplace_back();
+		auto& component_data_list = entity_component_data_list.emplace_back();
 
 		auto components_count = int32_t{};
 		READ_CALLBACK_INTO_VAR(components_count);
 
 		component_ids.reserve(components_count);
-		component_datas.reserve(components_count);
+		component_data_list.reserve(components_count);
 
 		for(int i = 0; components_count > i; ++i) {
 			auto& component_id = component_ids.emplace_back();
-			auto& component_data = component_datas.emplace_back();
+			auto& component_data = component_data_list.emplace_back();
 			auto  component_size = int32_t{};
 			READ_CALLBACK_INTO_VAR(component_id);
 			READ_CALLBACK_INTO_VAR(component_size);
@@ -161,8 +161,8 @@ ecsact_restore_error ecsact_restore_as_execution_options(
 	}
 
 	auto entity_components_owner = std::vector<std::vector<ecsact_component>>{};
-	for(auto i = 0; component_datas_list.size() > i; ++i) {
-		auto& comp_data = component_datas_list[i];
+	for(auto i = 0; entity_component_data_list.size() > i; ++i) {
+		auto& comp_data = entity_component_data_list[i];
 		auto& comp_ids = component_ids_list[i];
 
 		auto& comp_data_list = entity_components_owner.emplace_back();
@@ -217,23 +217,23 @@ void ecsact_dump_entities(
 		callback(&components_count, sizeof(components_count), callback_user_data);
 
 		auto component_ids = std::vector<ecsact_component_id>{};
-		auto component_datas = std::vector<const void*>{};
+		auto component_data_list = std::vector<const void*>{};
 
 		component_ids.resize(components_count);
-		component_datas.resize(components_count);
+		component_data_list.resize(components_count);
 
 		ecsact_get_components(
 			registry_id,
 			entity,
 			components_count,
 			component_ids.data(),
-			component_datas.data(),
+			component_data_list.data(),
 			nullptr
 		);
 
 		for(int i = 0; components_count > i; ++i) {
 			const auto component_id = component_ids[i];
-			const auto component_data = component_datas[i];
+			const auto component_data = component_data_list[i];
 			const auto component_size = ecsact_serialize_component_size(component_id);
 
 			auto serialized_component_data =
diff --git a/test/async/async_ref_test.cc b/test/async/async_ref_test.cc
index 1dc4407..d039f25 100644
--- a/test/async/async_ref_test.cc
+++ b/test/async/async_ref_test.cc
@@ -54,7 +54,7 @@ void async_test::RemoveComponent::impl(context& ctx) {
 }
 
 void async_test::TryEntity::impl(context& ctx) {
-	// santity check
+	// sanity check
 	ctx.action();
 }