MVE: Renamed template parameters for Windows compatibility