More hyphens to underscores.