adopted to the new format of the nr namespace package