diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
index 28f6b61535..5f89d8edae 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/NiFiServiceFacade.java
@@ -528,28 +528,28 @@ public interface NiFiServiceFacade {
 
     /**
      * Creates a new flow file drop request.
-     * 
+     *
      * @param groupId group
      * @param connectionId The ID of the connection
-     * @return 
+     * @return The DropRequest
      */
     DropRequestDTO createFlowFileDropRequest(String groupId, String connectionId);
-    
+
     /**
      * Gets the specified flow file drop request.
-     * 
+     *
      * @param dropRequestId The flow file drop request
      * @return The DropRequest
      */
     DropRequestDTO getFlowFileDropRequest(String dropRequestId);
-    
+
     /**
      * Cancels/removes the specified flow file drop request.
-     * 
+     *
      * @param dropRequestId The flow file drop request
      */
     void deleteFlowFileDropRequest(String dropRequestId);
-    
+
     // ----------------------------------------
     // InputPort methods
     // ----------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
index dfc20fb77f..4265ead8ec 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ConnectionResource.java
@@ -1036,7 +1036,7 @@ public class ConnectionResource extends ApplicationResource {
 
     /**
      * Deletes the specified drop request.
-     * 
+     *
      * @param clientId Optional client id. If the client id is not specified, a new one will be generated. This value (whether specified or generated) is included in the response.
      * @param connectionId The connection id
      * @param dropRequestId The drop request id
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
index ce1d1fdf87..8c099192b4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/dao/ConnectionDAO.java
@@ -33,11 +33,11 @@ public interface ConnectionDAO {
 
     /**
      * Gets the specified flow file drop request.
-     * 
+     *
      * @param dropRequestId The drop request id
      */
     void getFlowFileDropRequest(String dropRequestId);
-    
+
     /**
      * Gets the connections for the specified source processor.
      *
@@ -75,12 +75,12 @@ public interface ConnectionDAO {
 
     /**
      * Creates a new flow file drop request.
-     * 
+     *
      * @param groupId group id
      * @param id connection id
      */
     void createFileFlowDropRequest(String groupId, String id);
-    
+
     /**
      * Verifies the create request can be processed.
      *
@@ -121,10 +121,10 @@ public interface ConnectionDAO {
      * @param id The id of the connection
      */
     void deleteConnection(String groupId, String id);
-    
+
     /**
      * Deletes the specified flow file drop request.
-     * 
+     *
      * @param dropRequestId The drop request id
      */
     void deleteFlowFileDropRequest(String dropRequestId);
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index bab2236fd5..1d8152b464 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -850,7 +850,7 @@ nf.Actions = (function () {
          * 
          * @param {type} selection
          */
-        deleteQueueContents: function (selection) {
+        emptyQueue: function (selection) {
             if (selection.size() !== 1 || !nf.CanvasUtils.isConnection(selection)) {
                 return;
             }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
index 58397d4228..f2b358dcc4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
@@ -382,7 +382,7 @@ nf.ContextMenu = (function () {
         {condition: isCopyable, menuItem: {img: 'images/iconCopy.png', text: 'Copy', action: 'copy'}},
         {condition: isPastable, menuItem: {img: 'images/iconPaste.png', text: 'Paste', action: 'paste'}},
         {condition: canMoveToParent, menuItem: {img: 'images/iconMoveToParent.png', text: 'Move to parent group', action: 'moveIntoParent'}},
-        {condition: canDeleteFlowFiles, menuItem: {img: 'images/iconDelete.png', text: 'Delete Flow Files', action: 'deleteQueueContents'}},
+        {condition: canDeleteFlowFiles, menuItem: {img: 'images/iconDelete.png', text: 'Empty queue', action: 'emptyQueue'}},
         {condition: isDeletable, menuItem: {img: 'images/iconDelete.png', text: 'Delete', action: 'delete'}}
     ];