Fix some rename problem