Update thorfile to use the new Filter methods / module names