diff --git a/src/db.c b/src/db.c
index d33c810b3..c7940d735 100644
--- a/src/db.c
+++ b/src/db.c
@@ -943,7 +943,7 @@ void setExpire(redisDb *db, robj *key, long long when) {
     /* Reuse the sds from the main dict in the expire dict */
     kde = dictFind(db->dict,key->ptr);
     serverAssertWithInfo(NULL,key,kde != NULL);
-    de = dictReplaceRaw(db->expires,dictGetKey(kde));
+    de = dictAddOrFind(db->expires,dictGetKey(kde));
     dictSetSignedIntegerVal(de,when);
 }
 
diff --git a/src/dict.c b/src/dict.c
index 5e327a794..04dfae6cc 100644
--- a/src/dict.c
+++ b/src/dict.c
@@ -395,13 +395,13 @@ int dictReplace(dict *d, void *key, void *val)
 }
 
 /* Add or Find:
- * dictReplaceRaw() is simply a version of dictAddRaw() that always
+ * dictAddOrFind() is simply a version of dictAddRaw() that always
  * returns the hash entry of the specified key, even if the key already
  * exists and can't be added (in that case the entry of the already
  * existing key is returned.)
  *
  * See dictAddRaw() for more information. */
-dictEntry *dictReplaceRaw(dict *d, void *key) {
+dictEntry *dictAddOrFind(dict *d, void *key) {
     dictEntry *entry, *existing;
     entry = dictAddRaw(d,key,&existing);
     return entry ? entry : existing;
diff --git a/src/dict.h b/src/dict.h
index 406fa36d8..04b247a25 100644
--- a/src/dict.h
+++ b/src/dict.h
@@ -151,8 +151,8 @@ dict *dictCreate(dictType *type, void *privDataPtr);
 int dictExpand(dict *d, unsigned long size);
 int dictAdd(dict *d, void *key, void *val);
 dictEntry *dictAddRaw(dict *d, void *key, dictEntry **existing);
+dictEntry *dictAddOrFind(dict *d, void *key);
 int dictReplace(dict *d, void *key, void *val);
-dictEntry *dictReplaceRaw(dict *d, void *key);
 int dictDelete(dict *d, const void *key);
 dictEntry *dictUnlink(dict *ht, const void *key);
 void dictFreeUnlinkedEntry(dict *d, dictEntry *he);