improve interface to name-fix using a Name wrapper class