Var names; maps fixed