diff --git a/src/intents.cs b/src/intents.cs
index e710ae2915..9513211187 100644
--- a/src/intents.cs
+++ b/src/intents.cs
@@ -76,10 +76,12 @@ namespace Intents {
 		Failure,
 		FailureRequiringAppLaunch,
 		FailureNoMatchingWorkout,
-		[NoWatch, iOS (11,0)]
-		Success,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 7, which is now defined as 'Success').")]
 		[NoWatch, iOS (11,0)]
 		HandleInApp,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 6, which is now defined as 'HandleInApp').")]
+		[NoWatch, iOS (11,0)]
+		Success,
 	}
 
 	[iOS (10, 0)]
@@ -158,10 +160,12 @@ namespace Intents {
 		Failure,
 		FailureRequiringAppLaunch,
 		FailureNoMatchingWorkout,
-		[NoWatch, iOS (11,0)]
-		Success,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 7, which is now defined as 'Success').")]
 		[NoWatch, iOS (11,0)]
 		HandleInApp,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 6, which is now defined as 'HandleInApp').")]
+		[NoWatch, iOS (11,0)]
+		Success,
 	}
 
 	[iOS (10, 0)]
@@ -348,10 +352,12 @@ namespace Intents {
 		Failure,
 		FailureRequiringAppLaunch,
 		FailureNoMatchingWorkout,
-		[NoWatch, iOS (11,0)]
-		Success,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 7, which is now defined as 'Success').")]
 		[NoWatch, iOS (11,0)]
 		HandleInApp,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 6, which is now defined as 'HandleInApp').")]
+		[NoWatch, iOS (11,0)]
+		Success,
 	}
 
 	[iOS (10, 0)]
@@ -527,10 +533,12 @@ namespace Intents {
 		Failure,
 		FailureRequiringAppLaunch,
 		FailureNoMatchingWorkout,
-		[NoWatch, iOS (11,0)]
-		Success,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 7, which is now defined as 'Success').")]
 		[NoWatch, iOS (11,0)]
 		HandleInApp,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 6, which is now defined as 'HandleInApp').")]
+		[NoWatch, iOS (11,0)]
+		Success,
 	}
 
 	[iOS (10, 0)]
@@ -824,10 +832,12 @@ namespace Intents {
 		FailureRequiringAppLaunch,
 		FailureOngoingWorkout,
 		FailureNoMatchingWorkout,
-		[Watch (4,0), iOS (11,0)]
-		Success,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 7, which is now defined as 'Success').")]
 		[Watch (4,0), iOS (11,0)]
 		HandleInApp,
+		[Advice ("The numerical value for this constant was different in iOS 11 and earlier iOS versions (it was 6, which is now defined as 'HandleInApp').")]
+		[Watch (4,0), iOS (11,0)]
+		Success,
 	}
 
 	[iOS (10, 0)]