fixing var names