update subscriber service naming to be less ambiguous