Use ipr:: in more places