Change typedefs to using