fix some var name change