diff --git a/aleksis/apps/alsijil/checks.py b/aleksis/apps/alsijil/checks.py
index a440f52da0888a3a97f752affd038c0fff583244..4e9128ca59a924accd3520aae054fcebb66f630a 100644
--- a/aleksis/apps/alsijil/checks.py
+++ b/aleksis/apps/alsijil/checks.py
@@ -40,8 +40,8 @@ class NoParticipationStatusesPersonalNotesInCancelledLessonsDataCheck(DataCheck)
     )
     problem_name = _("The participation status or personal note is related to a cancelled lesson.")
     solve_options = {
-        DeleteRelatedObjectSolveOption.name: DeleteRelatedObjectSolveOption,
-        IgnoreSolveOption.name: IgnoreSolveOption,
+        DeleteRelatedObjectSolveOption._class_name: DeleteRelatedObjectSolveOption,
+        IgnoreSolveOption._class_name: IgnoreSolveOption,
     }
 
     @classmethod
@@ -69,9 +69,9 @@ class NoGroupsOfPersonsSetInParticipationStatusesDataCheck(DataCheck):
     verbose_name = _("Ensure that 'groups_of_person' is set for every participation status")
     problem_name = _("The participation status has no group in 'groups_of_person'.")
     solve_options = {
-        SetGroupsWithCurrentGroupsSolveOption.name: SetGroupsWithCurrentGroupsSolveOption,
-        DeleteRelatedObjectSolveOption.name: DeleteRelatedObjectSolveOption,
-        IgnoreSolveOption.name: IgnoreSolveOption,
+        SetGroupsWithCurrentGroupsSolveOption._class_name: SetGroupsWithCurrentGroupsSolveOption,
+        DeleteRelatedObjectSolveOption._class_name: DeleteRelatedObjectSolveOption,
+        IgnoreSolveOption._class_name: IgnoreSolveOption,
     }
 
     @classmethod
@@ -92,8 +92,8 @@ class DocumentationOnHolidaysDataCheck(DataCheck):
     verbose_name = _("Ensure that there are no documentations on holidays")
     problem_name = _("The documentation is on holidays.")
     solve_options = {
-        DeleteRelatedObjectSolveOption.name: DeleteRelatedObjectSolveOption,
-        IgnoreSolveOption.name: IgnoreSolveOption,
+        DeleteRelatedObjectSolveOption._class_name: DeleteRelatedObjectSolveOption,
+        IgnoreSolveOption._class_name: IgnoreSolveOption,
     }
 
     @classmethod
@@ -126,8 +126,8 @@ class ParticipationStatusPersonalNoteOnHolidaysDataCheck(DataCheck):
     )
     problem_name = _("The participation status or personal note is on holidays.")
     solve_options = {
-        DeleteRelatedObjectSolveOption.name: DeleteRelatedObjectSolveOption,
-        IgnoreSolveOption.name: IgnoreSolveOption,
+        DeleteRelatedObjectSolveOption._class_name: DeleteRelatedObjectSolveOption,
+        IgnoreSolveOption._class_name: IgnoreSolveOption,
     }
 
     @classmethod