diff --git a/cmdline/stress.c b/cmdline/stress.c
index 7222a693..2a17a8be 100644
--- a/cmdline/stress.c
+++ b/cmdline/stress.c
@@ -582,7 +582,7 @@ void stress_functions(mrmailbox_t* mailbox)
 				bad_data[i] = (unsigned char)(i&0xFF);
 			}
 			for( int j = 0; j < BAD_DATA_BYTES/40; j++ ) {
-				mrkey_set_from_raw(bad_key, &bad_data[j], BAD_DATA_BYTES/2 + j, (j&1)? MR_PUBLIC : MR_PRIVATE);
+				mrkey_set_from_binary(bad_key, &bad_data[j], BAD_DATA_BYTES/2 + j, (j&1)? MR_PUBLIC : MR_PRIVATE);
 				assert( !mrpgp_is_valid_key(mailbox, bad_key) );
 			}
 		mrkey_unref(bad_key);
diff --git a/src/mrkey.c b/src/mrkey.c
index 4dc50144..e93f7714 100644
--- a/src/mrkey.c
+++ b/src/mrkey.c
@@ -98,7 +98,7 @@ void mrkey_unref(mrkey_t* ths)
 }
 
 
-int mrkey_set_from_raw(mrkey_t* ths, const void* data, int bytes, int type)
+int mrkey_set_from_binary(mrkey_t* ths, const void* data, int bytes, int type)
 {
     mrkey_empty(ths);
     if( ths==NULL || data==NULL || bytes <= 0 ) {
@@ -121,7 +121,7 @@ int mrkey_set_from_key(mrkey_t* ths, const mrkey_t* o)
 	if( ths==NULL || o==NULL ) {
 		return 0;
 	}
-	return mrkey_set_from_raw(ths, o->m_binary, o->m_bytes, o->m_type);
+	return mrkey_set_from_binary(ths, o->m_binary, o->m_bytes, o->m_type);
 }
 
 
@@ -131,7 +131,7 @@ int mrkey_set_from_stmt(mrkey_t* ths, sqlite3_stmt* stmt, int index, int type)
 	if( ths==NULL || stmt==NULL ) {
 		return 0;
 	}
-	return mrkey_set_from_raw(ths, (unsigned char*)sqlite3_column_blob(stmt, index), sqlite3_column_bytes(stmt, index), type);
+	return mrkey_set_from_binary(ths, (unsigned char*)sqlite3_column_blob(stmt, index), sqlite3_column_bytes(stmt, index), type);
 }
 
 
@@ -151,7 +151,7 @@ int mrkey_set_from_base64(mrkey_t* ths, const char* base64, int type)
 		return 0; /* bad key */
 	}
 
-	mrkey_set_from_raw(ths, result, result_len, type);
+	mrkey_set_from_binary(ths, result, result_len, type);
 	mmap_string_unref(result);
 
 	return 1;
diff --git a/src/mrkey.h b/src/mrkey.h
index 9a31f19f..ee5ef8b6 100644
--- a/src/mrkey.h
+++ b/src/mrkey.h
@@ -53,11 +53,11 @@ mrkey_t* mrkey_new           ();
 mrkey_t* mrkey_ref           (mrkey_t*);
 void     mrkey_unref         (mrkey_t*);
 
-int   mrkey_set_from_raw  (mrkey_t*, const void* data, int bytes, int type);
-int   mrkey_set_from_key  (mrkey_t*, const mrkey_t*);
-int   mrkey_set_from_stmt (mrkey_t*, sqlite3_stmt*, int index, int type);
-int   mrkey_set_from_base64(mrkey_t*,const char* base64, int type);
-int   mrkey_set_from_file (mrkey_t*, const char* file, mrmailbox_t* mailbox);
+int   mrkey_set_from_binary  (mrkey_t*, const void* data, int bytes, int type);
+int   mrkey_set_from_key     (mrkey_t*, const mrkey_t*);
+int   mrkey_set_from_stmt    (mrkey_t*, sqlite3_stmt*, int index, int type);
+int   mrkey_set_from_base64  (mrkey_t*,const char* base64, int type);
+int   mrkey_set_from_file    (mrkey_t*, const char* file, mrmailbox_t* mailbox);
 
 int   mrkey_equals        (const mrkey_t*, const mrkey_t*);
 
diff --git a/src/mrpgp.c b/src/mrpgp.c
index cb3803a4..58ea5b2f 100644
--- a/src/mrpgp.c
+++ b/src/mrpgp.c
@@ -381,8 +381,8 @@ int mrpgp_create_keypair(mrmailbox_t* mailbox, const char* addr, mrkey_t* ret_pu
 		goto cleanup;
 	}
 
-	mrkey_set_from_raw(ret_public_key, pubmem->buf, pubmem->length, MR_PUBLIC);
-	mrkey_set_from_raw(ret_private_key, secmem->buf, secmem->length, MR_PRIVATE);
+	mrkey_set_from_binary(ret_public_key, pubmem->buf, pubmem->length, MR_PUBLIC);
+	mrkey_set_from_binary(ret_private_key, secmem->buf, secmem->length, MR_PRIVATE);
 
 	success = 1;
 
@@ -508,7 +508,7 @@ int mrpgp_split_key(mrmailbox_t* mailbox, const mrkey_t* private_in, mrkey_t* re
 		goto cleanup;
 	}
 
-	mrkey_set_from_raw(ret_public_key, pubmem->buf, pubmem->length, MR_PUBLIC);
+	mrkey_set_from_binary(ret_public_key, pubmem->buf, pubmem->length, MR_PUBLIC);
 
 	success = 1;