diff --git a/actix-http/CHANGES.md b/actix-http/CHANGES.md
index 37a7ec1f5..011e2c608 100644
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -3,6 +3,7 @@
 ## Unreleased - 2021-xx-xx
 ### Changed
 * Rename trait `IntoHeaderPair => TryIntoHeaderPair`. [#2510]
+* Rename `TryIntoHeaderPair::{try_into_header_pair => try_into_pair}`. [#2510]
 * Rename trait `IntoHeaderValue => TryIntoHeaderValue`. [#2510]
 
 [#2510]: https://github.com/actix/actix-web/pull/2510
diff --git a/actix-http/src/header/into_pair.rs b/actix-http/src/header/into_pair.rs
index 04daf399e..91c3e6640 100644
--- a/actix-http/src/header/into_pair.rs
+++ b/actix-http/src/header/into_pair.rs
@@ -14,7 +14,7 @@ use crate::error::HttpError;
 pub trait TryIntoHeaderPair: Sized {
     type Error: Into<HttpError>;
 
-    fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error>;
+    fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error>;
 }
 
 #[derive(Debug)]
@@ -39,7 +39,7 @@ where
 {
     type Error = InvalidHeaderPart;
 
-    fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
+    fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
         let (name, value) = self;
         let value = value
             .try_into_value()
@@ -55,7 +55,7 @@ where
 {
     type Error = InvalidHeaderPart;
 
-    fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
+    fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
         let (name, value) = self;
         let value = value
             .try_into_value()
@@ -71,7 +71,7 @@ where
 {
     type Error = InvalidHeaderPart;
 
-    fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
+    fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
         let (name, value) = self;
         let name = HeaderName::try_from(name).map_err(InvalidHeaderPart::Name)?;
         let value = value
@@ -88,7 +88,7 @@ where
 {
     type Error = InvalidHeaderPart;
 
-    fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
+    fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
         let (name, value) = self;
         let name = HeaderName::try_from(name).map_err(InvalidHeaderPart::Name)?;
         let value = value
@@ -106,9 +106,9 @@ where
     type Error = InvalidHeaderPart;
 
     #[inline]
-    fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
+    fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
         let (name, value) = self;
-        (name.as_str(), value).try_into_header_pair()
+        (name.as_str(), value).try_into_pair()
     }
 }
 
@@ -116,7 +116,7 @@ impl<T: Header> TryIntoHeaderPair for T {
     type Error = <T as TryIntoHeaderValue>::Error;
 
     #[inline]
-    fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
+    fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
         Ok((T::name(), self.try_into_value()?))
     }
 }
diff --git a/actix-http/src/response_builder.rs b/actix-http/src/response_builder.rs
index ceb42e35e..adbe86fca 100644
--- a/actix-http/src/response_builder.rs
+++ b/actix-http/src/response_builder.rs
@@ -92,7 +92,7 @@ impl ResponseBuilder {
     /// ```
     pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
         if let Some(parts) = self.inner() {
-            match header.try_into_header_pair() {
+            match header.try_into_pair() {
                 Ok((key, value)) => {
                     parts.headers.insert(key, value);
                 }
@@ -120,7 +120,7 @@ impl ResponseBuilder {
     /// ```
     pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
         if let Some(parts) = self.inner() {
-            match header.try_into_header_pair() {
+            match header.try_into_pair() {
                 Ok((key, value)) => parts.headers.append(key, value),
                 Err(e) => self.err = Some(e.into()),
             };
diff --git a/actix-http/src/test.rs b/actix-http/src/test.rs
index 066e615c9..7e26ee865 100644
--- a/actix-http/src/test.rs
+++ b/actix-http/src/test.rs
@@ -93,7 +93,7 @@ impl TestRequest {
 
     /// Insert a header, replacing any that were set with an equivalent field name.
     pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
-        match header.try_into_header_pair() {
+        match header.try_into_pair() {
             Ok((key, value)) => {
                 parts(&mut self.0).headers.insert(key, value);
             }
@@ -107,7 +107,7 @@ impl TestRequest {
 
     /// Append a header, keeping any that were set with an equivalent field name.
     pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
-        match header.try_into_header_pair() {
+        match header.try_into_pair() {
             Ok((key, value)) => {
                 parts(&mut self.0).headers.append(key, value);
             }
diff --git a/awc/src/builder.rs b/awc/src/builder.rs
index 09f8063bb..30f203bb8 100644
--- a/awc/src/builder.rs
+++ b/awc/src/builder.rs
@@ -168,7 +168,7 @@ where
     /// # Panics
     /// Panics if header name or value is invalid.
     pub fn add_default_header(mut self, header: impl TryIntoHeaderPair) -> Self {
-        match header.try_into_header_pair() {
+        match header.try_into_pair() {
             Ok((key, value)) => self.default_headers.append(key, value),
             Err(err) => panic!("Header error: {:?}", err.into()),
         }
diff --git a/awc/src/request.rs b/awc/src/request.rs
index 21f187e99..9e37b2755 100644
--- a/awc/src/request.rs
+++ b/awc/src/request.rs
@@ -148,7 +148,7 @@ impl ClientRequest {
 
     /// Insert a header, replacing any that were set with an equivalent field name.
     pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self {
-        match header.try_into_header_pair() {
+        match header.try_into_pair() {
             Ok((key, value)) => {
                 self.head.headers.insert(key, value);
             }
@@ -160,7 +160,7 @@ impl ClientRequest {
 
     /// Insert a header only if it is not yet set.
     pub fn insert_header_if_none(mut self, header: impl TryIntoHeaderPair) -> Self {
-        match header.try_into_header_pair() {
+        match header.try_into_pair() {
             Ok((key, value)) => {
                 if !self.head.headers.contains_key(&key) {
                     self.head.headers.insert(key, value);
@@ -187,7 +187,7 @@ impl ClientRequest {
     /// # }
     /// ```
     pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self {
-        match header.try_into_header_pair() {
+        match header.try_into_pair() {
             Ok((key, value)) => self.head.headers.append(key, value),
             Err(e) => self.err = Some(e.into()),
         };
diff --git a/awc/src/test.rs b/awc/src/test.rs
index a3b5fa0eb..1b41efc93 100644
--- a/awc/src/test.rs
+++ b/awc/src/test.rs
@@ -40,7 +40,7 @@ impl TestResponse {
 
     /// Insert a header
     pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self {
-        if let Ok((key, value)) = header.try_into_header_pair() {
+        if let Ok((key, value)) = header.try_into_pair() {
             self.head.headers.insert(key, value);
             return self;
         }
@@ -49,7 +49,7 @@ impl TestResponse {
 
     /// Append a header
     pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self {
-        if let Ok((key, value)) = header.try_into_header_pair() {
+        if let Ok((key, value)) = header.try_into_pair() {
             self.head.headers.append(key, value);
             return self;
         }
diff --git a/src/middleware/default_headers.rs b/src/middleware/default_headers.rs
index 434f1c95d..257467710 100644
--- a/src/middleware/default_headers.rs
+++ b/src/middleware/default_headers.rs
@@ -63,7 +63,7 @@ impl DefaultHeaders {
         // standard header terminology `insert` or `append` for this method would make the behavior
         // of this middleware less obvious since it only adds the headers if they are not present
 
-        match header.try_into_header_pair() {
+        match header.try_into_pair() {
             Ok((key, value)) => Rc::get_mut(&mut self.inner)
                 .expect("All default headers must be added before cloning.")
                 .headers
diff --git a/src/response/builder.rs b/src/response/builder.rs
index d16e1c177..b500ab331 100644
--- a/src/response/builder.rs
+++ b/src/response/builder.rs
@@ -69,7 +69,7 @@ impl HttpResponseBuilder {
     /// ```
     pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
         if let Some(parts) = self.inner() {
-            match header.try_into_header_pair() {
+            match header.try_into_pair() {
                 Ok((key, value)) => {
                     parts.headers.insert(key, value);
                 }
@@ -93,7 +93,7 @@ impl HttpResponseBuilder {
     /// ```
     pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
         if let Some(parts) = self.inner() {
-            match header.try_into_header_pair() {
+            match header.try_into_pair() {
                 Ok((key, value)) => parts.headers.append(key, value),
                 Err(e) => self.err = Some(e.into()),
             };
diff --git a/src/response/customize_responder.rs b/src/response/customize_responder.rs
index 2bb29c504..11f6b2916 100644
--- a/src/response/customize_responder.rs
+++ b/src/response/customize_responder.rs
@@ -79,7 +79,7 @@ impl<R: Responder> CustomizeResponder<R> {
     /// ```
     pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self {
         if let Some(inner) = self.inner() {
-            match header.try_into_header_pair() {
+            match header.try_into_pair() {
                 Ok((key, value)) => {
                     inner.override_headers.insert(key, value);
                 }
@@ -111,7 +111,7 @@ impl<R: Responder> CustomizeResponder<R> {
     /// ```
     pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self {
         if let Some(inner) = self.inner() {
-            match header.try_into_header_pair() {
+            match header.try_into_pair() {
                 Ok((key, value)) => {
                     inner.append_headers.append(key, value);
                 }