even more suffix changes in code