fix am_rename for changes in scanner