Cleans up some naming and spelling.