Simplify service namespace, update for Bundle.