Fixed parsing of scoped variable names
Merge pull request #1512 from Kazark/fix-name-scope

Fixed parsing of scoped variable names