Fix variable usage bug. It hasn't caused problems because the backwards...

Fix variable usage bug. It hasn't caused problems because the backwards compatibility variables are still being used as a fallback.