Suffixes replaced to match expectations of #467