Adding support to Service renaming