Merge "Rename and obsolete compiler filter names."