Fixed Manifest Directives

Manifest directives and stages had hyphens which are deprecated.
Retested to make sure everything is in order.