Fix some naming inaccuracies