var names fix