Naming edits, disabled filtering for now