var names fixed