PAXUSERADMIN-20 unify names: use package syntax