diff --git a/library/x509write.c b/library/x509write.c
index 0e6e4bf..337f4c2 100644
--- a/library/x509write.c
+++ b/library/x509write.c
@@ -105,7 +105,7 @@
                 oid = OID_AT_STATE;
             else
             {
-                ret = POLARSSL_ERR_X509_WRITE_UNKNOWN_OID;
+                ret = POLARSSL_ERR_X509WRITE_UNKNOWN_OID;
                 goto exit;
             }
 
@@ -117,7 +117,7 @@
         {
             if( c - s > 127 )
             {
-                ret = POLARSSL_ERR_X509_WRITE_BAD_INPUT_DATA;
+                ret = POLARSSL_ERR_X509WRITE_BAD_INPUT_DATA;
                 goto exit;
             }
 
@@ -125,7 +125,7 @@
 
             if( cur == NULL )
             {
-                ret = POLARSSL_ERR_X509_WRITE_MALLOC_FAILED;
+                ret = POLARSSL_ERR_X509WRITE_MALLOC_FAILED;
                 goto exit;
             }