Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql
===================================================================
diff -u -r92c99376daee71036fa992b005fe0732e037ed82 -rc80248239e2a54d87d50538c04ea8e80004c92d8
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql	(.../Migration_5_17.1.sql)	(revision 92c99376daee71036fa992b005fe0732e037ed82)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_5_17.1.sql	(.../Migration_5_17.1.sql)	(revision c80248239e2a54d87d50538c04ea8e80004c92d8)
@@ -32,7 +32,9 @@
 SELECT
 	[DikeProfileEntityId],
 	[FailureMechanismEntityId],
-	CASE WHEN Suffix THEN [Name] || '(' || Suffix || ')' ELSE [Name] END as [Id],
+	CASE WHEN Suffix THEN [Name] || 
+	SUBSTR(QUOTE(ZEROBLOB((SuffixPreLength + 1) / 2)), 3, SuffixPreLength)
+	|| Suffix ELSE [Name] END as [Id],
 	CASE WHEN Suffix THEN [Name] || '(' || Suffix || ')' ELSE [Name] END as [Name],
 	[Orientation],
 	[BreakWaterType],
@@ -44,12 +46,13 @@
 	[Y],
 	[X0],
 	[Order]
-	FROM (SELECT *, (SELECT count(*)
+	FROM (SELECT *, MaxLength - LENGTH(NAME) as SuffixPreLength, (SELECT count(*)
                      FROM [SOURCEPROJECT].DikeProfileEntity
                      WHERE DP.DikeProfileEntityId > DikeProfileEntityId
                      AND DP.Name IS Name
                      AND DP.FailuremechanismEntityId = FailuremechanismEntityId) as Suffix
-	FROM [SOURCEPROJECT].DikeProfileEntity DP);
+	FROM [SOURCEPROJECT].DikeProfileEntity DP
+	JOIN (SELECT MAX(LENGTH(Name)) as MaxLength FROM [SOURCEPROJECT].DikeProfileEntity));
 INSERT INTO DuneErosionSectionResultEntity SELECT * FROM [SOURCEPROJECT].DuneErosionSectionResultEntity;
 INSERT INTO FailureMechanismEntity SELECT * FROM [SOURCEPROJECT].FailureMechanismEntity;
 INSERT INTO FailureMechanismSectionEntity SELECT * FROM [SOURCEPROJECT].FailureMechanismSectionEntity;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rc80248239e2a54d87d50538c04ea8e80004c92d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs	(.../MigrationTo171IntegrationTest.cs)	(revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo171IntegrationTest.cs	(.../MigrationTo171IntegrationTest.cs)	(revision c80248239e2a54d87d50538c04ea8e80004c92d8)
@@ -157,9 +157,8 @@
         private static void AssertDikeProfiles(MigratedDatabaseReader reader)
         {
             const string validateDikeProfiles =
-                "SELECT " +
-                "(SELECT COUNT(DISTINCT(Name)) = COUNT() FROM DikeProfileEntity) " +
-                "AND (SELECT COUNT() = 0 FROM DikeProfileEntity WHERE Id != Name);";
+                "SELECT COUNT(DISTINCT(Name)) = COUNT() " +
+                "AND COUNT(DISTINCT(Id)) = COUNT() FROM DikeProfileEntity";
             reader.AssertReturnedDataIsValid(validateDikeProfiles);
         }