diff --git a/build.sbt b/build.sbt
index 1353c5a833..8f62932277 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,7 +1,7 @@
 lazy val alpakka = project
   .in(file("."))
   .enablePlugins(PublishUnidoc)
-  .aggregate(amqp, cassandra, dynamodb, files, ftp, googleCloudPubSub, hbase, jms, mqtt, s3, simpleCodecs, sqs, sse, awslambda)
+  .aggregate(amqp, awslambda, cassandra, dynamodb, files, ftp, googleCloudPubSub, hbase, jms, mqtt, s3, simpleCodecs, sqs, sse)
 
 lazy val amqp = project
   .enablePlugins(AutomateHeaderPlugin)
@@ -10,6 +10,13 @@ lazy val amqp = project
     Dependencies.Amqp
   )
 
+lazy val awslambda = project
+  .enablePlugins(AutomateHeaderPlugin)
+  .settings(
+    name := "akka-stream-alpakka-awslambda",
+    Dependencies.AwsLambda
+  )
+
 lazy val cassandra = project
   .enablePlugins(AutomateHeaderPlugin)
   .settings(
@@ -40,6 +47,14 @@ lazy val ftp = project
     parallelExecution in Test := false
   )
 
+lazy val googleCloudPubSub = project
+  .in(file("google-cloud-pub-sub"))
+  .enablePlugins(AutomateHeaderPlugin)
+  .settings(
+    name := "akka-stream-alpakka-google-cloud-pub-sub",
+    Dependencies.GooglePubSub
+  )
+
 lazy val hbase = project
   .enablePlugins(AutomateHeaderPlugin)
   .settings(
@@ -92,14 +107,6 @@ lazy val sse = project
     Dependencies.Sse
   )
 
-lazy val googleCloudPubSub = project
-  .in(file("google-cloud-pub-sub"))
-  .enablePlugins(AutomateHeaderPlugin)
-  .settings(
-    name := "akka-stream-alpakka-google-cloud-pub-sub",
-    Dependencies.GooglePubSub
-  )
-
 val Local = config("local")
 val defaultParadoxSettings: Seq[Setting[_]] = Seq(
   paradoxTheme := Some(builtinParadoxTheme("generic")),
@@ -115,13 +122,6 @@ val defaultParadoxSettings: Seq[Setting[_]] = Seq(
   sourceDirectory := baseDirectory.value / "src" / "main"
 )
 
-lazy val awslambda = project
-  .enablePlugins(AutomateHeaderPlugin)
-  .settings(
-    name := "akka-stream-alpakka-awslambda",
-    Dependencies.AwsLambda
-  )
-
 lazy val docs = project
   .enablePlugins(ParadoxPlugin, NoPublish)
   .disablePlugins(BintrayPlugin)
diff --git a/docs/src/main/paradox/connectors.md b/docs/src/main/paradox/connectors.md
index 17eb4fc8e7..0ece3c24b9 100644
--- a/docs/src/main/paradox/connectors.md
+++ b/docs/src/main/paradox/connectors.md
@@ -4,8 +4,9 @@
 
 * [AMQP Connector](amqp.md)
 * [AWS DynamoDB Connector](dynamodb.md)
-* [AWS SQS Connector](sqs.md)
 * [AWS Lambda Connector](awslambda.md)
+* [AWS S3 Connector](s3.md)
+* [AWS SQS Connector](sqs.md)
 * [Cassandra Connector](cassandra.md)
 * [File Connectors](file.md)
 * [FTP Connector](ftp.md)
@@ -13,7 +14,6 @@
 * [HBase Connectors](hbase.md)
 * [JMS Connectors](jms.md)
 * [MQTT Connector](mqtt.md)
-* [S3 Connector](s3.md)
 * [Server-sent Events (SSE)](sse.md)
 
 @@@
diff --git a/docs/src/main/paradox/s3.md b/docs/src/main/paradox/s3.md
index c86ba3e110..3dd15d48ee 100644
--- a/docs/src/main/paradox/s3.md
+++ b/docs/src/main/paradox/s3.md
@@ -1,6 +1,6 @@
-# S3 Connector
+# AWS S3 Connector
 
-The S3 connector provides Akka Stream sources and sinks to connect to [Amazon S3](https://aws.amazon.com/s3/).
+The AWS S3 connector provides Akka Stream sources and sinks to connect to [Amazon S3](https://aws.amazon.com/s3/).
 S3 stands for Simple Storage Service and is an object storage service with a web service interface.
 
 ## Artifacts