Same as the other commits in the series, we use 'id' when talking about thing rather than the datatype.
