bugz 4711: remove hardcoded text from vapp name
fixed variable to avoid potential infinite loop
fixed error messages to reflect new length
Merge pull request #59 from daniellemayne/2014.05

2014.05: naming convention bugfix