diff --git a/src/controller/index.ts b/src/controller/index.ts
index 3f21c9fd..f71e24c6 100644
--- a/src/controller/index.ts
+++ b/src/controller/index.ts
@@ -7,7 +7,7 @@ import { Engine, EngineImpl } from "../engine";
 import { EngineWindow } from "../engine/window";
 import { WindowState } from "../engine/window";
 
-import { DriverContext, KWinDriver } from "../driver";
+import { Driver, DriverImpl } from "../driver";
 import { DriverSurface } from "../driver/surface";
 
 import Config from "../config";
@@ -148,7 +148,7 @@ export interface Controller {
 
 export class ControllerImpl implements Controller {
   private engine: Engine;
-  private driver: DriverContext;
+  private driver: Driver;
   public constructor(
     qmlObjects: Bismuth.Qml.Main,
     kwinApi: KWin.Api,
@@ -156,7 +156,7 @@ export class ControllerImpl implements Controller {
     private log: Log
   ) {
     this.engine = new EngineImpl(this, config, log);
-    this.driver = new KWinDriver(qmlObjects, kwinApi, this, config, log);
+    this.driver = new DriverImpl(qmlObjects, kwinApi, this, config, log);
   }
 
   /**
diff --git a/src/driver/index.ts b/src/driver/index.ts
index 033643b8..321ef135 100644
--- a/src/driver/index.ts
+++ b/src/driver/index.ts
@@ -17,7 +17,7 @@ import { WindowState } from "../engine/window";
 import Config from "../config";
 import { Log } from "../util/log";
 
-export interface DriverContext {
+export interface Driver {
   readonly screens: DriverSurface[];
 
   currentSurface: DriverSurface;
@@ -37,7 +37,7 @@ export interface DriverContext {
  * signals (Qt/KDE term for binding events), and providing specific utility
  * functions.
  */
-export class KWinDriver implements DriverContext {
+export class DriverImpl implements Driver {
   public get currentSurface(): DriverSurface {
     return new DriverSurfaceImpl(
       this.kwinApi.workspace.activeClient