Maybe, we use it both ways with and without suffix, so I went with a local change.