Update consumer tags to eliminate conflicts.
Fix typo on plurality of reference.