Naming refactoring, remove unused filters.