more state_name usage for consistency