Second step of rename