Removed extra code in rename