Fix struct/enum roundtrip names ##types