refactoring with Name.java for whole toolbox