diff --git a/aleksis/apps/mensa/models.py b/aleksis/apps/mensa/models.py
index 8658775459d8a4a5140360e9590e107cfe3554ac..e9b8f49ea95faaec615404533791465821bb087a 100644
--- a/aleksis/apps/mensa/models.py
+++ b/aleksis/apps/mensa/models.py
@@ -1,14 +1,14 @@
 from django.db import models
 
 # Create your models here.
-from aleksis.core.util.helper import path_and_rename
+from aleksis.core.util.core_helpers import path_and_rename
 from django.utils.translation import gettext_lazy as _
 
 
 class Menu(models.Model):
     calendar_week = models.IntegerField(verbose_name=_("CW"))
     year = models.IntegerField(verbose_name=_("Year"))
-    pdf = models.FileField(upload_to=path_and_rename, verbose_name=_("PDF"))
+    pdf = models.FileField(upload_to=lambda a, b: path_and_rename(a, b, upload_to="menu"), verbose_name=_("PDF"))
 
     class Meta:
         unique_together = ("calendar_week", "year")
diff --git a/aleksis/apps/mensa/views.py b/aleksis/apps/mensa/views.py
index e615c54d9ad37f13dd2bd7e1a10f46a6fabd5921..3b257f1ab781918f086184c2bf8d25362edfbe42 100644
--- a/aleksis/apps/mensa/views.py
+++ b/aleksis/apps/mensa/views.py
@@ -10,6 +10,8 @@ from django.utils import timezone
 from .models import Menu
 from .settings import BASE_DIR
 from .forms import MenuUploadForm
+from aleksis.core.util import messages
+from django.utils.translation import gettext_lazy as _
 
 
 @login_required
@@ -20,7 +22,8 @@ def upload(request):
         if form.is_valid():
             form.save()
 
-            return redirect('menu_index_msg', msg="success")
+            messages.success(request, _("The menu was uploaded successfully."))
+            return redirect('menu_index')
     else:
         form = MenuUploadForm()
     return render(request, 'mensa/upload.html', {