Fix defects of rename