290c290
< 	if (!_TIFFMergeField(tif, infoarray->fieldinfo, infoarray->used))
---
> 	if (!_TIFFMergeFields(tif, infoarray->fieldinfo, infoarray->used))
373c373
< _TIFFMergeField(TIFF* tif, const TIFFField info[], uint32 n)
---
> _TIFFMergeFields(TIFF* tif, const TIFFField info[], uint32 n)
375c375
< 	const char module[] = "_TIFFMergeFieldInfo";
---
> 	const char module[] = "_TIFFMergeField";
381,382c381,382
< 		const TIFFFieldInfo *fip =
< 			_TIFFFindFieldInfo(tif, info[i].field_tag, TIFF_ANY);
---
> 		const TIFFField *fip =
> 			TIFFFindField(tif, info[i].field_tag, TIFF_ANY);
430,431c430,431
< 		const TIFFFieldInfo *fip =
< 			_TIFFFindFieldInfo(tif, info[i].field_tag, TIFF_ANY);
---
> 		const TIFFField *fip =
> 			TIFFFindField(tif, info[i].field_tag, TIFF_ANY);
576c576
< _TIFFFindField(TIFF* tif, uint32 tag, TIFFDataType dt)
---
> TIFFFindField(TIFF* tif, uint32 tag, TIFFDataType dt)
602c602
< _TIFFFindFieldInfo(TIFF* tif, uint32 tag, TIFFDataType dt)
---
> TIFFFindFieldInfo(TIFF* tif, uint32 tag, TIFFDataType dt)
660c660
< _TIFFFindFieldInfoByName(TIFF* tif, const char *field_name, TIFFDataType dt)
---
> TIFFFindFieldInfoByName(TIFF* tif, const char *field_name, TIFFDataType dt)
691,692c691,692
< const TIFFFieldInfo*
< _TIFFFieldWithTag(TIFF* tif, uint32 tag)
---
> const TIFFField*
> TIFFFieldWithTag(TIFF* tif, uint32 tag)
694c694
< 	const TIFFFieldInfo* fip = _TIFFFindFieldInfo(tif, tag, TIFF_ANY);
---
> 	const TIFFField* fip = TIFFFindField(tif, tag, TIFF_ANY);
705,706c705,706
< const TIFFFieldInfo*
< _TIFFFieldWithName(TIFF* tif, const char *field_name)
---
> const TIFFField*
> TIFFFieldWithName(TIFF* tif, const char *field_name)
708,709c708,709
< 	const TIFFFieldInfo* fip =
< 		_TIFFFindFieldInfoByName(tif, field_name, TIFF_ANY);
---
> 	const TIFFField* fip =
> 		_TIFFFindFieldByName(tif, field_name, TIFF_ANY);
725c725
< 	fld = _TIFFFindField(tif, tag, dt);
---
> 	fld = TIFFFindField(tif, tag, dt);
728c728
< 		if (!_TIFFMergeField(tif, fld, 1))
---
> 		if (!_TIFFMergeFields(tif, fld, 1))
