Fix typenames for orc struct from Kevin