Hemanth, Vinay | Fix sending of identifier prefixes