Merge branch 'release/3.1.0' into develop
Fix variable names to be lowercase for future parser compatibility.