Fix upper case state variable name naming clash

[clinssen]

Fixes #765.

[clinssen]

Perhaps we could eliminate the use of .upper() to uppercase variable names in the generated code (and also move to C++ enum class for StateVecElems to ensure proper scoping of the enum members).