diff --git a/biscuit/apps/alsijil/models.py b/biscuit/apps/alsijil/models.py
index 4e8f68f029ab8361a7d638e0eb504d07390279d4..f34966454ebec05c21a87df3b9f9e5c92bbcd848 100644
--- a/biscuit/apps/alsijil/models.py
+++ b/biscuit/apps/alsijil/models.py
@@ -47,11 +47,12 @@ class LessonDocumentation(SchoolRelated):
 class PersonalNoteFilter(SchoolRelated):
     """ A filter definition that can generate statistics on personal note texts. """
 
-    short_name = models.CharField(verbose_name=_('Short name'), max_length=30)
+    identifier = models.CharField(verbose_name=_('Identifier'), max_length=30,
+                                  validators=[lambda v: v.isidentifier()])
     description = models.CharField(verbose_name=_('Description'), max_length=60, blank=True)
 
     regex = models.CharField(verbose_name=_('Match expression'), max_length=100)
 
     class Meta:
-        unique_together = [['school', 'short_name'], ['school', 'description'], ['school', 'regex']]
+        unique_together = [['school', 'identifier'], ['school', 'description'], ['school', 'regex']]
         ordering = ['short_name']