3b2d0b88f3
Also switched to using type names as identifiers instead of their indices
Also switched to using type names as identifiers instead of their indices