Few tweaks to variable name section