diff --git a/src/cascadia/TerminalApp/ScratchpadContent.cpp b/src/cascadia/TerminalApp/ScratchpadContent.cpp
index 86372612a24..fdab6bf9d02 100644
--- a/src/cascadia/TerminalApp/ScratchpadContent.cpp
+++ b/src/cascadia/TerminalApp/ScratchpadContent.cpp
@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "ScratchpadContent.h"
-#include "PaneArgs.h"
 #include "ScratchpadContent.g.cpp"
 
 using namespace winrt::Windows::Foundation;
@@ -37,7 +36,7 @@ namespace winrt::TerminalApp::implementation
     {
         return _root;
     }
-    winrt::Windows::Foundation::Size ScratchpadContent::MinSize()
+    winrt::Windows::Foundation::Size ScratchpadContent::MinimumSize()
     {
         return { 1, 1 };
     }
diff --git a/src/cascadia/TerminalApp/ScratchpadContent.h b/src/cascadia/TerminalApp/ScratchpadContent.h
index c2c07fab8ad..d6edf3784d8 100644
--- a/src/cascadia/TerminalApp/ScratchpadContent.h
+++ b/src/cascadia/TerminalApp/ScratchpadContent.h
@@ -14,7 +14,8 @@ namespace winrt::TerminalApp::implementation
 
         void UpdateSettings(const winrt::Microsoft::Terminal::Settings::Model::CascadiaSettings& settings);
 
-        winrt::Windows::Foundation::Size MinSize();
+        winrt::Windows::Foundation::Size MinimumSize();
+
         void Focus(winrt::Windows::UI::Xaml::FocusState reason = winrt::Windows::UI::Xaml::FocusState::Programmatic);
         void Close();
         winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs GetNewTerminalArgs(const bool asContent) const;
@@ -27,14 +28,14 @@ namespace winrt::TerminalApp::implementation
         Windows::Foundation::IReference<winrt::Windows::UI::Color> TabColor() const noexcept { return nullptr; }
         winrt::Windows::UI::Xaml::Media::Brush BackgroundBrush();
 
-        til::typed_event<> CloseRequested;
-        til::typed_event<winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::BellEventArgs> BellRequested;
-        til::typed_event<> TitleChanged;
-        til::typed_event<> TabColorChanged;
-        til::typed_event<> TaskbarProgressChanged;
         til::typed_event<> ConnectionStateChanged;
-        til::typed_event<> ReadOnlyChanged;
-        til::typed_event<> FocusRequested;
+        til::typed_event<IPaneContent> CloseRequested;
+        til::typed_event<IPaneContent, winrt::TerminalApp::BellEventArgs> BellRequested;
+        til::typed_event<IPaneContent> TitleChanged;
+        til::typed_event<IPaneContent> TabColorChanged;
+        til::typed_event<IPaneContent> TaskbarProgressChanged;
+        til::typed_event<IPaneContent> ReadOnlyChanged;
+        til::typed_event<IPaneContent> FocusRequested;
 
     private:
         winrt::Windows::UI::Xaml::Controls::Grid _root{ nullptr };
diff --git a/src/cascadia/TerminalApp/SettingsPaneContent.cpp b/src/cascadia/TerminalApp/SettingsPaneContent.cpp
index 549ecf8629d..5b16b6ae28f 100644
--- a/src/cascadia/TerminalApp/SettingsPaneContent.cpp
+++ b/src/cascadia/TerminalApp/SettingsPaneContent.cpp
@@ -3,7 +3,6 @@
 
 #include "pch.h"
 #include "SettingsPaneContent.h"
-#include "PaneArgs.h"
 #include "SettingsPaneContent.g.cpp"
 #include "Utils.h"
 
@@ -36,7 +35,7 @@ namespace winrt::TerminalApp::implementation
     {
         return _sui;
     }
-    winrt::Windows::Foundation::Size SettingsPaneContent::MinSize()
+    winrt::Windows::Foundation::Size SettingsPaneContent::MinimumSize()
     {
         return { 1, 1 };
     }
diff --git a/src/cascadia/TerminalApp/SettingsPaneContent.h b/src/cascadia/TerminalApp/SettingsPaneContent.h
index f989ed15045..19fb5b8439d 100644
--- a/src/cascadia/TerminalApp/SettingsPaneContent.h
+++ b/src/cascadia/TerminalApp/SettingsPaneContent.h
@@ -16,7 +16,7 @@ namespace winrt::TerminalApp::implementation
         winrt::Windows::UI::Xaml::FrameworkElement GetRoot();
         winrt::Microsoft::Terminal::Settings::Editor::MainPage SettingsUI() { return _sui; }
 
-        winrt::Windows::Foundation::Size MinSize();
+        winrt::Windows::Foundation::Size MinimumSize();
         void Focus(winrt::Windows::UI::Xaml::FocusState reason = winrt::Windows::UI::Xaml::FocusState::Programmatic);
         void Close();
         winrt::Microsoft::Terminal::Settings::Model::NewTerminalArgs GetNewTerminalArgs(const bool asContent) const;
@@ -29,14 +29,14 @@ namespace winrt::TerminalApp::implementation
         Windows::Foundation::IReference<winrt::Windows::UI::Color> TabColor() const noexcept;
         winrt::Windows::UI::Xaml::Media::Brush BackgroundBrush();
 
-        til::typed_event<> CloseRequested;
-        til::typed_event<winrt::Windows::Foundation::IInspectable, winrt::TerminalApp::BellEventArgs> BellRequested;
-        til::typed_event<> TitleChanged;
-        til::typed_event<> TabColorChanged;
-        til::typed_event<> TaskbarProgressChanged;
         til::typed_event<> ConnectionStateChanged;
-        til::typed_event<> ReadOnlyChanged;
-        til::typed_event<> FocusRequested;
+        til::typed_event<IPaneContent> CloseRequested;
+        til::typed_event<IPaneContent, winrt::TerminalApp::BellEventArgs> BellRequested;
+        til::typed_event<IPaneContent> TitleChanged;
+        til::typed_event<IPaneContent> TabColorChanged;
+        til::typed_event<IPaneContent> TaskbarProgressChanged;
+        til::typed_event<IPaneContent> ReadOnlyChanged;
+        til::typed_event<IPaneContent> FocusRequested;
 
     private:
         winrt::Microsoft::Terminal::Settings::Editor::MainPage _sui{ nullptr };