users -> people (not yet users)

Change-Id: Ia54b0f5bc540a5ec39e7aa2fccf075827cb5a313