Refs #26 - Use new namespace convention for service providers.