diff --git a/pkg/model/nats.go b/pkg/model/nats.go
index 1da2918..60114b0 100644
--- a/pkg/model/nats.go
+++ b/pkg/model/nats.go
@@ -5,7 +5,7 @@ package model
 
 // Requests are sent from maps-service to validator
 
-type ValidateRequest struct {
+type ValidateSubmissionRequest struct {
 	// submission_id is passed back in the response message
 	SubmissionID     int64
 	ModelID          int64
@@ -14,15 +14,15 @@ type ValidateRequest struct {
 }
 
 // Create a new map
-type UploadNewRequest struct {
+type UploadSubmissionRequest struct {
 	SubmissionID int64
 	ModelID      int64
 	ModelVersion int64
 	ModelName    string
 }
 
-type UploadFixRequest struct {
-	SubmissionID  int64
+type UploadMapfixRequest struct {
+	MapfixID  int64
 	ModelID       int64
 	ModelVersion  int64
 	TargetAssetID int64
diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go
index 430e6d0..5944eff 100644
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@@ -398,7 +398,7 @@ func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params ap
 	// sentinel value because we are not using rust
 	if submission.UploadedAssetID == 0 {
 		// this is a new map
-		upload_new_request := model.UploadNewRequest{
+		upload_new_request := model.UploadSubmissionRequest{
 			SubmissionID: submission.ID,
 			ModelID:      submission.ValidatedAssetID,
 			ModelVersion: submission.ValidatedAssetVersion,
@@ -499,7 +499,7 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params
 		return err
 	}
 
-	validate_request := model.ValidateRequest{
+	validate_request := model.ValidateSubmissionRequest{
 		SubmissionID:     submission.ID,
 		ModelID:          submission.AssetID,
 		ModelVersion:     submission.AssetVersion,
@@ -549,7 +549,7 @@ func (svc *Service) ActionSubmissionRetryValidate(ctx context.Context, params ap
 		return err
 	}
 
-	validate_request := model.ValidateRequest{
+	validate_request := model.ValidateSubmissionRequest{
 		SubmissionID:     submission.ID,
 		ModelID:          submission.AssetID,
 		ModelVersion:     submission.AssetVersion,