Change titles to better align to the goal