changed some struct names in WMRATypes for clarity