rename util -> _util