diff --git a/Sources/TermKitBackend/Button/ButtonCollection.swift b/Sources/TermKitBackend/Button/ButtonCollection.swift
index efd0d19..5d6ba80 100644
--- a/Sources/TermKitBackend/Button/ButtonCollection.swift
+++ b/Sources/TermKitBackend/Button/ButtonCollection.swift
@@ -8,7 +8,7 @@
 import TermKit
 
 /// A collection of buttons.
-public struct ButtonCollection: ButtonContext.Widget, Wrapper {
+public struct ButtonCollection: ButtonWidget, Wrapper {
 
     /// The content of the collection.
     var content: Body
diff --git a/Sources/TermKitBackend/Button/ButtonContext.swift b/Sources/TermKitBackend/Button/ButtonContext.swift
index a47846c..9b1cc61 100644
--- a/Sources/TermKitBackend/Button/ButtonContext.swift
+++ b/Sources/TermKitBackend/Button/ButtonContext.swift
@@ -11,11 +11,11 @@ import TermKit
 public enum ButtonContext: ViewRenderData {
 
     /// The type of the widgets.
-    public typealias WidgetType = Widget
+    public typealias WidgetType = ButtonWidget
     /// The wrapper type.
     public typealias WrapperType = ButtonCollection
 
-    /// The type of the widgets.
-    public protocol Widget: Meta.Widget { }
-
 }
+
+/// The type of the widgets.
+public protocol ButtonWidget: Meta.Widget { }
diff --git a/Sources/TermKitBackend/Menu/Menu.swift b/Sources/TermKitBackend/Menu/Menu.swift
index 3ce2cb9..2e52d04 100644
--- a/Sources/TermKitBackend/Menu/Menu.swift
+++ b/Sources/TermKitBackend/Menu/Menu.swift
@@ -8,7 +8,7 @@
 import TermKit
 
 /// A menu is an item of a `MenuBar`.
-public struct Menu: MenuContext.Widget {
+public struct Menu: MenuWidget {
 
     /// The menu's label, displayed in the menu bar.
     var label: String
diff --git a/Sources/TermKitBackend/Menu/MenuCollection.swift b/Sources/TermKitBackend/Menu/MenuCollection.swift
index 1c65d01..b29f379 100644
--- a/Sources/TermKitBackend/Menu/MenuCollection.swift
+++ b/Sources/TermKitBackend/Menu/MenuCollection.swift
@@ -8,7 +8,7 @@
 import TermKit
 
 /// A collection of menus.
-public struct MenuCollection: MenuContext.Widget, Wrapper {
+public struct MenuCollection: MenuWidget, Wrapper {
 
     /// The content of the collection.
     var content: Body
diff --git a/Sources/TermKitBackend/Menu/MenuContext.swift b/Sources/TermKitBackend/Menu/MenuContext.swift
index b86875e..4ae0aea 100644
--- a/Sources/TermKitBackend/Menu/MenuContext.swift
+++ b/Sources/TermKitBackend/Menu/MenuContext.swift
@@ -11,11 +11,11 @@ import TermKit
 public enum MenuContext: ViewRenderData {
 
     /// The type of the widgets.
-    public typealias WidgetType = Widget
+    public typealias WidgetType = MenuWidget
     /// The wrapper type.
     public typealias WrapperType = MenuCollection
 
-    /// The type of the widgets.
-    public protocol Widget: Meta.Widget { }
-
 }
+
+/// The type of the widgets.
+public protocol MenuWidget: Meta.Widget { }
diff --git a/Sources/TermKitBackend/View/Button.swift b/Sources/TermKitBackend/View/Button.swift
index 265f871..17cc77c 100644
--- a/Sources/TermKitBackend/View/Button.swift
+++ b/Sources/TermKitBackend/View/Button.swift
@@ -8,7 +8,7 @@
 import TermKit
 
 /// A simple button widget.
-public struct Button: TermKitWidget, ButtonContext.Widget, MenuContext.Widget {
+public struct Button: TermKitWidget, ButtonWidget, MenuWidget {
 
     /// The button's label.
     var label: String