Fixed some var names.