Fixed some changed names and typos