fix template variable references
used underscore to be consistent with current multi word var names