Also rename window_template_terminator to null_window_template, in keeping with naming conventions
Had to leave some unfinished due to complexity at the moment