WP-3067: Use plural keys for options map.