Fix issues with filter name conflicts and cleanup.

(Logical change 1.81)
1 file changed