diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index e93d3baa83..3c99d7b664 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -2016,10 +2016,8 @@ export default mixins(
 				this.$store.commit('renameNodeSelectedAndExecution', { old: currentName, new: newName });
 
 				// Reset all nodes and connections to load the new ones
-				if (this.instance) {
-					// On first load it does not exist
-					this.instance.deleteEveryEndpoint();
-				}
+				this.deleteEveryEndpoint();
+
 				this.$store.commit('removeAllConnections');
 				this.$store.commit('removeAllNodes', {setStateDirty: true});
 
@@ -2033,6 +2031,16 @@ export default mixins(
 				this.deselectAllNodes();
 				this.nodeSelectedByName(newName);
 			},
+			deleteEveryEndpoint () {
+				// Check as it does not exist on first load
+				if (this.instance) {
+					const nodes = this.$store.getters.allNodes as INodeUi[];
+					// @ts-ignore
+					nodes.forEach((node: INodeUi) => this.instance.destroyDraggable(`${NODE_NAME_PREFIX}${this.$store.getters.getNodeIndex(node.name)}`));
+
+					this.instance.deleteEveryEndpoint();
+				}
+			},
 			matchCredentials(node: INodeUi) {
 				if (!node.credentials) {
 					return;
@@ -2354,10 +2362,7 @@ export default mixins(
 			},
 			resetWorkspace () {
 				// Reset nodes
-				if (this.instance) {
-					// On first load it does not exist
-					this.instance.deleteEveryEndpoint();
-				}
+				this.deleteEveryEndpoint();
 
 				if (this.executionWaitingForWebhook === true) {
 					// Make sure that if there is a waiting test-webhook that
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
index 3cb586dc59..ec6f28ecc1 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQTrigger.node.ts
@@ -25,7 +25,7 @@ export class RabbitMQTrigger implements INodeType {
 		version: 1,
 		description: 'Listens to RabbitMQ messages',
 		defaults: {
-			name: 'RabbitMQ',
+			name: 'RabbitMQ Trigger',
 			color: '#ff6600',
 		},
 		inputs: [],
diff --git a/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts b/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
index 95373a84b2..f4d4f529ea 100644
--- a/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/OpportunityDescription.ts
@@ -325,11 +325,11 @@ export const opportunityFields = [
 				options: [
 					{
 						name: 'Business',
-						valie: 'Business',
+						value: 'Business',
 					},
 					{
 						name: 'New Business',
-						valie: 'New Business',
+						value: 'New Business',
 					},
 				],
 				description: 'Type of opportunity. For example, Existing Business or New Business. Label is Opportunity Type.',
@@ -538,11 +538,11 @@ export const opportunityFields = [
 				options: [
 					{
 						name: 'Business',
-						valie: 'Business',
+						value: 'Business',
 					},
 					{
 						name: 'New Business',
-						valie: 'New Business',
+						value: 'New Business',
 					},
 				],
 				description: 'Type of opportunity. For example, Existing Business or New Business. Label is Opportunity Type.',