- Added underscore and hyphen as valid service name