path changes for naf1->naf2 migration