Additional filter names are now underscored instead of downcased.
Renamed type-name so as to comply to new standards