Add typename mappings