diff --git a/src/plugins/debugger/cdb2/bytearrayinputstream.cpp b/src/plugins/debugger/cdb/bytearrayinputstream.cpp
similarity index 100%
rename from src/plugins/debugger/cdb2/bytearrayinputstream.cpp
rename to src/plugins/debugger/cdb/bytearrayinputstream.cpp
diff --git a/src/plugins/debugger/cdb2/bytearrayinputstream.h b/src/plugins/debugger/cdb/bytearrayinputstream.h
similarity index 100%
rename from src/plugins/debugger/cdb2/bytearrayinputstream.h
rename to src/plugins/debugger/cdb/bytearrayinputstream.h
diff --git a/src/plugins/debugger/cdb/cdb.pri b/src/plugins/debugger/cdb/cdb.pri
new file mode 100644
index 00000000000..2801ddd0968
--- /dev/null
+++ b/src/plugins/debugger/cdb/cdb.pri
@@ -0,0 +1,16 @@
+HEADERS += $$PWD/cdbengine.h \
+    cdb/bytearrayinputstream.h \
+    cdb/cdbparsehelpers.h \
+    cdb/cdboptions.h \
+    cdb/cdboptionspage.h
+
+SOURCES += $$PWD/cdbengine.cpp \
+    cdb/bytearrayinputstream.cpp \
+    cdb/cdbparsehelpers.cpp \
+    cdb/cdboptions.cpp \
+    cdb/cdboptionspage.cpp
+
+FORMS += cdb/cdboptionspagewidget.ui
+
+INCLUDEPATH*=$$PWD
+DEPENDPATH*=$$PWD
diff --git a/src/plugins/debugger/cdb2/cdbengine2.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
similarity index 99%
rename from src/plugins/debugger/cdb2/cdbengine2.cpp
rename to src/plugins/debugger/cdb/cdbengine.cpp
index 10ffb83f4bb..60c5da7ed18 100644
--- a/src/plugins/debugger/cdb2/cdbengine2.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -31,11 +31,11 @@
 **
 **************************************************************************/
 
-#include "cdbengine2.h"
+#include "cdbengine.h"
 #include "debuggerstartparameters.h"
 #include "disassemblerlines.h"
-#include "cdboptions2.h"
-#include "cdboptionspage2.h"
+#include "cdboptions.h"
+#include "cdboptionspage.h"
 #include "bytearrayinputstream.h"
 #include "breakpoint.h"
 #include "breakhandler.h"
diff --git a/src/plugins/debugger/cdb2/cdbengine2.h b/src/plugins/debugger/cdb/cdbengine.h
similarity index 100%
rename from src/plugins/debugger/cdb2/cdbengine2.h
rename to src/plugins/debugger/cdb/cdbengine.h
diff --git a/src/plugins/debugger/cdb2/cdboptions2.cpp b/src/plugins/debugger/cdb/cdboptions.cpp
similarity index 99%
rename from src/plugins/debugger/cdb2/cdboptions2.cpp
rename to src/plugins/debugger/cdb/cdboptions.cpp
index 1c3c226b4bc..5c45e66a117 100644
--- a/src/plugins/debugger/cdb2/cdboptions2.cpp
+++ b/src/plugins/debugger/cdb/cdboptions.cpp
@@ -31,8 +31,8 @@
 **
 **************************************************************************/
 
-#include "cdboptions2.h"
-#include "cdbengine2.h"
+#include "cdboptions.h"
+#include "cdbengine.h"
 
 #ifdef Q_OS_WIN
 #    include <utils/winutils.h>
diff --git a/src/plugins/debugger/cdb2/cdboptions2.h b/src/plugins/debugger/cdb/cdboptions.h
similarity index 100%
rename from src/plugins/debugger/cdb2/cdboptions2.h
rename to src/plugins/debugger/cdb/cdboptions.h
diff --git a/src/plugins/debugger/cdb2/cdboptionspage2.cpp b/src/plugins/debugger/cdb/cdboptionspage.cpp
similarity index 99%
rename from src/plugins/debugger/cdb2/cdboptionspage2.cpp
rename to src/plugins/debugger/cdb/cdboptionspage.cpp
index 9043b6d16c6..b5f971b76b9 100644
--- a/src/plugins/debugger/cdb2/cdboptionspage2.cpp
+++ b/src/plugins/debugger/cdb/cdboptionspage.cpp
@@ -31,10 +31,10 @@
 **
 **************************************************************************/
 
-#include "cdboptionspage2.h"
-#include "cdboptions2.h"
+#include "cdboptionspage.h"
+#include "cdboptions.h"
 #include "debuggerconstants.h"
-#include "cdbengine2.h"
+#include "cdbengine.h"
 
 #ifdef Q_OS_WIN
 #    include <utils/winutils.h>
