Clean up type names.