fixed duplicate rename problem