rename detection improvements