fixing some rename issues