Rename some var