diff --git a/lib/XMonad/Internal/DBus/Brightness/Common.hs b/lib/XMonad/Internal/DBus/Brightness/Common.hs
index ff2d2fc..04e133e 100644
--- a/lib/XMonad/Internal/DBus/Brightness/Common.hs
+++ b/lib/XMonad/Internal/DBus/Brightness/Common.hs
@@ -129,9 +129,10 @@ emitBrightness BrightnessConfig{ bcPath = p, bcInterface = i } client cur =
     sig = signal p i memCur
 
 callBacklight :: Maybe Client -> BrightnessConfig a b -> String -> MemberName -> FeatureIO
-callBacklight client BrightnessConfig { bcPath = p, bcInterface = i, bcName = n } controlName m =
-  (featureEndpoint xmonadBusName p i m client)
-  { ftrName = unwords [n, controlName] }
+callBacklight client BrightnessConfig { bcPath = p
+                                      , bcInterface = i
+                                      , bcName = n } controlName m =
+  featureEndpoint (unwords [n, controlName]) xmonadBusName p i m client
 
 bodyGetBrightness :: Num a => [Variant] -> Maybe a
 bodyGetBrightness [b] = fromIntegral <$> (fromVariant b :: Maybe Int32)
diff --git a/lib/XMonad/Internal/DBus/Screensaver.hs b/lib/XMonad/Internal/DBus/Screensaver.hs
index 8598cfa..4a7e900 100644
--- a/lib/XMonad/Internal/DBus/Screensaver.hs
+++ b/lib/XMonad/Internal/DBus/Screensaver.hs
@@ -121,9 +121,8 @@ exportScreensaver client = Feature
       }
 
 callToggle :: Maybe Client -> FeatureIO
-callToggle client =
-  (featureEndpoint xmonadBusName ssPath interface memToggle client)
-  { ftrName = "screensaver toggle" }
+callToggle =
+  featureEndpoint "screensaver toggle" xmonadBusName ssPath interface memToggle
 
 callQuery :: Client -> IO (Maybe SSState)
 callQuery client = do
diff --git a/lib/XMonad/Internal/Dependency.hs b/lib/XMonad/Internal/Dependency.hs
index 80a24b6..a78ceae 100644
--- a/lib/XMonad/Internal/Dependency.hs
+++ b/lib/XMonad/Internal/Dependency.hs
@@ -105,11 +105,11 @@ featureExeArgs :: MonadIO m => String -> String -> [String] -> Feature (m ())
 featureExeArgs n cmd args =
   featureDefault n [Executable cmd] $ spawnCmd cmd args
 
-featureEndpoint :: BusName -> ObjectPath -> InterfaceName -> MemberName
+featureEndpoint :: String -> BusName -> ObjectPath -> InterfaceName -> MemberName
   -> Maybe Client -> FeatureIO
-featureEndpoint busname path iface mem client = Feature
+featureEndpoint name busname path iface mem client = Feature
   { ftrDepTree = DBusTree (Single cmd) client deps []
-  , ftrName = "screensaver toggle"
+  , ftrName = name
   , ftrWarning = Default
   }
   where