REP-1161 Springified all the filters.

There is a few places were only variables were renamed or a method moved for consistency across all of the filters.