Replaced all references to old Subscription, Profile, Environment with new ones