Update and rename Goals to goals