Fix some rename stuff