Standardize on id in the REST API

Change-Id: I154e6f77b864391ca60f862cfc006e24da6fae6e