Merge "Rename and obsolete compiler filter names." into oc-dev