Don't munch database names

Changing database names with underscores to dashes means that database names with underscores cannot be used. There's no reason for this.