rename DiMapper type to NDiMapper, renamed methods