Adding a mix4 generator and renaming the type map names for mix3 to remove the redundant "generator".