Rename check, reword diagnostic