switch from dash separated to underscore separated to support variable n...

...ames