Add NRNaked and remove Naked