Changed some generated type mappings to match own needs.