diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
index 39a83c00c4..4b41ecf328 100644
--- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
+++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.cs
@@ -326,8 +326,8 @@ namespace Avalonia.Build.Tasks
                                         var op = i[c].Operand as MethodReference;
                                         
                                         // TODO: Throw an error
-                                        // This usually happens when same XAML resource was added twice for some weird reason
-                                        // We currently support it for dual-named default theme resource
+                                        // This usually happens when the same XAML resource was added twice for some weird reason
+                                        // We currently support it for dual-named simple theme resources
                                         if (op != null
                                             && op.Name == TrampolineName)
                                         {
diff --git a/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
index 697a94421d..1e507a91fe 100644
--- a/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
+++ b/src/Avalonia.Controls.ColorPicker/Themes/Simple/Simple.xaml
@@ -41,7 +41,7 @@
         <ResourceInclude Source="avares://Avalonia.Controls.ColorPicker/Themes/Simple/ColorSpectrum.xaml" />
 
         <!-- Controls -->
-        <!-- Note the ColorPicker and ColorView are unsupported in the default theme -->
+        <!-- Note the ColorPicker and ColorView are currently unsupported in the simple theme -->
         <!-- These controls depend on fluent styles for TabControl, Button, TextBox, etc. -->
 
       </ResourceDictionary.MergedDictionaries>
diff --git a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
index d26e90b2da..2bbf87590e 100644
--- a/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
+++ b/src/Avalonia.ReactiveUI/TransitioningContentControl.cs
@@ -57,7 +57,7 @@ namespace Avalonia.ReactiveUI
         
         /// <summary>
         /// TransitioningContentControl uses the default ContentControl 
-        /// template from Avalonia default theme.
+        /// template from Avalonia simple theme.
         /// </summary>
         Type IStyleable.StyleKey => typeof(ContentControl);
 
diff --git a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
index aed8a38d08..86ba4c6005 100644
--- a/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
+++ b/tests/Avalonia.Benchmarks/Themes/ThemeBenchmark.cs
@@ -41,7 +41,7 @@ namespace Avalonia.Benchmarks.Themes
         [Benchmark]
         [Arguments(SimpleThemeMode.Dark)]
         [Arguments(SimpleThemeMode.Light)]
-        public bool InitDefaultTheme(SimpleThemeMode mode)
+        public bool InitSimpleTheme(SimpleThemeMode mode)
         {
             UnitTestApplication.Current.Styles[0] = new SimpleTheme(new Uri("resm:Styles?assembly=Avalonia.Benchmarks"))
             {
diff --git a/tests/Avalonia.LeakTests/ControlTests.cs b/tests/Avalonia.LeakTests/ControlTests.cs
index a7474dc92e..2a77bd55fc 100644
--- a/tests/Avalonia.LeakTests/ControlTests.cs
+++ b/tests/Avalonia.LeakTests/ControlTests.cs
@@ -313,7 +313,7 @@ namespace Avalonia.LeakTests
                 var border = textBox.GetTemplateChildren().FirstOrDefault(x => x.Name == "border");
 
                 // The TextBox should have subscriptions to its Classes collection from the
-                // default theme.
+                // simple theme.
                 Assert.NotEqual(0, textBox.Classes.ListenerCount);
 
                 // Clear the content and ensure the TextBox is removed.
diff --git a/tests/Avalonia.UnitTests/TestServices.cs b/tests/Avalonia.UnitTests/TestServices.cs
index 6a211d238e..49da2794c1 100644
--- a/tests/Avalonia.UnitTests/TestServices.cs
+++ b/tests/Avalonia.UnitTests/TestServices.cs
@@ -24,7 +24,7 @@ namespace Avalonia.UnitTests
             renderInterface: new MockPlatformRenderInterface(),
             standardCursorFactory: Mock.Of<ICursorFactory>(),
             styler: new Styler(),
-            theme: () => CreateDefaultTheme(),
+            theme: () => CreateSimpleTheme(),
             threadingInterface: Mock.Of<IPlatformThreadingInterface>(x => x.CurrentThreadIsLoopThread == true),
             fontManagerImpl: new MockFontManagerImpl(),
             textShaperImpl: new MockTextShaperImpl(),
@@ -169,7 +169,7 @@ namespace Avalonia.UnitTests
                 windowImpl: windowImpl ?? WindowImpl);
         }
 
-        private static IStyle CreateDefaultTheme()
+        private static IStyle CreateSimpleTheme()
         {
             return new SimpleTheme { Mode = SimpleThemeMode.Light };
         }