diff --git a/cardinal/component/component_health.go b/cardinal/component/health.go
similarity index 100%
rename from cardinal/component/component_health.go
rename to cardinal/component/health.go
diff --git a/cardinal/component/component_player.go b/cardinal/component/player.go
similarity index 100%
rename from cardinal/component/component_player.go
rename to cardinal/component/player.go
diff --git a/cardinal/msg/msg_attack_player.go b/cardinal/msg/attack_player.go
similarity index 100%
rename from cardinal/msg/msg_attack_player.go
rename to cardinal/msg/attack_player.go
diff --git a/cardinal/msg/msg_create_player.go b/cardinal/msg/create_player.go
similarity index 100%
rename from cardinal/msg/msg_create_player.go
rename to cardinal/msg/create_player.go
diff --git a/cardinal/query/query_player_health.go b/cardinal/query/player_health.go
similarity index 100%
rename from cardinal/query/query_player_health.go
rename to cardinal/query/player_health.go
diff --git a/cardinal/system/system_attack.go b/cardinal/system/attack.go
similarity index 100%
rename from cardinal/system/system_attack.go
rename to cardinal/system/attack.go
diff --git a/cardinal/system/system_player_spawner.go b/cardinal/system/player_spawner.go
similarity index 100%
rename from cardinal/system/system_player_spawner.go
rename to cardinal/system/player_spawner.go
diff --git a/cardinal/system/system_regen.go b/cardinal/system/regen.go
similarity index 100%
rename from cardinal/system/system_regen.go
rename to cardinal/system/regen.go