Renamed Identifier classes to Filter classes