Merge "Add apex name to service"