Renaming of classes and filters for more clarity