1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/scala/reading/models/FilterFactory.scala b/src/main/scala/reading/models/FilterFactory.scala
index d900af5..d8d7151 100644
--- a/src/main/scala/reading/models/FilterFactory.scala
+++ b/src/main/scala/reading/models/FilterFactory.scala
@@ -15,10 +15,10 @@ object FilterFactory {
       }
   }
 
-  implicit object GroupedTheme extends FilterFactory[GroupedTheme] {
+  implicit object GroupedThemeFilter extends FilterFactory[GroupedTheme] {
     def create(groupedTheme: GroupedTheme): Filter =
       new Filter {
-        def filter(book: Book): Boolean = book.themes.map(Theme.grouped).contains(groupedTheme)
+        def filter(book: Book): Boolean = book.themes.map(GroupedTheme.from).contains(groupedTheme)
         val kind: FilterKind = FilterKind.GroupedTheme
         val nonFormattedName: String = groupedTheme.toString()
         val name: String = groupedTheme.prettyPrint()
@@ -58,7 +58,7 @@ object FilterFactory {
   implicit object GradeFilter extends FilterFactory[Grade] {
     def create(grade: Grade): Filter =
       new Filter {
-        def filter(book: Book): Boolean = book.programs.map(Program.grade).contains(grade)
+        def filter(book: Book): Boolean = book.programs.map(Grade.from).contains(grade)
         val kind: FilterKind = FilterKind.Grade
         val nonFormattedName: String = grade.toString()
         val name: String = grade.prettyPrint()