Fixed some naming inconsistencies