FIX: Var name issues