Normalize orgPn usage