Removed un-used names, and added new names.