Make interface messages consisten for ID vs Id

Change-Id: If0edf4fab364fc090abe97df9a096489d352b8bb