diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 84eb894..302352b 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -490,14 +490,12 @@ set(
 	ec/ecp_oct.c
 	ec/ecp_smpl.c
 	ec/ecx_methods.c
-	ecdh/ecdh_kdf.c
+	ecdh/ecdh.c
 	ecdh/ech_err.c
-	ecdh/ech_key.c
 	ecdh/ech_lib.c
-	ecdsa/ecs_asn1.c
+	ecdsa/ecdsa.c
 	ecdsa/ecs_err.c
 	ecdsa/ecs_lib.c
-	ecdsa/ecs_ossl.c
 	engine/eng_all.c
 	engine/eng_cnf.c
 	engine/eng_ctrl.c
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 667352f..258da67 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -599,17 +599,15 @@ libcrypto_la_SOURCES += ec/ecx_methods.c
 noinst_HEADERS += ec/ec_local.h
 
 # ecdh
-libcrypto_la_SOURCES += ecdh/ecdh_kdf.c
+libcrypto_la_SOURCES += ecdh/ecdh.c
 libcrypto_la_SOURCES += ecdh/ech_err.c
-libcrypto_la_SOURCES += ecdh/ech_key.c
 libcrypto_la_SOURCES += ecdh/ech_lib.c
 
 # ecdsa
-libcrypto_la_SOURCES += ecdsa/ecs_asn1.c
+libcrypto_la_SOURCES += ecdsa/ecdsa.c
 libcrypto_la_SOURCES += ecdsa/ecs_err.c
 libcrypto_la_SOURCES += ecdsa/ecs_lib.c
-libcrypto_la_SOURCES += ecdsa/ecs_ossl.c
-noinst_HEADERS += ecdsa/ecs_local.h
+noinst_HEADERS += ecdsa/ecdsa_local.h
 
 # engine
 libcrypto_la_SOURCES += engine/eng_all.c