fix some rename bugs