Naming in test/nfn is more consistent now