Allow underscores in names