diff --git a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
index 03433200c5..4d02f94cad 100644
--- a/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
+++ b/src/Avalonia.Visuals/Media/TextFormatting/Unicode/LineBreakEnumerator.cs
@@ -201,7 +201,7 @@ namespace Avalonia.Media.TextFormatting.Unicode
                 switch (_currentClass)
                 {
                     case LineBreakClass.MandatoryBreak:
-                    case LineBreakClass.CombiningMark:
+                    case LineBreakClass.ContingentBreak:
                     case LineBreakClass.Exclamation:
                     case LineBreakClass.LineFeed:
                     case LineBreakClass.NextLine:
diff --git a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
index 5b30992891..a90be6d519 100644
--- a/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
+++ b/tests/Avalonia.Visuals.UnitTests/Media/TextFormatting/LineBreakEnumuratorTests.cs
@@ -55,7 +55,7 @@ namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
         [Fact]
         public void ForwardTextWithOuterWhitespace()
         {
-            var lineBreaker = new LineBreakAlgorithm(" Apples Pears Bananas   ".AsMemory());
+            var lineBreaker = new LineBreakEnumerator(" Apples Pears Bananas   ".AsMemory());
             var positionsF = GetBreaks(lineBreaker);
             Assert.Equal(1, positionsF[0].PositionWrap);
             Assert.Equal(0, positionsF[0].PositionMeasure);
@@ -67,7 +67,7 @@ namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
             Assert.Equal(21, positionsF[3].PositionMeasure);
         }
 
-        private static List<LineBreak> GetBreaks(LineBreakAlgorithm lineBreaker)
+        private static List<LineBreak> GetBreaks(LineBreakEnumerator lineBreaker)
         {
             var breaks = new List<LineBreak>();
 
@@ -82,7 +82,7 @@ namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
         [Fact]
         public void ForwardTest()
         {
-            var lineBreaker = new LineBreakAlgorithm("Apples Pears Bananas".AsMemory());
+            var lineBreaker = new LineBreakEnumerator("Apples Pears Bananas".AsMemory());
 
             var positionsF = GetBreaks(lineBreaker);
             Assert.Equal(7, positionsF[0].PositionWrap);
@@ -99,7 +99,7 @@ namespace Avalonia.Visuals.UnitTests.Media.TextFormatting
         {
             var text = string.Join(null, codePoints.Select(char.ConvertFromUtf32));
 
-            var lineBreaker = new LineBreakAlgorithm(text.AsMemory());
+            var lineBreaker = new LineBreakEnumerator(text.AsMemory());
 
             var foundBreaks = new List<int>();