Changing out legacy variable substitution for modern conventions
Merge pull request #1 from genesis/legacy-variable-substitution

Changing out legacy variable substitution for modern conventions