fix some rename problems