Fix poor var naming