Filter rename fix for GRAILS-9593

Hi Marc,

Just in case a third (although just a rename not remove/add) pull request for this is helpful!

This is based on master at this time, which hasn't fixed the naming despite your recent commits.

Simon