diff --git a/api/message.go b/api/message.go
index 3fda79c..ad3d726 100644
--- a/api/message.go
+++ b/api/message.go
@@ -42,7 +42,7 @@ func (a *MessageAPI) GetMessages(ctx *gin.Context) {
 
 // GetMessagesWithApplication returns all messages from a specific application.
 func (a *MessageAPI) GetMessagesWithApplication(ctx *gin.Context) {
-	withID(ctx, "appid", func(id uint) {
+	withID(ctx, "id", func(id uint) {
 		if app := a.DB.GetApplicationByID(id); app != nil && app.UserID == auth.GetUserID(ctx) {
 			messages := a.DB.GetMessagesByApplication(id)
 			ctx.JSON(200, messages)
@@ -60,7 +60,7 @@ func (a *MessageAPI) DeleteMessages(ctx *gin.Context) {
 
 // DeleteMessageWithApplication deletes all messages from a specific application.
 func (a *MessageAPI) DeleteMessageWithApplication(ctx *gin.Context) {
-	withID(ctx, "appid", func(id uint) {
+	withID(ctx, "id", func(id uint) {
 		if application := a.DB.GetApplicationByID(id); application != nil && application.UserID == auth.GetUserID(ctx) {
 			a.DB.DeleteMessagesByApplication(id)
 		} else {
diff --git a/api/message_test.go b/api/message_test.go
index 556b597..4dac77c 100644
--- a/api/message_test.go
+++ b/api/message_test.go
@@ -61,7 +61,7 @@ func (s *MessageSuite) Test_GetMessagesWithToken() {
 	t, _ := time.Parse("2006/01/02", "2021/01/02")
 	s.db.On("GetMessagesByApplication", uint(1)).Return([]*model.Message{{ID: 2, ApplicationID: 1, Message: "hi", Title: "hi", Date: t, Priority: 4}})
 	s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token:"irrelevant", UserID: 4})
-	s.ctx.Params = gin.Params{{Key: "appid", Value: "1"}}
+	s.ctx.Params = gin.Params{{Key: "id", Value: "1"}}
 
 	s.a.GetMessagesWithApplication(s.ctx)
 
@@ -75,7 +75,7 @@ func (s *MessageSuite) Test_GetMessagesWithToken_withWrongUser_expectNotFound()
 	t, _ := time.Parse("2006/01/02", "2021/01/02")
 	s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token:"irrelevant", UserID: 2})
 	s.db.On("GetMessagesByApplication", uint(1)).Return([]*model.Message{{ID: 2, ApplicationID: 1, Message: "hi", Title: "hi", Date: t, Priority: 4}})
-	s.ctx.Params = gin.Params{{Key: "appid", Value: "1"}}
+	s.ctx.Params = gin.Params{{Key: "id", Value: "1"}}
 
 	s.a.GetMessagesWithApplication(s.ctx)
 
@@ -125,7 +125,7 @@ func (s *MessageSuite) Test_DeleteMessage() {
 
 func (s *MessageSuite) Test_DeleteMessageWithToken() {
 	auth.RegisterAuthentication(s.ctx, nil, 2, "")
-	s.ctx.Params = gin.Params{{Key: "appid", Value: "5"}}
+	s.ctx.Params = gin.Params{{Key: "id", Value: "5"}}
 	s.db.On("GetApplicationByID", uint(5)).Return(&model.Application{ID: 5, Token: "mytoken", UserID: 2})
 	s.db.On("DeleteMessagesByApplication", uint(5)).Return(nil)
 
@@ -137,7 +137,7 @@ func (s *MessageSuite) Test_DeleteMessageWithToken() {
 
 func (s *MessageSuite) Test_DeleteMessageWithToken_notExistingToken() {
 	auth.RegisterAuthentication(s.ctx, nil, 2, "")
-	s.ctx.Params = gin.Params{{Key: "appid", Value: "55"}}
+	s.ctx.Params = gin.Params{{Key: "id", Value: "55"}}
 	s.db.On("GetApplicationByID", uint(55)).Return(nil)
 	s.db.On("DeleteMessagesByApplication", mock.Anything).Return(nil)
 
@@ -149,7 +149,7 @@ func (s *MessageSuite) Test_DeleteMessageWithToken_notExistingToken() {
 
 func (s *MessageSuite) Test_DeleteMessageWithToken_notOwner() {
 	auth.RegisterAuthentication(s.ctx, nil, 4, "")
-	s.ctx.Params = gin.Params{{Key: "appid", Value: "55"}}
+	s.ctx.Params = gin.Params{{Key: "id", Value: "55"}}
 	s.db.On("GetApplicationByID", uint(55)).Return(&model.Application{ID: 55, Token: "mytoken", UserID: 2})
 	s.db.On("DeleteMessagesByApplication", uint(55)).Return(nil)