removed and renamed as per content
added and used names nearly as per content