correcting some naming