Small renaming (see commit info).
"NC #5, 6" - done. Or smth like that...