GCP-7101 change underscores to dashes as filename delimeter