diff --git a/filebeat/tests/system/test_base.py b/filebeat/tests/system/test_base.py
index ba21f21c2f6..c4137f6c7f7 100644
--- a/filebeat/tests/system/test_base.py
+++ b/filebeat/tests/system/test_base.py
@@ -40,3 +40,19 @@ def test_template(self):
         assert exit_code == 0
         assert self.log_contains('Loaded index template')
         assert len(es.cat.templates(name='filebeat-*', h='name')) > 0
+
+    @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
+    def test_template_migration(self):
+        """
+        Test that the template can be loaded with `setup --template`
+        """
+        es = Elasticsearch([self.get_elasticsearch_url()])
+        self.render_config_template(
+            elasticsearch={"host": self.get_elasticsearch_url()},
+        )
+        exit_code = self.run_beat(extra_args=["setup", "--template",
+                                              "-E", "setup.template.overwrite=true", "-E", "migration.enabled=true"])
+
+        assert exit_code == 0
+        assert self.log_contains('Loaded index template')
+        assert len(es.cat.templates(name='filebeat-*', h='name')) > 0
diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 876c5eb29b5..6c3d0bf40bf 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -20073,16 +20073,6 @@ RabbitMQ module
 
 
 
-*`rabbitmq.node.name`*::
-+
---
-type: keyword
-
-Node name
-
-
---
-
 *`rabbitmq.vhost`*::
 +
 --
@@ -20103,9 +20093,7 @@ connection
 *`rabbitmq.connection.name`*::
 +
 --
-type: alias
-
-alias to: rabbitmq.name
+type: keyword
 
 The name of the connection with non-ASCII characters escaped as in C.
 
@@ -20663,13 +20651,10 @@ Number of messages which have been written to the message store.
 *`rabbitmq.node.name`*::
 +
 --
-type: alias
-
-alias to: rabbitmq.node.name
+type: keyword
 
 Node name
 
-
 --
 
 *`rabbitmq.node.proc.total`*::
diff --git a/metricbeat/module/rabbitmq/_meta/fields.yml b/metricbeat/module/rabbitmq/_meta/fields.yml
index f964967e8e4..5abfd082dd8 100644
--- a/metricbeat/module/rabbitmq/_meta/fields.yml
+++ b/metricbeat/module/rabbitmq/_meta/fields.yml
@@ -9,11 +9,6 @@
       type: group
       description: >
       fields:
-        - name: node.name
-          type: keyword
-          description: >
-            Node name
-
         - name: vhost
           type: keyword
           description: >
diff --git a/metricbeat/module/rabbitmq/connection/_meta/fields.yml b/metricbeat/module/rabbitmq/connection/_meta/fields.yml
index d595cc97928..566bad10753 100644
--- a/metricbeat/module/rabbitmq/connection/_meta/fields.yml
+++ b/metricbeat/module/rabbitmq/connection/_meta/fields.yml
@@ -5,9 +5,7 @@
   release: ga
   fields:
     - name: name
-      type: alias
-      path: rabbitmq.name
-      migration: true
+      type: keyword
       description: >
         The name of the connection with non-ASCII characters escaped as in C.
     - name: vhost
diff --git a/metricbeat/module/rabbitmq/fields.go b/metricbeat/module/rabbitmq/fields.go
index dc6b1555610..30e982f3b3f 100644
--- a/metricbeat/module/rabbitmq/fields.go
+++ b/metricbeat/module/rabbitmq/fields.go
@@ -32,5 +32,5 @@ func init() {
 // AssetRabbitmq returns asset data.
 // This is the base64 encoded gzipped contents of ../metricbeat/module/rabbitmq.
 func AssetRabbitmq() string {
-	return "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"
+	return "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"
 }
diff --git a/metricbeat/module/rabbitmq/node/_meta/fields.yml b/metricbeat/module/rabbitmq/node/_meta/fields.yml
index 11ab0f69836..dce18fec55f 100644
--- a/metricbeat/module/rabbitmq/node/_meta/fields.yml
+++ b/metricbeat/module/rabbitmq/node/_meta/fields.yml
@@ -111,10 +111,8 @@
       description: >
         Number of messages which have been written to the message store.
     - name: name
-      type: alias
-      path: rabbitmq.node.name
-      migration: true
-      description: >
+      type: keyword
+      description:
         Node name
     - name: proc.total
       type: long
diff --git a/metricbeat/tests/system/test_base.py b/metricbeat/tests/system/test_base.py
index e5d58e0284d..146cdd064ac 100644
--- a/metricbeat/tests/system/test_base.py
+++ b/metricbeat/tests/system/test_base.py
@@ -75,3 +75,25 @@ def test_dashboards(self):
 
         assert exit_code == 0
         assert self.log_contains("Kibana dashboards successfully loaded.")
+
+    @unittest.skipUnless(INTEGRATION_TESTS, "integration test")
+    def test_migration(self):
+        """
+        Test that the template loads when migration is enabled
+        """
+
+        es = Elasticsearch([self.get_elasticsearch_url()])
+        self.render_config_template(
+            modules=[{
+                "name": "apache",
+                "metricsets": ["status"],
+                "hosts": ["localhost"],
+            }],
+            elasticsearch={"host": self.get_elasticsearch_url()},
+        )
+        exit_code = self.run_beat(extra_args=["setup", "--template",
+                                              "-E", "setup.template.overwrite=true", "-E", "migration.enabled=true"])
+
+        assert exit_code == 0
+        assert self.log_contains('Loaded index template')
+        assert len(es.cat.templates(name='metricbeat-*', h='name')) > 0