diff --git a/src/config.rs b/src/config.rs
index b66d68e8..530ab015 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -48,7 +48,8 @@ pub const DEFAULT_RETRY_DELAY_RAND_FACTOR: f64 = 0.3;
 /// Default for [`RetryConfig::retrying_max_elapsed_time`] (30 s).
 pub const DEFAULT_RETRYING_MAX_ELAPSED_TIME: Duration = Duration::from_secs(30);
 
-const MAIDSAFE_DOMAIN: &str = "maidsafe.net";
+// We use a hard-coded server name for self-signed certificates.
+pub(crate) const SERVER_NAME: &str = "maidsafe.net";
 
 // Convenience alias – not for export.
 type Result<T, E = ConfigError> = std::result::Result<T, E>;
@@ -287,7 +288,7 @@ impl InternalConfig {
     }
 
     fn generate_cert() -> Result<(quinn::Certificate, quinn::PrivateKey)> {
-        let cert = rcgen::generate_simple_self_signed(vec![MAIDSAFE_DOMAIN.to_string()])?;
+        let cert = rcgen::generate_simple_self_signed(vec![SERVER_NAME.to_string()])?;
 
         let cert_der = cert.serialize_der()?;
         let key_der = cert.serialize_private_key_der();
diff --git a/src/endpoint.rs b/src/endpoint.rs
index cd470c0d..a0b27227 100644
--- a/src/endpoint.rs
+++ b/src/endpoint.rs
@@ -11,7 +11,7 @@
 use super::igd::{forward_port, IgdError};
 use super::wire_msg::WireMsg;
 use super::{
-    config::{Config, InternalConfig},
+    config::{Config, InternalConfig, SERVER_NAME},
     connection_deduplicator::{ConnectionDeduplicator, DedupHandle},
     connection_pool::{ConnId, ConnectionPool, ConnectionRemover},
     connections::{
@@ -36,10 +36,6 @@ use tokio::sync::mpsc::{self, Receiver as MpscReceiver, Sender as MpscSender};
 use tokio::time::{timeout, Duration};
 use tracing::{debug, error, info, trace, warn};
 
-/// Host name of the Quic communication certificate used by peers
-// FIXME: make it configurable
-const CERT_SERVER_NAME: &str = "MaidSAFE.net";
-
 // Number of seconds before timing out the IGD request to forward a port.
 #[cfg(feature = "igd")]
 const PORT_FORWARD_TIMEOUT: Duration = Duration::from_secs(30);
@@ -497,7 +493,7 @@ impl<I: ConnId> Endpoint<I> {
                 let connecting = match self.quic_endpoint.connect_with(
                     self.config.client.clone(),
                     node_addr,
-                    CERT_SERVER_NAME,
+                    SERVER_NAME,
                 ) {
                     Ok(conn) => Ok(conn),
                     Err(error) => {