refactoring: removed the n7 prefix.