Bring wording in sync with WP, slight improvement of P/R