Summary: This makes the protobufs more consistent.

Test Plan: Existing tests.

Reviewers: michelle, philkuz, #engineering

Reviewed By: michelle, #engineering

Differential Revision: https://phab.corp.pixielabs.ai/D3697

GitOrigin-RevId: df2b17130cf7963391516107b213d6d3e115197a