changing some var names