diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index b601e4467..05501899e 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -59,8 +59,8 @@ set(src
      x509_crl.c
      x509_csr.c
      x509_create.c
-     x509_crt_write.c
-     x509_csr_write.c
+     x509write_crt.c
+     x509write_csr.c
      xtea.c
 )
 
diff --git a/library/Makefile b/library/Makefile
index f70ef5632..003b93304 100644
--- a/library/Makefile
+++ b/library/Makefile
@@ -55,7 +55,10 @@ OBJS=	aes.o		arc4.o		asn1parse.o		\
 		sha512.o	ssl_cache.o	ssl_cli.o		\
 		ssl_srv.o   ssl_ciphersuites.o			\
 		ssl_tls.o	timing.o	version.o		\
-		x509parse.o	x509write.o	xtea.o
+		x509.o		x509_create.o				\
+		x509_crl.o	x509_crt.o	x509_csr.o		\
+		x509write_crt.o			x509write_csr.o	\
+		xtea.o
 
 .SILENT:
 
diff --git a/library/x509_crt_write.c b/library/x509write_crt.c
similarity index 100%
rename from library/x509_crt_write.c
rename to library/x509write_crt.c
diff --git a/library/x509_csr_write.c b/library/x509write_csr.c
similarity index 100%
rename from library/x509_csr_write.c
rename to library/x509write_csr.c