Add Name attribute to Service and Service Component objects