Update grammar, fix issue with Classname varname = abcde;