Seeing that the NPA has not been called anything else since its inception (and has also been the only division of the NPAF) and also seeing the lack of consistency between the title of chapter 8 and the text of it;
I propose chapter 8 of the legal code is amended as follows: