diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index 545a482ff9..1aae8a68ce 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -8,12 +8,15 @@ This list shows all the versions which include breaking changes and how to upgra
 
 The names of the following nodes were not set correctly and got fixed:
   - Bitbucket-Trigger
-  - Eventbrite -Trigger
+  - Coda
+  - Eventbrite-Trigger
+  - Flow
   - Gumroad-Trigger
   - Jira
   - Mailchimp-Trigger
   - PayPal Trigger
   - Read PDF
+  - Rocketchat
   - Shopify
   - Shopify-Trigger
   - Stripe-Trigger
@@ -36,12 +39,15 @@ There are two ways to upgrade the workflows and to make them work in the new ver
 
 After upgrading, select the whole workflow in the editor, copy it, and paste it into a text editor. In the JSON, change the node types manually by replacing the values for "type" as follows:
   - "n8n-nodes-base.bitbucket" -> "n8n-nodes-base.bitbucketTrigger"
+  - "n8n-nodes-base.Coda" -> "n8n-nodes-base.coda"
   - "n8n-nodes-base.eventbrite" -> "n8n-nodes-base.eventbriteTrigger"
+  - "n8n-nodes-base.Flow" -> "n8n-nodes-base.flow"
   - "n8n-nodes-base.gumroad" -> "n8n-nodes-base.gumroadTrigger"
   - "n8n-nodes-base.Jira Software Cloud" -> "n8n-nodes-base.jira"
   - "n8n-nodes-base.Mailchimp" -> "n8n-nodes-base.mailchimpTrigger"
   - "n8n-nodes-base.PayPal" -> "n8n-nodes-base.payPalTrigger"
   - "n8n-nodes-base.Read PDF" -> "n8n-nodes-base.readPDF"
+  - "n8n-nodes-base.Rocketchat" -> "n8n-nodes-base.rocketchat"
   - "n8n-nodes-base.shopify" -> "n8n-nodes-base.shopifyTrigger"
   - "n8n-nodes-base.shopifyNode" -> "n8n-nodes-base.shopify"
   - "n8n-nodes-base.stripe" -> "n8n-nodes-base.stripeTrigger"
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/AmqpSender.node.ts
similarity index 98%
rename from packages/nodes-base/nodes/Amqp/Amqp.node.ts
rename to packages/nodes-base/nodes/Amqp/AmqpSender.node.ts
index 66ed1aa25d..e641e11331 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpSender.node.ts
@@ -7,7 +7,7 @@ import {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-export class Amqp implements INodeType {
+export class AmqpSender implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'AMQP Sender',
 		name: 'amqpSender',
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index 04d611aa53..92fcbfa0a7 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -33,7 +33,7 @@ import {
 export class Coda implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Coda',
-		name: 'Coda',
+		name: 'coda',
 		icon: 'file:coda.png',
 		group: ['output'],
 		version: 1,
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.ts b/packages/nodes-base/nodes/Flow/Flow.node.ts
index 5d3b45b4a3..6f97c5d0a8 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.ts
+++ b/packages/nodes-base/nodes/Flow/Flow.node.ts
@@ -18,12 +18,11 @@ import {
 import {
 	ITask, TaskInfo,
  } from './TaskInterface';
-import { response } from 'express';
 
 export class Flow implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Flow',
-		name: 'Flow',
+		name: 'flow',
 		icon: 'file:flow.png',
 		group: ['output'],
 		version: 1,
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
index e67dfe192c..e83a3afbfe 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
@@ -49,7 +49,7 @@ interface IPostMessageBody {
 export class Rocketchat implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'Rocketchat',
-		name: 'Rocketchat',
+		name: 'rocketchat',
 		icon: 'file:rocketchat.png',
 		group: ['output'],
 		version: 1,
diff --git a/packages/nodes-base/nodes/Webhook.node.ts b/packages/nodes-base/nodes/Webhook.node.ts
index fc0360aefa..135960ea4e 100644
--- a/packages/nodes-base/nodes/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook.node.ts
@@ -15,8 +15,6 @@ import * as basicAuth from 'basic-auth';
 
 import { Response } from 'express';
 
-import { set } from 'lodash';
-
 import * as fs from 'fs';
 
 import * as formidable from 'formidable';
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index dc1a53776b..8a9256eaf9 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -120,7 +120,7 @@
             "dist/nodes/AgileCrm/AgileCrm.node.js",
             "dist/nodes/Airtable/Airtable.node.js",
             "dist/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.js",
-            "dist/nodes/Amqp/Amqp.node.js",
+            "dist/nodes/Amqp/AmqpSender.node.js",
             "dist/nodes/Amqp/AmqpTrigger.node.js",
             "dist/nodes/Asana/Asana.node.js",
             "dist/nodes/Asana/AsanaTrigger.node.js",