Change struct name to avoid conflicts when system headers updated