refactoring, making the pu-name more tiny