Service renaming fixes