diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index ef384c014..e17e1f26b 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -6,6 +6,8 @@ add_library(
   ssl
 
   custom_extensions.c
+  handshake_server.c
+  handshake_client.c
   d1_both.c
   d1_lib.c
   d1_meth.c
@@ -13,12 +15,10 @@ add_library(
   d1_srtp.c
   dtls_record.c
   s3_both.c
-  s3_clnt.c
   s3_enc.c
   s3_lib.c
   s3_meth.c
   s3_pkt.c
-  s3_srvr.c
   ssl_aead_ctx.c
   ssl_asn1.c
   ssl_buffer.c
diff --git a/ssl/s3_clnt.c b/ssl/handshake_client.c
similarity index 100%
rename from ssl/s3_clnt.c
rename to ssl/handshake_client.c
diff --git a/ssl/s3_srvr.c b/ssl/handshake_server.c
similarity index 100%
rename from ssl/s3_srvr.c
rename to ssl/handshake_server.c