Fixed windowing functions to use new suffix generator
Readability