Don't convert an explicitly declared state variable name
Merge remote-tracking branch 'origin/master'