Changed some var names