#508 Replace PUN_*, update language