Fix merge errors -- finish renaming local vectors.