diff --git a/client/application.h b/client/application.h
index 74efed4d..36ae86e8 100644
--- a/client/application.h
+++ b/client/application.h
@@ -140,7 +140,7 @@ typedef std::list<GUIBarrier*> GUIBarriers;
 
 class Application : public ProcessLoop,
                     public Platform::EventListener,
-                    public Platform::DisplayModeListner,
+                    public Platform::DisplayModeListener,
                     public CommandTarget {
 public:
 
diff --git a/client/platform.h b/client/platform.h
index 58cd34b3..d2fdd484 100644
--- a/client/platform.h
+++ b/client/platform.h
@@ -115,8 +115,8 @@ public:
     class EventListener;
     static void set_event_listener(EventListener* listener);
 
-    class DisplayModeListner;
-    static void set_display_mode_listner(DisplayModeListner* listener);
+    class DisplayModeListener;
+    static void set_display_mode_listner(DisplayModeListener* listener);
 };
 
 class Platform::EventListener {
@@ -137,9 +137,9 @@ public:
     virtual void push_frame(uint8_t *frame) = 0;
 };
 
-class Platform::DisplayModeListner {
+class Platform::DisplayModeListener {
 public:
-    virtual ~DisplayModeListner() {}
+    virtual ~DisplayModeListener() {}
     virtual void on_display_mode_change() = 0;
 };
 
diff --git a/client/windows/platform.cpp b/client/windows/platform.cpp
index 1e05fe10..81eb787c 100644
--- a/client/windows/platform.cpp
+++ b/client/windows/platform.cpp
@@ -698,7 +698,7 @@ LocalCursor* Platform::create_default_cursor()
     return new WinDefaultCursor();
 }
 
-void Platform::set_display_mode_listner(DisplayModeListner* listener)
+void Platform::set_display_mode_listner(DisplayModeListener* listener)
 {
 }
 
diff --git a/client/x11/platform.cpp b/client/x11/platform.cpp
index 8fe1f726..af5a65ef 100644
--- a/client/x11/platform.cpp
+++ b/client/x11/platform.cpp
@@ -105,13 +105,13 @@ public:
 static DefaultEventListener default_event_listener;
 static Platform::EventListener* event_listener = &default_event_listener;
 
-class DefaultDisplayModeListner: public Platform::DisplayModeListner {
+class DefaultDisplayModeListener: public Platform::DisplayModeListener {
 public:
     void on_display_mode_change() {}
 };
 
-static DefaultDisplayModeListner default_display_mode_listener;
-static Platform::DisplayModeListner* display_mode_listener = &default_display_mode_listener;
+static DefaultDisplayModeListener default_display_mode_listener;
+static Platform::DisplayModeListener* display_mode_listener = &default_display_mode_listener;
 
 
 NamedPipe::ListenerRef NamedPipe::create(const char *name, ListenerInterface& listener_interface)
@@ -449,7 +449,7 @@ void Platform::set_event_listener(EventListener* listener)
     event_listener = listener ? listener : &default_event_listener;
 }
 
-void Platform::set_display_mode_listner(DisplayModeListner* listener)
+void Platform::set_display_mode_listner(DisplayModeListener* listener)
 {
     display_mode_listener = listener ? listener : &default_display_mode_listener;
 }