Refactoring: rename duplicated Util classes