diff --git a/src/plugins/debugger/breakhandler.cpp b/src/plugins/debugger/breakhandler.cpp
index ddcabf2e5ea38822d544eb915503caaca9c9c369..1f16f713cdb17375e00f98768f17ef9b33e7bb7a 100644
--- a/src/plugins/debugger/breakhandler.cpp
+++ b/src/plugins/debugger/breakhandler.cpp
@@ -122,8 +122,8 @@ static QString typeToString(BreakpointType type)
             return BreakHandler::tr("Watchpoint at Address");
         case WatchpointAtExpression:
             return BreakHandler::tr("Watchpoint at Expression");
-        case BreakpointOnSignalHandler:
-            return BreakHandler::tr("Breakpoint on Signal Handler");
+        case BreakpointOnQmlSignalHandler:
+            return BreakHandler::tr("Breakpoint on QML Signal Handler");
         case UnknownType:
             break;
     }
diff --git a/src/plugins/debugger/breakpoint.cpp b/src/plugins/debugger/breakpoint.cpp
index c313dd307c9957618a95e098f5d5247da1374280..6f15a5317fb64f538758890f2cfa038853d8f6b6 100644
--- a/src/plugins/debugger/breakpoint.cpp
+++ b/src/plugins/debugger/breakpoint.cpp
@@ -260,7 +260,7 @@ QString BreakpointParameters::toString() const
            << " PathUsage: " << pathUsage;
         break;
     case BreakpointByFunction:
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         ts << " FunctionName: " << functionName;
         break;
     case BreakpointByAddress:
diff --git a/src/plugins/debugger/breakpoint.h b/src/plugins/debugger/breakpoint.h
index 2e025e3262614d2be85dabcceb74775af4057930..ace4bce5bdb22657bf8e2edd833a472831fb0e24 100644
--- a/src/plugins/debugger/breakpoint.h
+++ b/src/plugins/debugger/breakpoint.h
@@ -140,7 +140,7 @@ enum BreakpointType
     BreakpointAtSysCall,
     WatchpointAtAddress,
     WatchpointAtExpression,
-    BreakpointOnSignalHandler
+    BreakpointOnQmlSignalHandler
 };
 
 //! \enum Debugger::Internal::BreakpointState
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index a62302ffbfc8fb58e738317188c218611484c785..7739491d30a8072f895f8cabaac395001c950fa3 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -122,7 +122,7 @@ BreakpointDialog::BreakpointDialog(unsigned engineCapabilities, QWidget *parent)
           << tr("Break on data access at address given by expression")
           << tr("Break on QML signal handler");
 
-    QTC_ASSERT(types.size() == BreakpointOnSignalHandler, return; )
+    QTC_ASSERT(types.size() == BreakpointOnQmlSignalHandler, return; )
     m_ui.comboBoxType->addItems(types);
     m_ui.pathChooserFileName->setExpectedKind(Utils::PathChooser::File);
     connect(m_ui.comboBoxType, SIGNAL(activated(int)), SLOT(typeChanged(int)));
@@ -360,7 +360,7 @@ void BreakpointDialog::typeChanged(int)
     case WatchpointAtExpression:
         getParts(ExpressionPart|AllConditionParts|TracePointPart, &m_savedParameters);
         break;
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         getParts(FunctionPart, &m_savedParameters);
     }
 
@@ -403,7 +403,7 @@ void BreakpointDialog::typeChanged(int)
         setPartsEnabled(ExpressionPart|AllConditionParts|TracePointPart|TracePointPart);
         clearOtherParts(ExpressionPart|AllConditionParts|TracePointPart);
         break;
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         setParts(FunctionPart, m_savedParameters);
         setPartsEnabled(FunctionPart);
         clearOtherParts(FunctionPart);
