Fix some obvious name typos to get to 85%