#87 Replace more PUN_ variables