[ORB-254] corrected suffixes