Improved ID name change handling to use alternative name