Fixing var names after code move