The structures now use C++ style names. This is done before the filter is moved over to the filter template.