Hotfix consistent variable rename (fix regression)
Fixes [#3345311]
Fixes [#3345235]
Fixed: [#3326183] [#3307977]