diff --git a/pkg/model/mapfix.go b/pkg/model/mapfix.go
index a64c71e..b2b4b92 100644
--- a/pkg/model/mapfix.go
+++ b/pkg/model/mapfix.go
@@ -13,7 +13,7 @@ const (
 	MapfixStatusUploading  MapfixStatus = 6
 	MapfixStatusValidated  MapfixStatus = 5
 	MapfixStatusValidating MapfixStatus = 4
-	MapfixStatusAccepted   MapfixStatus = 3 // pending script review, can re-trigger validation
+	MapfixStatusAcceptedUnvalidated   MapfixStatus = 3 // pending script review, can re-trigger validation
 
 	// Phase: Creation
 	MapfixStatusChangesRequested  MapfixStatus = 2
diff --git a/pkg/service/mapfixes.go b/pkg/service/mapfixes.go
index 903b3d8..b9d5b78 100644
--- a/pkg/service/mapfixes.go
+++ b/pkg/service/mapfixes.go
@@ -25,7 +25,7 @@ var(
 		model.MapfixStatusUploading,
 		model.MapfixStatusValidated,
 		model.MapfixStatusValidating,
-		model.MapfixStatusAccepted,
+		model.MapfixStatusAcceptedUnvalidated,
 	}
 	// Allow 5 mapfixes every 10 minutes
 	CreateMapfixRateLimit int64 = 5
@@ -326,7 +326,7 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params api.A
 	// transaction
 	smap := datastore.Optional()
 	smap.Add("status_id", model.MapfixStatusChangesRequested)
-	return svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidated, model.MapfixStatusAccepted, model.MapfixStatusSubmitted}, smap)
+	return svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidated, model.MapfixStatusAcceptedUnvalidated, model.MapfixStatusSubmitted}, smap)
 }
 
 // ActionMapfixRevoke invokes actionMapfixRevoke operation.
@@ -580,7 +580,7 @@ func (svc *Service) ActionMapfixRetryValidate(ctx context.Context, params api.Ac
 	// transaction
 	smap := datastore.Optional()
 	smap.Add("status_id", model.MapfixStatusValidating)
-	mapfix, err := svc.DB.Mapfixes().IfStatusThenUpdateAndGet(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusAccepted}, smap)
+	mapfix, err := svc.DB.Mapfixes().IfStatusThenUpdateAndGet(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusAcceptedUnvalidated}, smap)
 	if err != nil {
 		return err
 	}
@@ -639,7 +639,7 @@ func (svc *Service) ActionMapfixAccepted(ctx context.Context, params api.ActionM
 
 	// transaction
 	smap := datastore.Optional()
-	smap.Add("status_id", model.MapfixStatusAccepted)
+	smap.Add("status_id", model.MapfixStatusAcceptedUnvalidated)
 	smap.Add("status_message", "Manually forced reset")
 	return svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, smap)
 }
diff --git a/pkg/service_internal/mapfixes.go b/pkg/service_internal/mapfixes.go
index 1897398..b3e428f 100644
--- a/pkg/service_internal/mapfixes.go
+++ b/pkg/service_internal/mapfixes.go
@@ -16,7 +16,7 @@ var(
 		model.MapfixStatusUploading,
 		model.MapfixStatusValidated,
 		model.MapfixStatusValidating,
-		model.MapfixStatusAccepted,
+		model.MapfixStatusAcceptedUnvalidated,
 		model.MapfixStatusChangesRequested,
 		model.MapfixStatusSubmitted,
 		model.MapfixStatusUnderConstruction,
@@ -63,7 +63,7 @@ func (svc *Service) ActionMapfixValidated(ctx context.Context, params internal.A
 func (svc *Service) ActionMapfixAccepted(ctx context.Context, params internal.ActionMapfixAcceptedParams) error {
 	// transaction
 	smap := datastore.Optional()
-	smap.Add("status_id", model.MapfixStatusAccepted)
+	smap.Add("status_id", model.MapfixStatusAcceptedUnvalidated)
 	smap.Add("status_message", params.StatusMessage)
 	return svc.DB.Mapfixes().IfStatusThenUpdate(ctx, params.MapfixID, []model.MapfixStatus{model.MapfixStatusValidating}, smap)
 }