MMSBUILD-238 (Mark) Rename structures and macros to use the same names as Win32

@markbenvenuto