Added support for underscore in names for service, resource and registry