Update NIIOS defines.

Update comments and add 6.1 define.