diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundHashOperations.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundHashOperations.java
index 269a4c314..a2d5a5f11 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundHashOperations.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/BoundHashOperations.java
@@ -34,11 +34,11 @@ public interface BoundHashOperations<H, HK, HV> extends KeyBound<H> {
 
 	HV get(Object key);
 
-	void set(HK key, HV value);
+	void put(HK key, HV value);
 
 	Collection<HV> multiGet(Collection<HK> keys);
 
-	void multiSet(Map<? extends HK, ? extends HV> m);
+	void putAll(Map<? extends HK, ? extends HV> m);
 
 	Set<HK> keys();
 
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundHashOperations.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundHashOperations.java
index c18dac213..d0ef05c01 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundHashOperations.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/DefaultBoundHashOperations.java
@@ -80,13 +80,13 @@ class DefaultBoundHashOperations<H, HK, HV> extends DefaultKeyBound<H> implement
 	}
 
 	@Override
-	public void multiSet(Map<? extends HK, ? extends HV> m) {
-		ops.multiSet(getKey(), m);
+	public void putAll(Map<? extends HK, ? extends HV> m) {
+		ops.putAll(getKey(), m);
 	}
 
 	@Override
-	public void set(HK key, HV value) {
-		ops.set(getKey(), key, value);
+	public void put(HK key, HV value) {
+		ops.put(getKey(), key, value);
 	}
 
 	@Override
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/HashOperations.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/HashOperations.java
index 54343d455..fb780fa16 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/HashOperations.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/HashOperations.java
@@ -40,9 +40,9 @@ public interface HashOperations<H, HK, HV> {
 
 	Long size(H key);
 
-	void multiSet(H key, Map<? extends HK, ? extends HV> m);
+	void putAll(H key, Map<? extends HK, ? extends HV> m);
 
-	void set(H key, HK hashKey, HV value);
+	void put(H key, HK hashKey, HV value);
 
 	Collection<HV> values(H key);
 
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
index 36222a0d7..bcb089c6e 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/core/RedisTemplate.java
@@ -1542,7 +1542,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}
 
 		@Override
-		public void multiSet(K key, Map<? extends HK, ? extends HV> m) {
+		public void putAll(K key, Map<? extends HK, ? extends HV> m) {
 			if (m.isEmpty()) {
 				return;
 			}
@@ -1592,7 +1592,7 @@ public class RedisTemplate<K, V> extends RedisAccessor implements RedisOperation
 		}
 
 		@Override
-		public void set(K key, HK hashKey, HV value) {
+		public void put(K key, HK hashKey, HV value) {
 			final byte[] rawKey = rawKey(key);
 			final byte[] rawHashKey = rawHashKey(hashKey);
 			final byte[] rawHashValue = rawHashValue(value);
diff --git a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisMap.java b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisMap.java
index e04a53552..0d82b02e2 100644
--- a/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisMap.java
+++ b/spring-data-redis/src/main/java/org/springframework/data/keyvalue/redis/support/collections/DefaultRedisMap.java
@@ -143,13 +143,13 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 	@Override
 	public V put(K key, V value) {
 		V oldV = get(key);
-		hashOps.set(key, value);
+		hashOps.put(key, value);
 		return oldV;
 	}
 
 	@Override
 	public void putAll(Map<? extends K, ? extends V> m) {
-		hashOps.multiSet(m);
+		hashOps.putAll(m);
 	}
 
 	@Override