diff --git a/src/plugins/debugger/cdb/cdbengine.cpp b/src/plugins/debugger/cdb/cdbengine.cpp
index 0ac319d45d166302463c046c9406f75367a6345c..ba5c06abf527347a19bd5183bce93a3eb4b5dd9d 100644
--- a/src/plugins/debugger/cdb/cdbengine.cpp
+++ b/src/plugins/debugger/cdb/cdbengine.cpp
@@ -2552,7 +2552,7 @@ bool CdbEngine::acceptsBreakpoint(BreakpointModelId id) const
     case BreakpointAtFork:
     case WatchpointAtExpression:
     case BreakpointAtSysCall:
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         return false;
     case WatchpointAtAddress:
     case BreakpointByFileAndLine:
diff --git a/src/plugins/debugger/cdb/cdbparsehelpers.cpp b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
index 7691774590c89474280338dc8cf2d7aea9d6fed8..591323950e58e20cb1a1049795368929af68dde0 100644
--- a/src/plugins/debugger/cdb/cdbparsehelpers.cpp
+++ b/src/plugins/debugger/cdb/cdbparsehelpers.cpp
@@ -107,7 +107,7 @@ static BreakpointParameters fixWinMSVCBreakpoint(const BreakpointParameters &p)
     case WatchpointAtExpression:
     case BreakpointAtSysCall:
     case WatchpointAtAddress:
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         break;
     case BreakpointAtExec: { // Emulate by breaking on CreateProcessW().
         BreakpointParameters rc(BreakpointByFunction);
@@ -164,7 +164,7 @@ QByteArray cdbAddBreakpointCommand(const BreakpointParameters &bpIn,
     case BreakpointAtCatch:
     case BreakpointAtThrow:
     case BreakpointAtMain:
-    case BreakpointOnSignalHandler:
+    case BreakpointOnQmlSignalHandler:
         QTC_ASSERT(false, return QByteArray(); )
         break;
     case BreakpointByAddress:
diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index 2c519f30be9a9d2a40f9baa704ff1a0c168d6a8c..03a723831d80466d7dc5dad77d92d9b0bb6d52c1 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -639,7 +639,7 @@ bool QmlEngine::acceptsBreakpoint(BreakpointModelId id) const
     //If it is a Cpp Breakpoint query if the type can be also handled by the debugger client
     //TODO: enable setting of breakpoints before start of debug session
     //For now, the event breakpoint can be set after the activeDebuggerClient is known
-    //This is because the older client does not support BreakpointOnSignalHandler
+    //This is because the older client does not support BreakpointOnQmlSignalHandler
     bool acceptBreakpoint = false;
     if (d->m_adapter.activeDebuggerClient()) {
         acceptBreakpoint = d->m_adapter.activeDebuggerClient()->acceptsBreakpoint(id);
diff --git a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
index 24fd4e152310416f5fcb603137d1a08f8704d85c..b0b7c59e12a298d4e844c0264f8ea6a4b1dabfae 100644
--- a/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
+++ b/src/plugins/debugger/qml/qmlv8debuggerclient.cpp
@@ -315,7 +315,7 @@ void QmlV8DebuggerClient::activateFrame(int index)
 bool QmlV8DebuggerClient::acceptsBreakpoint(const BreakpointModelId &id)
 {
     BreakpointType type = d->engine->breakHandler()->breakpointData(id).type;
-    return ((type == BreakpointOnSignalHandler) || (type == BreakpointByFunction));
+    return (type == BreakpointOnQmlSignalHandler || type == BreakpointByFunction);
 }
 
 void QmlV8DebuggerClient::insertBreakpoint(const BreakpointModelId &id)
@@ -333,7 +333,7 @@ void QmlV8DebuggerClient::insertBreakpoint(const BreakpointModelId &id)
     } else if (handler->breakpointData(id).type == BreakpointByFunction) {
         JsonInputStream(request) << "type" << ':' << "function";
         JsonInputStream(request) << ',' << "target" << ':' << handler->functionName(id).toUtf8();
-    } else if (handler->breakpointData(id).type == BreakpointOnSignalHandler) {
+    } else if (handler->breakpointData(id).type == BreakpointOnQmlSignalHandler) {
         JsonInputStream(request) << "type" << ':' << "event";
         JsonInputStream(request) << ',' << "target" << ':' << handler->functionName(id).toUtf8();
     }