Rename structures to better match the names in the WSPP IDL.