refactor NameTable