Rename resolve