WP-2825: rewrite fields to fix punctuation.