Update: add underscore instead hyphens

Since those name values are being dealed as objects, we can't have
hyphens.