diff --git a/actix-server/CHANGES.md b/actix-server/CHANGES.md
index 6907221071..83aeecd4d0 100644
--- a/actix-server/CHANGES.md
+++ b/actix-server/CHANGES.md
@@ -2,6 +2,7 @@
 
 ## Unreleased - 2021-xx-xx
 * Rename `Server` to `ServerHandle`. [#407]
+* Rename `ServerBuilder::{maxconn => max_concurrent_connections}`. [#407]
 * Minimum supported Rust version (MSRV) is now 1.52.
 
 [#407]: https://github.com/actix/actix-net/pull/407
diff --git a/actix-server/src/builder.rs b/actix-server/src/builder.rs
index b2da84be81..279cb8ca3a 100644
--- a/actix-server/src/builder.rs
+++ b/actix-server/src/builder.rs
@@ -118,11 +118,20 @@ impl ServerBuilder {
     /// reached for each worker.
     ///
     /// By default max connections is set to a 25k per worker.
-    pub fn maxconn(mut self, num: usize) -> Self {
-        self.worker_config.max_concurrent_connections(num);
+    pub fn max_concurrent_connections(mut self, num: usize) -> Self {
+        self.worker_config
+        
+        
+        .max_concurrent_connections(num);
         self
     }
 
+    #[doc(hidden)]
+    #[deprecated(since = "2.0.0", note = "Renamed to `max_concurrent_connections`.")]
+    pub fn maxconn(self, num: usize) -> Self {
+        self.max_concurrent_connections(num)
+    }
+
     /// Stop Actix system.
     pub fn system_exit(mut self) -> Self {
         self.exit = true;
diff --git a/actix-server/tests/test_server.rs b/actix-server/tests/test_server.rs
index 315e3eff18..5919438bc8 100644
--- a/actix-server/tests/test_server.rs
+++ b/actix-server/tests/test_server.rs
@@ -170,7 +170,7 @@ async fn test_max_concurrent_connections() {
                 // Set a relative higher backlog.
                 .backlog(12)
                 // max connection for a worker is 3.
-                .maxconn(max_conn)
+                .max_concurrent_connections(max_conn)
                 .workers(1)
                 .disable_signals()
                 .bind("test", addr, move || {