diff --git a/ChangeLog b/ChangeLog
index 8f350a4a6..bbf182b98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,14 @@
 2011-11-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* OpenChange/NSArray+MAPIStore.m (-asMVUnicodeInMemCtx:) renamed
+	from "asArrayOfUnicodeStringsInCtx".
+
 	* OpenChange/MAPIStoreTypes.m (NSObjectFromValuePointer):
 	simplified method by using set_SPropValue_proptag and
 	NSObjectFromSPropValue.
 
 	* OpenChange/NSObject+MAPIStore.m (-getValue:forTag:inMemCtx:):
 	renamed from "getMAPIValue:...".
-	(-asArrayOfUnicodeStringsInMemCtx:) renamed from "asArrayOfUnicodeStringsInCtx".
 	(-arrayFromMAPIMVLong:, +arrayFromMAPIMVUnicode:)
 	(+arrayFromMAPIMVString:, +arrayFromMAPIMVBinary:)
 	(+arrayFromMAPIMVGuid:, +arrayFromMVShort:, +arrayFromMVLong:)
diff --git a/OpenChange/MAPIStoreContactsMessage.m b/OpenChange/MAPIStoreContactsMessage.m
index 3f6ac687e..97719f449 100644
--- a/OpenChange/MAPIStoreContactsMessage.m
+++ b/OpenChange/MAPIStoreContactsMessage.m
@@ -245,7 +245,7 @@
   if (!stringValue)
     stringValue = @"";
   *data = [[NSArray arrayWithObject: stringValue]
-            asArrayOfUnicodeStringsInMemCtx: memCtx];
+            asMVUnicodeInMemCtx: memCtx];
 
   return MAPISTORE_SUCCESS;
 }
diff --git a/OpenChange/NSArray+MAPIStore.h b/OpenChange/NSArray+MAPIStore.h
index 86123a896..782594e05 100644
--- a/OpenChange/NSArray+MAPIStore.h
+++ b/OpenChange/NSArray+MAPIStore.h
@@ -39,7 +39,7 @@
 + (id) arrayFromMVI8: (const struct I8Array_r *) mvI8;
 + (id) arrayFromMVString: (const struct StringArray_r *) mvString;
 + (id) arrayFromMVUnicode: (const struct WStringArray_r *) mvUnicode;
-- (struct WStringArray_r *) asArrayOfUnicodeStringsInMemCtx: (void *) memCtx;
+- (struct WStringArray_r *) asMVUnicodeInMemCtx: (void *) memCtx;
 + (id) arrayFromMVBinary: (const struct BinaryArray_r *) mvBinary;
 + (id) arrayFromMVGuid: (const struct FlatUIDArray_r *) mvGuid;
 + (id) arrayFromMVFileTime: (const struct DateTimeArray_r *) mvGuid;
diff --git a/OpenChange/NSArray+MAPIStore.m b/OpenChange/NSArray+MAPIStore.m
index 1b9880d13..c0cf8d1ee 100644
--- a/OpenChange/NSArray+MAPIStore.m
+++ b/OpenChange/NSArray+MAPIStore.m
@@ -181,7 +181,7 @@
   return mvResult;
 }
 
-- (struct WStringArray_r *) asArrayOfUnicodeStringsInMemCtx: (void *) memCtx
+- (struct WStringArray_r *) asMVUnicodeInMemCtx: (void *) memCtx
 {
   struct WStringArray_r *list;
   NSInteger count, max;
diff --git a/OpenChange/NSObject+MAPIStore.m b/OpenChange/NSObject+MAPIStore.m
index aff1d8a6c..f2b9e8297 100644
--- a/OpenChange/NSObject+MAPIStore.m
+++ b/OpenChange/NSObject+MAPIStore.m
@@ -113,7 +113,7 @@ static int MAPIStoreTallocWrapperDestroy (void *data)
       break;
 
     case PT_MV_UNICODE:
-      *data = [(NSArray *) self asArrayOfUnicodeStringsInMemCtx: memCtx];
+      *data = [(NSArray *) self asMVUnicodeInMemCtx: memCtx];
       break;
 
     default: