diff --git a/editor/osm_auth.cpp b/editor/osm_auth.cpp
index f721d7a9d6..1ee8c89c8b 100644
--- a/editor/osm_auth.cpp
+++ b/editor/osm_auth.cpp
@@ -272,22 +272,22 @@ OsmOAuth::AuthResult OsmOAuth::AuthorizeGoogle(string const & googleToken, TKeyS
   return FetchAccessToken(sid, outKeySecret);
 }
 
-std::pair<string, TKeySecret> OsmOAuth::GetFacebookOAuthURL() const
+OsmOAuth::TUrlKeySecret OsmOAuth::GetFacebookOAuthURL() const
 {
   TKeySecret const requestToken = FetchRequestToken();
   if (requestToken.first.empty())
-    return std::pair<string, TKeySecret>(string(), requestToken);
+    return TUrlKeySecret(string(), requestToken);
   string const url = m_baseUrl + kFacebookOAuthPart + requestToken.first;
-  return std::pair<string, TKeySecret>(url, requestToken);
+  return TUrlKeySecret(url, requestToken);
 }
 
-std::pair<string, TKeySecret> OsmOAuth::GetGoogleOAuthURL() const
+OsmOAuth::TUrlKeySecret OsmOAuth::GetGoogleOAuthURL() const
 {
   TKeySecret const requestToken = FetchRequestToken();
   if (requestToken.first.empty())
-    return std::pair<string, TKeySecret>(string(), requestToken);
+    return TUrlKeySecret(string(), requestToken);
   string const url = m_baseUrl + kGoogleOAuthPart + requestToken.first;
-  return std::pair<string, TKeySecret>(url, requestToken);
+  return TUrlKeySecret(url, requestToken);
 }
 
 OsmOAuth::Response OsmOAuth::Request(TKeySecret const & keySecret, string const & method, string const & httpMethod, string const & body) const
diff --git a/editor/osm_auth.hpp b/editor/osm_auth.hpp
index b5d1100af7..aef959a009 100644
--- a/editor/osm_auth.hpp
+++ b/editor/osm_auth.hpp
@@ -43,6 +43,8 @@ public:
 
   /// A pair of <error code, response contents>.
   using Response = std::pair<ResponseCode, string>;
+  /// A pair of <url, key-secret>.
+  using TUrlKeySecret = std::pair<string, TKeySecret>;
 
   /// The constructor. Simply stores a lot of strings in fields.
   /// @param[apiUrl] The OSM API URL defaults to baseUrl, or kDefaultApiURL if not specified.
@@ -78,8 +80,8 @@ public:
 
   /// @name Methods for WebView-based authentication.
   //@{
-  std::pair<string, TKeySecret> GetFacebookOAuthURL() const;
-  std::pair<string, TKeySecret> GetGoogleOAuthURL() const;
+  TUrlKeySecret GetFacebookOAuthURL() const;
+  TUrlKeySecret GetGoogleOAuthURL() const;
   AuthResult FinishAuthorization(TKeySecret const & requestToken, string const & verifier, TKeySecret & outKeySecret) const;
   AuthResult FinishAuthorization(TKeySecret const & requestToken, string const & verifier);
   //@}