update paths to NAF 2.0