Fixed some Windows compile issues
Renamed a struct with a silly name.