Fixed local case for ID => name lookup

Change-Id: I8ba1dc2bd16988c5afbdd5064fef572c1b240a67