Service naming issue fix.