Finishing renames to ServiceProxy