Rename postfix to suffix to match upstream