diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 35200b2d1e..396e4bad13 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -119,7 +119,7 @@ OMW::Engine::~Engine()
     delete mEnvironment.mSoundManager;
     delete mEnvironment.mGlobalScripts;
     delete mEnvironment.mMechanicsManager;
-    delete mEnvironment.mDialogManager;
+    delete mEnvironment.mDialogueManager;
     delete mScriptManager;
     delete mScriptContext;
 }
@@ -254,7 +254,7 @@ void OMW::Engine::go()
         mEnvironment.mWorld->getStore(), *mEnvironment.mWindowManager);
 
     // Create dialog system
-    mEnvironment.mDialogManager = new MWDialog::DialogManager (mEnvironment);
+    mEnvironment.mDialogueManager = new MWDialogue::DialogueManager (mEnvironment);
 
     // load cell
     ESM::Position pos;
diff --git a/apps/openmw/mwdialogue/dialoguemanager.cpp b/apps/openmw/mwdialogue/dialoguemanager.cpp
index d00c0aa83d..22602a3f77 100644
--- a/apps/openmw/mwdialogue/dialoguemanager.cpp
+++ b/apps/openmw/mwdialogue/dialoguemanager.cpp
@@ -5,11 +5,11 @@
 
 #include <iostream>
 
-namespace MWDialog
+namespace MWDialogue
 {
-    DialogManager::DialogManager (MWWorld::Environment& environment) : mEnvironment (environment) {}
+    DialogueManager::DialogueManager (MWWorld::Environment& environment) : mEnvironment (environment) {}
 
-    void DialogManager::startDialog (const MWWorld::Ptr& actor)
+    void DialogueManager::startDialogue (const MWWorld::Ptr& actor)
     {
         std::cout << "talking with " << MWWorld::Class::get (actor).getName (actor) << std::endl;
     }
diff --git a/apps/openmw/mwdialogue/dialoguemanager.hpp b/apps/openmw/mwdialogue/dialoguemanager.hpp
index 8f4067c9ab..b31a3d0632 100644
--- a/apps/openmw/mwdialogue/dialoguemanager.hpp
+++ b/apps/openmw/mwdialogue/dialoguemanager.hpp
@@ -1,5 +1,5 @@
-#ifndef GAME_MMDIALOG_DIALOGMANAGER_H
-#define GAME_MWDIALOG_DIALOGMANAGER_H
+#ifndef GAME_MMDIALOG_DIALOGUEMANAGER_H
+#define GAME_MWDIALOG_DIALOGUEMANAGER_H
 
 #include "../mwworld/ptr.hpp"
 
@@ -8,17 +8,17 @@ namespace MWWorld
     class Environment;
 }
 
-namespace MWDialog
+namespace MWDialogue
 {
-    class DialogManager
+    class DialogueManager
     {
             MWWorld::Environment& mEnvironment;
 
         public:
 
-            DialogManager (MWWorld::Environment& environment);
+            DialogueManager (MWWorld::Environment& environment);
 
-            void startDialog (const MWWorld::Ptr& actor);
+            void startDialogue (const MWWorld::Ptr& actor);
 
     };
 }
diff --git a/apps/openmw/mwworld/environment.hpp b/apps/openmw/mwworld/environment.hpp
index 1887e619f3..f9e2e8a42b 100644
--- a/apps/openmw/mwworld/environment.hpp
+++ b/apps/openmw/mwworld/environment.hpp
@@ -21,9 +21,9 @@ namespace MWMechanics
     class MechanicsManager;
 }
 
-namespace MWDialog
+namespace MWDialogue
 {
-    class DialogManager;
+    class DialogueManager;
 }
 
 namespace MWWorld
@@ -36,7 +36,7 @@ namespace MWWorld
     public:
         Environment()
         : mWorld (0), mSoundManager (0), mGlobalScripts (0), mWindowManager (0),
-          mMechanicsManager (0), mDialogManager (0), mFrameDuration (0)
+          mMechanicsManager (0), mDialogueManager (0), mFrameDuration (0)
         {}
 
         World *mWorld;
@@ -44,7 +44,7 @@ namespace MWWorld
         MWScript::GlobalScripts *mGlobalScripts;
         MWGui::WindowManager *mWindowManager;
         MWMechanics::MechanicsManager *mMechanicsManager;
-        MWDialog::DialogManager *mDialogManager;
+        MWDialogue::DialogueManager *mDialogueManager;
         float mFrameDuration;
     };
 }