Update to use NameInterface rather than IName