Fixed some naming inconsistencies.