jhm/naming: Update for move to <util/>