Fix broken service name references

Some service names have been changed in their repositories causing the sandbox to throw exceptions when updating. 

It looks like your currently renaming some services so this is probably part of a larger fix.