refactoring: use full class name, add {get|build} methods.