diff --git a/activate_linux/shell.qml b/activate_linux/shell.qml
index b025e06..70d85a9 100644
--- a/activate_linux/shell.qml
+++ b/activate_linux/shell.qml
@@ -31,7 +31,7 @@ ShellRoot {
 
 			// Use the wlroots specific layer property to ensure it displays over
 			// fullscreen windows.
-			WlrLayershell.layer: Layer.Overlay
+			WlrLayershell.layer: WlrLayer.Overlay
 
 			ColumnLayout {
 				id: content
diff --git a/lockscreen/shell.qml b/lockscreen/shell.qml
index 2a36ac8..c873c68 100644
--- a/lockscreen/shell.qml
+++ b/lockscreen/shell.qml
@@ -9,7 +9,7 @@ ShellRoot {
 		onUnlocked: lock.locked = false
 	}
 
-	SessionLock {
+	WlSessionLock {
 		id: lock
 		locked: true
 
@@ -17,7 +17,7 @@ ShellRoot {
 			if (!locked) Qt.quit();
 		}
 
-		SessionLockSurface {
+		WlSessionLockSurface {
 			// You probably want to replace this with an image.
 			color: "#303030"
 
diff --git a/wlogout/WlButton.qml b/wlogout/LogoutButton.qml
similarity index 100%
rename from wlogout/WlButton.qml
rename to wlogout/LogoutButton.qml
diff --git a/wlogout/WLogout.qml b/wlogout/WLogout.qml
index 8965882..ffabf11 100644
--- a/wlogout/WLogout.qml
+++ b/wlogout/WLogout.qml
@@ -9,15 +9,15 @@ Variants {
 	property color backgroundColor: "#e60c0c0c"
 	property color buttonColor: "#1e1e1e"
 	property color buttonHoverColor: "#3700b3"
-	default property list<WlButton> buttons
+	default property list<LogoutButton> buttons
 
 	variants: Quickshell.screens.map(screen => ({ screen }))
 	PanelWindow {
 		id: w
 
 		exclusionMode: ExclusionMode.Ignore
-		WlrLayershell.layer: Layer.Overlay
-		WlrLayershell.keyboardFocus: KeyboardFocus.Exclusive
+		WlrLayershell.layer: WlrLayer.Overlay
+		WlrLayershell.keyboardFocus: WlrKeyboardFocus.Exclusive
 
 		color: "transparent"
 
@@ -62,7 +62,7 @@ Variants {
 					Repeater {
 						model: buttons
 						delegate: Rectangle {
-							required property WlButton modelData;
+							required property LogoutButton modelData;
 
 							Layout.fillWidth: true
 							Layout.fillHeight: true
diff --git a/wlogout/shell.qml b/wlogout/shell.qml
index f406d02..777b3ab 100644
--- a/wlogout/shell.qml
+++ b/wlogout/shell.qml
@@ -3,42 +3,42 @@ import Quickshell
 
 ShellRoot {
 	WLogout {
-		WlButton {
+		LogoutButton {
 			command: "loginctl lock-screen"
 			keybind: Qt.Key_K
 			text: "Lock"
 			icon: "lock"
 		}
 
-		WlButton {
+		LogoutButton {
 			command: "loginctl terminate-user $USER"
 			keybind: Qt.Key_E
 			text: "Logout"
 			icon: "logout"
 		}
 
-		WlButton {
+		LogoutButton {
 			command: "systemctl suspend"
 			keybind: Qt.Key_U
 			text: "Suspend"
 			icon: "suspend"
 		}
 
-		WlButton {
+		LogoutButton {
 			command: "systemctl hibernate"
 			keybind: Qt.Key_H
 			text: "Hibernate"
 			icon: "hibernate"
 		}
 
-		WlButton {
+		LogoutButton {
 			command: "systemctl poweroff"
 			keybind: Qt.Key_K
 			text: "Shutdown"
 			icon: "shutdown"
 		}
 
-		WlButton {
+		LogoutButton {
 			command: "systemctl reboot"
 			keybind: Qt.Key_R
 			text: "Reboot"