Modified some var name