Rename menuId in MenuNodeId to be consistent