Fixed some var names