Fixed prefixes for some of the typedefs.