Corrected some naming niches