Update ns to reflect NameUtils assembly move