improve rename