Fix for merge naming issue

Post commit code review : Tiff Go