updating nvmnode states to use macros