closes #3796
Merge pull request #3797 from dotCMS/issue-3796-remove-velocityvar-from-struc-name

closes #3796