Fixes to variable name per @MrMaksimize's comments