diff --git a/players/molikman.tscn b/players/molikman.tscn
index da43395..995a4de 100644
--- a/players/molikman.tscn
+++ b/players/molikman.tscn
@@ -7572,6 +7572,7 @@ script = ExtResource("1_l07l8")
 weapon_models = {
 &"bomb": NodePath("Camera3D/molikman_hands/Armature"),
 &"knife": NodePath("Camera3D/molikman_hands/Knife"),
+&"mm_molik": NodePath("Camera3D/molikman_hands/GunArm"),
 &"sp": NodePath("Camera3D/molikman_hands/GunArm")
 }
 
diff --git a/systems/weapon_system/weapon_substate_machine.gd b/systems/weapon_system/weapon_substate_machine.gd
index 355f382..83f4195 100644
--- a/systems/weapon_system/weapon_substate_machine.gd
+++ b/systems/weapon_system/weapon_substate_machine.gd
@@ -3,8 +3,7 @@ extends SubStateMachine
 class_name WeaponSubStateMachine
 
 @export var animation_prefix: StringName
-@export var registry_entry: StringName
-@export var visibility_target: StringName
+@export var weapon_gid: StringName
 
 @export var max_ammo: int
 @export var ammo: int = -1:
@@ -66,11 +65,11 @@ func _ready() -> void:
 
 func _enter() -> void:
 	super()
-	player.weapon_models[visibility_target].show()
+	player.weapon_models[weapon_gid].show()
 
 func _exit() -> void:
 	super()
-	player.weapon_models[visibility_target].hide()
+	player.weapon_models[weapon_gid].hide()
 
 func use_begin() -> void:
 	if current_state != null:
diff --git a/systems/weapon_system/weapon_system.gd b/systems/weapon_system/weapon_system.gd
index 47e9ebb..b2c932c 100644
--- a/systems/weapon_system/weapon_system.gd
+++ b/systems/weapon_system/weapon_system.gd
@@ -81,7 +81,7 @@ func get_empty_ability_slot() -> StringName:
 
 func can_add_ability(ability: StringName, slot: StringName) -> bool:
 	for ability_slot in ["ability_first","ability_second","ability_third"]:
-		if slots[ability_slot] != null and slots[ability_slot].registry_entry == ability:
+		if slots[ability_slot] != null and slots[ability_slot].weapon_gid == ability:
 			return false
 	return can_add(slot)
 
@@ -116,7 +116,7 @@ func drop(weapon: WeaponSubStateMachine) -> void:
 	if slots.find_key(weapon) in ["knife","ability_first","ability_second","ability_third"]:
 		return
 	
-	var dropped_weapon: DroppableWeapon = Registry.weapons[weapon.registry_entry].dropped_scene.instantiate()
+	var dropped_weapon: DroppableWeapon = Registry.weapons[weapon.weapon_gid].dropped_scene.instantiate()
 	dropped_weapon.weapon.ammo = weapon.ammo
 	dropped_weapon.weapon.remaining_ammo = weapon.remaining_ammo
 	dropped_weapon.weapon.slot = weapon.slot
@@ -172,7 +172,7 @@ func notify_slots_updated():
 		if slots[key] == null:
 			display_slots[key] = ""
 		else:
-			display_slots[key] = slots[key].registry_entry
+			display_slots[key] = slots[key].weapon_gid
 	var current_slot: StringName = ""
 	var found = slots.find_key(current_state)
 	if found:
diff --git a/weapons/bomb/bomb.tscn b/weapons/bomb/bomb.tscn
index ba1e4a4..3c2758d 100644
--- a/weapons/bomb/bomb.tscn
+++ b/weapons/bomb/bomb.tscn
@@ -10,8 +10,7 @@
 [node name="Bomb" type="Node" node_paths=PackedStringArray("enter_state")]
 script = ExtResource("1_krsgt")
 animation_prefix = &"baked_bomb_"
-registry_entry = &"bomb"
-visibility_target = &"bomb"
+weapon_gid = &"bomb"
 max_ammo = 1
 ammo_mags = 0
 can_be_previous = false
diff --git a/weapons/gun/sp/starting_pistol.tscn b/weapons/gun/sp/starting_pistol.tscn
index 786be11..97c117c 100644
--- a/weapons/gun/sp/starting_pistol.tscn
+++ b/weapons/gun/sp/starting_pistol.tscn
@@ -33,8 +33,7 @@ properties/1/replication_mode = 2
 [node name="StartingPistol" type="Node" node_paths=PackedStringArray("enter_state")]
 script = ExtResource("1_g7s1i")
 animation_prefix = &"baked_sp_"
-registry_entry = &"sp"
-visibility_target = &"sp"
+weapon_gid = &"sp"
 max_ammo = 20
 speed_modifier = 0.9
 slot = &"secondary"
diff --git a/weapons/knife/knife.tscn b/weapons/knife/knife.tscn
index a6460c9..c146f86 100644
--- a/weapons/knife/knife.tscn
+++ b/weapons/knife/knife.tscn
@@ -9,8 +9,7 @@
 [node name="Knife" type="Node" node_paths=PackedStringArray("enter_state")]
 script = ExtResource("1_2xf1r")
 animation_prefix = &"baked_knife_"
-registry_entry = &"knife"
-visibility_target = &"knife"
+weapon_gid = &"knife"
 ammo_mags = 0
 slot = &"knife"
 enter_state = NodePath("Intro")
diff --git a/weapons/molikman/molik/molikman_molik.tscn b/weapons/molikman/molik/molikman_molik.tscn
index 549df27..5b2e81d 100644
--- a/weapons/molikman/molik/molikman_molik.tscn
+++ b/weapons/molikman/molik/molikman_molik.tscn
@@ -16,8 +16,7 @@ properties/1/replication_mode = 1
 [node name="MolikmanMolik" type="Node" node_paths=PackedStringArray("enter_state")]
 script = ExtResource("1_e53aq")
 animation_prefix = &"baked_sp_"
-registry_entry = &"mm_molik"
-visibility_target = &"sp"
+weapon_gid = &"mm_molik"
 max_ammo = 1
 ammo_mags = 0
 speed_modifier = 0.9