Changed Names

more phrases to be replaced in future