Summary: Realized that we were inconsistently using these rules. Fixed them.

Test Plan: Existing tests.

Reviewers: zasgar, michelle

Reviewed By: zasgar

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

GitOrigin-RevId: fb93fda60dfbba0dbdfa35f2bcbb8a3f98271c1a