Rename id and name fields to more closely match database entries