Rename function and apply it to scanner-v2