Rename services to _svc