Also rename window_template_terminator to null_window_template, in keeping with naming conventions
Also split data4d.s