Renamed filters to be unique and match function names better