Improve PIUtil naming