Fix issues with filter name conflicts and cleanup.

BKrev: 4159af05UM0_pGuh-tAH08xD7YWK3g