Fix scan identifier prefixing