Changed fields to remove leading underscore in templates
Merge pull request #1642 from borrillis/develop

Changed fields to remove leading underscore in templates