change combat_name to name