diff --git a/src/plugins/debugger/debuggerstartparameters.h b/src/plugins/debugger/debuggerstartparameters.h
index b18fcfa2ab73ae5cd5a94f540211382571a0ff36..0dfe7c8e98257af0c5d48ba5591df6af99fa9da5 100644
--- a/src/plugins/debugger/debuggerstartparameters.h
+++ b/src/plugins/debugger/debuggerstartparameters.h
@@ -55,9 +55,9 @@ public:
         CommunicationChannelUsb
     };
 
-    enum DebugClient {
-        DebugClientTrk,
-        DebugClientCoda
+    enum SymbianDebugClient {
+        SymbianDebugClientTrk,
+        SymbianDebugClientCoda
     };
 
     DebuggerStartParameters()
@@ -70,9 +70,9 @@ public:
         connParams(Utils::SshConnectionParameters::NoProxy),
         startMode(NoStartMode),
         executableUid(0),
-        communicationChannel(CommunicationChannelUsb),
+        communicationChannel(CommunicationChannelTcpIp),
         serverPort(0),
-        debugClient(DebugClientTrk)
+        debugClient(SymbianDebugClientTrk)
     {}
 
     QString executable;
@@ -122,7 +122,7 @@ public:
     CommunicationChannel communicationChannel;
     QString serverAddress;
     quint16 serverPort;
-    DebugClient debugClient;
+    SymbianDebugClient debugClient;
 };
 
 } // namespace Debugger
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index f184fe55052c43233dac3eb333a75802f50a5df9..c169856cb19dcd5551572e0277aba6c344c67419 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -1831,7 +1831,7 @@ AbstractGdbAdapter *GdbEngine::createAdapter()
     const DebuggerStartParameters &sp = startParameters();
     if (sp.toolChainAbi.os() == Abi::SymbianOS) {
         // FIXME: 1 of 3 testing hacks.
-        if (sp.debugClient == DebuggerStartParameters::DebugClientCoda)
+        if (sp.debugClient == DebuggerStartParameters::SymbianDebugClientCoda)
             return new CodaGdbAdapter(this);
         else
             return new TrkGdbAdapter(this);
diff --git a/src/plugins/debugger/qml/qmladapter.cpp b/src/plugins/debugger/qml/qmladapter.cpp
index 7d6636d2b8105512f3cc59414060a0596fa51c70..a863aa58aafc0b8107880dbefa510fdb7560ff07 100644
--- a/src/plugins/debugger/qml/qmladapter.cpp
+++ b/src/plugins/debugger/qml/qmladapter.cpp
@@ -128,7 +128,7 @@ void QmlAdapter::connectToViewer()
 
     const DebuggerStartParameters &parameters = d->m_engine.data()->startParameters();
     if (parameters.communicationChannel == DebuggerStartParameters::CommunicationChannelUsb) {
-        if (parameters.debugClient == DebuggerStartParameters::DebugClientTrk) {
+        if (parameters.debugClient == DebuggerStartParameters::SymbianDebugClientTrk) {
             d->m_connectionTimer.stop();
             showConnectionErrorMessage(tr("QML debugging is not supported when using TRK!"));
             emit connectionStartupFailed();
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
index 8c4bbffa6f3713616c476c2ee5708779ab03dfaa..45e0d8d35a46ed4420043aa70b56221a45e0109a 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60devicerunconfiguration.cpp
@@ -480,8 +480,8 @@ static Debugger::DebuggerStartParameters s60DebuggerStartParams(const S60DeviceR
                 Debugger::DebuggerStartParameters::CommunicationChannelUsb;
 
     sp.debugClient = activeDeployConf->communicationChannel() == S60DeployConfiguration::CommunicationTrkSerialConnection?
-                Debugger::DebuggerStartParameters::DebugClientTrk:
-                Debugger::DebuggerStartParameters::DebugClientCoda;
+                Debugger::DebuggerStartParameters::SymbianDebugClientTrk:
+                Debugger::DebuggerStartParameters::SymbianDebugClientCoda;
 
     QTC_ASSERT(sp.executableUid, return sp);