Adds nm2data and consistent renaming