diff --git a/metricbeat/docs/fields.asciidoc b/metricbeat/docs/fields.asciidoc
index 9958378cb320..243d791f81cb 100644
--- a/metricbeat/docs/fields.asciidoc
+++ b/metricbeat/docs/fields.asciidoc
@@ -1316,7 +1316,7 @@ The approximate age of the oldest non-deleted message in the queue.
 
 --
 
-*`aws.sqs.message.delayed`*::
+*`aws.sqs.messages.delayed`*::
 +
 --
 type: long
@@ -1326,7 +1326,7 @@ TThe number of messages in the queue that are delayed and not available for read
 
 --
 
-*`aws.sqs.message.not_visible`*::
+*`aws.sqs.messages.not_visible`*::
 +
 --
 type: long
@@ -1336,7 +1336,7 @@ The number of messages that are in flight.
 
 --
 
-*`aws.sqs.message.visible`*::
+*`aws.sqs.messages.visible`*::
 +
 --
 type: long
@@ -1346,7 +1346,7 @@ The number of messages available for retrieval from the queue.
 
 --
 
-*`aws.sqs.message.deleted`*::
+*`aws.sqs.messages.deleted`*::
 +
 --
 type: long
@@ -1356,7 +1356,7 @@ The number of messages deleted from the queue.
 
 --
 
-*`aws.sqs.message.received`*::
+*`aws.sqs.messages.received`*::
 +
 --
 type: long
@@ -1366,7 +1366,7 @@ The number of messages returned by calls to the ReceiveMessage action.
 
 --
 
-*`aws.sqs.message.sent`*::
+*`aws.sqs.messages.sent`*::
 +
 --
 type: long
@@ -1389,7 +1389,9 @@ The number of ReceiveMessage API calls that did not return a message.
 *`aws.sqs.sent_message_size.bytes`*::
 +
 --
-type: scaled_float
+type: long
+
+format: bytes
 
 The size of messages added to a queue.
 
diff --git a/x-pack/metricbeat/module/aws/fields.go b/x-pack/metricbeat/module/aws/fields.go
index bd5350fc48d2..0eb1abe1e91a 100644
--- a/x-pack/metricbeat/module/aws/fields.go
+++ b/x-pack/metricbeat/module/aws/fields.go
@@ -19,5 +19,5 @@ func init() {
 // AssetAws returns asset data.
 // This is the base64 encoded gzipped contents of module/aws.
 func AssetAws() string {
-	return "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"
+	return "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"
 }
diff --git a/x-pack/metricbeat/module/aws/sqs/_meta/fields.yml b/x-pack/metricbeat/module/aws/sqs/_meta/fields.yml
index 9a1edd352e6e..9893f0af8a9b 100644
--- a/x-pack/metricbeat/module/aws/sqs/_meta/fields.yml
+++ b/x-pack/metricbeat/module/aws/sqs/_meta/fields.yml
@@ -8,27 +8,27 @@
       type: long
       description: >
         The approximate age of the oldest non-deleted message in the queue.
-    - name: message.delayed
+    - name: messages.delayed
       type: long
       description: >
         TThe number of messages in the queue that are delayed and not available for reading immediately.
-    - name: message.not_visible
+    - name: messages.not_visible
       type: long
       description: >
         The number of messages that are in flight.
-    - name: message.visible
+    - name: messages.visible
       type: long
       description: >
         The number of messages available for retrieval from the queue.
-    - name: message.deleted
+    - name: messages.deleted
       type: long
       description: >
         The number of messages deleted from the queue.
-    - name: message.received
+    - name: messages.received
       type: long
       description: >
         The number of messages returned by calls to the ReceiveMessage action.
-    - name: message.sent
+    - name: messages.sent
       type: long
       description: >
         The number of messages added to a queue.
@@ -37,6 +37,7 @@
       description: >
         The number of ReceiveMessage API calls that did not return a message.
     - name: sent_message_size.bytes
-      type: scaled_float
+      type: long
+      format: bytes
       description: >
         The size of messages added to a queue.