diff --git a/HEADS b/HEADS
index 5b16ec45..cdcfdb97 100644
--- a/HEADS
+++ b/HEADS
@@ -1 +1 @@
-{"engine": {"3.2": "60609ff0ed357a38b58126791f7372c8aa3e446e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "2c47f9f55058ba2caab980e605eb90f6ffc93282"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}}
\ No newline at end of file
+{"engine": {"3.2": "60609ff0ed357a38b58126791f7372c8aa3e446e", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "97f10512f8832394389e1109154b8af34a2ef2c6"}, "entity_spell_system": {"master": "bebab39f344cfbd9f0222b8ff51a487d950b74f0"}, "ui_extensions": {"master": "6fe4f69fea8d71043b08d959b8085404c9c4fe47"}, "voxelman": {"master": "19f3c1f8ff34331a2f1bedf260637e415b3df7d0"}, "texture_packer": {"master": "b29b499adf570aa7f85af69ef080ff0d5e04afae"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "4ee946963a16bbfdb4dbb5df52134d22aa168041"}, "procedural_animations": {"master": "9ae56c17230ba9c6160777650b2b89eecdc8df9e"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "fast_quadratic_mesh_simplifier": {"master": "f6d3d65cc6ce4dddfc68054164feec1f612ecd1f"}, "props": {"master": "b2bcb5ea6469b19298cd849c1232ddb5ad26f71c"}}
\ No newline at end of file
diff --git a/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres b/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres
index 58c9a4ca..14523018 100644
--- a/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres
+++ b/game/modules/entity_classes/naturalist/spells/10_aspect_of_scorpions_rank_1.tres
@@ -6,7 +6,7 @@
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=4]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/aspect_of_scorpions.tres" type="Texture" id=5]
 
-[sub_resource type="EntityResourceCostData" id=1]
+[sub_resource type="EntityResourceCostDataResource" id=1]
 entity_resource_data = ExtResource( 1 )
 cost = 100
 
diff --git a/game/modules/entity_classes/naturalist/spells/36_regrow.tres b/game/modules/entity_classes/naturalist/spells/36_regrow.tres
index 1516aaaa..8d38b6ed 100644
--- a/game/modules/entity_classes/naturalist/spells/36_regrow.tres
+++ b/game/modules/entity_classes/naturalist/spells/36_regrow.tres
@@ -4,7 +4,7 @@
 [ext_resource path="res://scripts/spells/gd_spell_script.gd" type="Script" id=2]
 [ext_resource path="res://modules/entity_classes/naturalist/icons/root.tres" type="Texture" id=3]
 
-[sub_resource type="EntityResourceCostData" id=1]
+[sub_resource type="EntityResourceCostDataResource" id=1]
 entity_resource_data = ExtResource( 1 )
 cost = 100
 
diff --git a/game/scripts/resources/HealthResourceData.gd b/game/scripts/resources/HealthResourceData.gd
index ed25e0dc..f8434b9d 100644
--- a/game/scripts/resources/HealthResourceData.gd
+++ b/game/scripts/resources/HealthResourceData.gd
@@ -21,7 +21,7 @@ extends EntityResourceData
 # SOFTWARE.
 
 func _get_entity_resource_instance() -> EntityResource:
-	var mr = HealthResource.new()
+	var mr = EntityResourceHealth.new()
 	mr.data_path = resource_path
 	
 	return mr
diff --git a/game/scripts/resources/SpeedResourceData.gd b/game/scripts/resources/SpeedResourceData.gd
index c975016f..dfc108e8 100644
--- a/game/scripts/resources/SpeedResourceData.gd
+++ b/game/scripts/resources/SpeedResourceData.gd
@@ -21,7 +21,7 @@ extends EntityResourceData
 # SOFTWARE.
 
 func _get_entity_resource_instance() -> EntityResource:
-	var mr = SpeedResource.new()
+	var mr = EntityResourceSpeed.new()
 	mr.data_path = resource_path
 	
 	return mr