diff --git a/src/plugins/debugger/cdb2/cdboptionspage2.h b/src/plugins/debugger/cdb/cdboptionspage.h
similarity index 97%
rename from src/plugins/debugger/cdb2/cdboptionspage2.h
rename to src/plugins/debugger/cdb/cdboptionspage.h
index e7558df0c26..76fa684ed64 100644
--- a/src/plugins/debugger/cdb2/cdboptionspage2.h
+++ b/src/plugins/debugger/cdb/cdboptionspage.h
@@ -34,10 +34,10 @@
 #ifndef CDBSETTINGSPAGE_H
 #define CDBSETTINGSPAGE_H
 
-#include "cdboptions2.h"
+#include "cdboptions.h"
 
 #include <coreplugin/dialogs/ioptionspage.h>
-#include "ui_cdboptionspagewidget2.h"
+#include "ui_cdboptionspagewidget.h"
 
 #include <QtGui/QWidget>
 #include <QtCore/QPointer>
@@ -98,7 +98,7 @@ private:
     static bool checkInstallation(const QString &executable, bool is64Bit,
                                   QString *message);
 
-    Ui::CdbOptionsPageWidget2 m_ui;
+    Ui::CdbOptionsPageWidget m_ui;
     CdbBreakEventWidget *m_breakEventWidget;
     QTimer *m_reportTimer;
 };
diff --git a/src/plugins/debugger/cdb2/cdboptionspagewidget2.ui b/src/plugins/debugger/cdb/cdboptionspagewidget.ui
similarity index 98%
rename from src/plugins/debugger/cdb2/cdboptionspagewidget2.ui
rename to src/plugins/debugger/cdb/cdboptionspagewidget.ui
index f927cbd3c2d..e4d08d7fde3 100644
--- a/src/plugins/debugger/cdb2/cdboptionspagewidget2.ui
+++ b/src/plugins/debugger/cdb/cdboptionspagewidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Debugger::Internal::CdbOptionsPageWidget2</class>
- <widget class="QWidget" name="Debugger::Cdb::CdbOptionsPageWidget2">
+ <class>Debugger::Internal::CdbOptionsPageWidget</class>
+ <widget class="QWidget" name="Debugger::Cdb::CdbOptionsPageWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/debugger/cdb2/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
similarity index 100%
rename from src/plugins/debugger/cdb2/cdbparsehelpers.cpp
rename to src/plugins/debugger/cdb/cdbparsehelpers.cpp
diff --git a/src/plugins/debugger/cdb2/cdbparsehelpers.h b/src/plugins/debugger/cdb/cdbparsehelpers.h
similarity index 100%
rename from src/plugins/debugger/cdb2/cdbparsehelpers.h
rename to src/plugins/debugger/cdb/cdbparsehelpers.h
diff --git a/src/plugins/debugger/cdb2/cdb2.pri b/src/plugins/debugger/cdb2/cdb2.pri
deleted file mode 100644
index a9e3e1cc5b9..00000000000
--- a/src/plugins/debugger/cdb2/cdb2.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-HEADERS += $$PWD/cdbengine2.h \
-    cdb2/bytearrayinputstream.h \
-    cdb2/cdbparsehelpers.h \
-    cdb2/cdboptions2.h \
-    cdb2/cdboptionspage2.h
-
-SOURCES += $$PWD/cdbengine2.cpp \
-    cdb2/bytearrayinputstream.cpp \
-    cdb2/cdbparsehelpers.cpp \
-    cdb2/cdboptions2.cpp \
-    cdb2/cdboptionspage2.cpp
-
-FORMS += cdb2/cdboptionspagewidget2.ui
-
-INCLUDEPATH*=$$PWD
-DEPENDPATH*=$$PWD
diff --git a/src/plugins/debugger/debugger.pro b/src/plugins/debugger/debugger.pro
index 9a7c7f84a34..d8e85d72dca 100644
--- a/src/plugins/debugger/debugger.pro
+++ b/src/plugins/debugger/debugger.pro
@@ -127,7 +127,7 @@ SOURCES += registerpostmortemaction.cpp
 LIBS  *= -lole32 \
     -lshell32
 }
-include(cdb2/cdb2.pri)
+include(cdb/cdb.pri)
 include(gdb/gdb.pri)
 include(script/script.pri)
 include(pdb/pdb.pri)
diff --git a/src/plugins/debugger/debuggerdialogs.cpp b/src/plugins/debugger/debuggerdialogs.cpp
index 7b49d15e8ea..9e3e149d385 100644
--- a/src/plugins/debugger/debuggerdialogs.cpp
+++ b/src/plugins/debugger/debuggerdialogs.cpp
@@ -34,7 +34,7 @@
 #include "debuggerdialogs.h"
 
 #include "debuggerconstants.h"
-#include "cdb2/cdbengine2.h"
+#include "cdb/cdbengine.h"
 
 #include "ui_attachcoredialog.h"
 #include "ui_attachexternaldialog.h"