Refactoring: add sufix for error fields