nix nonsensical typedef naming
rename file so that name makes any sense
Finish rename for all platforms
further rename fixes