diff --git a/library/x509_create.c b/library/x509_create.c
index 6991161..b59abbf 100644
--- a/library/x509_create.c
+++ b/library/x509_create.c
@@ -63,7 +63,7 @@
                 oid = OID_AT_STATE;
             else
             {
-                ret = POLARSSL_ERR_X509WRITE_UNKNOWN_OID;
+                ret = POLARSSL_ERR_X509_UNKNOWN_OID;
                 goto exit;
             }
 
@@ -77,7 +77,7 @@
                                                (unsigned char *) s,
                                                c - s ) ) == NULL )
             {
-                return( POLARSSL_ERR_X509WRITE_MALLOC_FAILED );
+                return( POLARSSL_ERR_X509_MALLOC_FAILED );
             }
 
             while( c < end && *(c + 1) == ' ' )
@@ -105,7 +105,7 @@
     if( ( cur = asn1_store_named_data( head, oid, oid_len,
                                        NULL, val_len + 1 ) ) == NULL )
     {
-        return( POLARSSL_ERR_X509WRITE_MALLOC_FAILED );
+        return( POLARSSL_ERR_X509_MALLOC_FAILED );
     }
 
     cur->val.p[0] = critical;