diff --git a/src/plugins/debugger/debuggerconstants.h b/src/plugins/debugger/debuggerconstants.h
index 5b823e5243ea6dd6370d4a75e2150c6216dc769e..7f4b376f33ee679cf385af2b09a949937fd9047c 100644
--- a/src/plugins/debugger/debuggerconstants.h
+++ b/src/plugins/debugger/debuggerconstants.h
@@ -250,7 +250,7 @@ enum ModelRoles
 
     // Snapshots
     SnapshotCapabilityRole,
-    RequestMakeSnapshotRole,
+    RequestCreateSnapshotRole,
     RequestActivateSnapshotRole,
     RequestRemoveSnapshotRole,
 
diff --git a/src/plugins/debugger/debuggerengine.cpp b/src/plugins/debugger/debuggerengine.cpp
index 9c0a64f8e48adaa5a030dc85a5af15b381e4cb3e..50f4b8014859b63a5293c654826c3c2be11244f7 100644
--- a/src/plugins/debugger/debuggerengine.cpp
+++ b/src/plugins/debugger/debuggerengine.cpp
@@ -477,8 +477,8 @@ void DebuggerEngine::handleCommand(int role, const QVariant &value)
             d->queueShutdownInferior();
             break;
 
-        case RequestMakeSnapshotRole:
-            makeSnapshot();
+        case RequestCreateSnapshotRole:
+            createSnapshot();
             break;
 
         case RequestActivationRole:
diff --git a/src/plugins/debugger/debuggerengine.h b/src/plugins/debugger/debuggerengine.h
index 6cd9fb8796c2fdb0695ca6e6ce15891f80bb5107..e2b47831d836d4bd260db3dc7919ea7337da7ac5 100644
--- a/src/plugins/debugger/debuggerengine.h
+++ b/src/plugins/debugger/debuggerengine.h
@@ -152,7 +152,7 @@ public:
     virtual bool isSynchroneous() const { return false; }
     virtual QString qtNamespace() const { return QString(); }
 
-    virtual void makeSnapshot() {}
+    virtual void createSnapshot() {}
     virtual void updateAll() {}
 
     virtual void attemptBreakpointSynchronization() {}
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index a2a1e8339426691488299d1eb9da644026de1361..7d6b91db74e5e1ef1f72cad62ddbc3b6bc7d3d0a 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -1177,8 +1177,8 @@ bool DebuggerPluginPrivate::initialize(const QStringList &arguments, QString *er
     m_actions.watchAction2 = new QAction(tr("Add to Watch Window"), this);
     m_actions.watchAction2->setProperty(Role, RequestExecWatchRole);
 
-    m_actions.snapshotAction = new QAction(tr("Snapshot"), this);
-    m_actions.snapshotAction->setProperty(Role, RequestExecSnapshotRole);
+    m_actions.snapshotAction = new QAction(tr("Create Snapshot"), this);
+    m_actions.snapshotAction->setProperty(Role, RequestCreateSnapshotRole);
     m_actions.snapshotAction->setIcon(
         QIcon(":/debugger/images/debugger_snapshot_small.png"));
 
diff --git a/src/plugins/debugger/gdb/gdbengine.cpp b/src/plugins/debugger/gdb/gdbengine.cpp
index 1ad8e5f77e3d29213fdc34fd5c62358082da12db..ff6df3110e76348e8b012160d2b194197c2ffb8f 100644
--- a/src/plugins/debugger/gdb/gdbengine.cpp
+++ b/src/plugins/debugger/gdb/gdbengine.cpp
@@ -2968,7 +2968,7 @@ void GdbEngine::handleThreadListIds(const GdbResponse &response)
 //
 //////////////////////////////////////////////////////////////////////
 
-void GdbEngine::makeSnapshot()
+void GdbEngine::createSnapshot()
 {
     QString fileName;
     QTemporaryFile tf(QDir::tempPath() + _("/gdbsnapshot"));
diff --git a/src/plugins/debugger/gdb/gdbengine.h b/src/plugins/debugger/gdb/gdbengine.h
index b2619c285a930509504a4c697d65d0b2f0716266..e4cdca9d5406958c05581885cf0d554640aef37e 100644
--- a/src/plugins/debugger/gdb/gdbengine.h
+++ b/src/plugins/debugger/gdb/gdbengine.h
@@ -378,7 +378,7 @@ private: ////////// View & Data Stuff //////////
     //
     // Snapshot specific stuff
     //
-    virtual void makeSnapshot();
+    virtual void createSnapshot();
     void handleMakeSnapshot(const GdbResponse &response);
 
     //
diff --git a/src/plugins/debugger/snapshothandler.cpp b/src/plugins/debugger/snapshothandler.cpp
index ff322b6484f047468ef21cc53d80ea666b94697d..3a6fe2d716680d402b087539004fe7c8cf59e7dc 100644
--- a/src/plugins/debugger/snapshothandler.cpp
+++ b/src/plugins/debugger/snapshothandler.cpp
@@ -214,10 +214,10 @@ bool SnapshotHandler::setData
     (const QModelIndex &index, const QVariant &value, int role)
 {
     Q_UNUSED(value);
-    if (index.isValid() && role == RequestMakeSnapshotRole) {
+    if (index.isValid() && role == RequestCreateSnapshotRole) {
         DebuggerEngine *engine = engineAt(index.row());
         QTC_ASSERT(engine, return false);
-        engine->makeSnapshot();
+        engine->createSnapshot();
         return true;
     }
     if (index.isValid() && role == RequestActivateSnapshotRole) {
diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp
index ad0ddf0be25c90422724a218e8b0197bbebdb02a..46b1a7d92a0f4b9d2a9013e8af1e74ae14ab785d 100644
--- a/src/plugins/debugger/snapshotwindow.cpp
+++ b/src/plugins/debugger/snapshotwindow.cpp
@@ -140,7 +140,7 @@ void SnapshotWindow::contextMenuEvent(QContextMenuEvent *ev)
     QAction *act = menu.exec(ev->globalPos());
 
     if (act == actCreate)
-        model()->setData(idx, idx.row(), RequestMakeSnapshotRole);
+        model()->setData(idx, idx.row(), RequestCreateSnapshotRole);
     else if (act == actRemove)
         model()->setData(idx, idx.row(), RequestRemoveSnapshotRole);
     else if (act == actAdjust)