diff --git a/spring-web/src/main/java/org/springframework/web/server/session/HeaderSessionIdResolver.java b/spring-web/src/main/java/org/springframework/web/server/session/HeaderWebSessionIdResolver.java
similarity index 76%
rename from spring-web/src/main/java/org/springframework/web/server/session/HeaderSessionIdResolver.java
rename to spring-web/src/main/java/org/springframework/web/server/session/HeaderWebSessionIdResolver.java
index e08de13c901..3845e293b54 100644
--- a/spring-web/src/main/java/org/springframework/web/server/session/HeaderSessionIdResolver.java
+++ b/spring-web/src/main/java/org/springframework/web/server/session/HeaderWebSessionIdResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,18 +23,21 @@ import org.springframework.util.Assert;
 import org.springframework.web.server.ServerWebExchange;
 
 /**
- * Header-based {@link WebSessionIdResolver}.
+ * Request and response header-based {@link WebSessionIdResolver}.
  * 
  * @author Greg Turnquist
  * @since 5.0
  */
-public class HeaderSessionIdResolver implements WebSessionIdResolver {
+public class HeaderWebSessionIdResolver implements WebSessionIdResolver {
 
 	private String headerName = "SESSION";
 
+
 	/**
 	 * Set the name of the session header to use for the session id.
-	 * <p>By default set to "SESSION".
+	 * The name is used to extract the session id from the request headers as
+	 * well to set the session id on the response headers.
+	 * <p>By default set to {@literal "SESSION"}.
 	 * @param headerName the header name
 	 */
 	public void setHeaderName(String headerName) {
@@ -49,24 +52,22 @@ public class HeaderSessionIdResolver implements WebSessionIdResolver {
 		return this.headerName;
 	}
 
+
 	@Override
 	public List<String> resolveSessionIds(ServerWebExchange exchange) {
 		HttpHeaders headers = exchange.getRequest().getHeaders();
-		List<String> sessionHeaders = headers.get(this.getHeaderName());
-		if (sessionHeaders == null) {
-			return Collections.emptyList();
-		}
-		return sessionHeaders;
+		return headers.getOrDefault(getHeaderName(), Collections.emptyList());
 	}
 
 	@Override
 	public void setSessionId(ServerWebExchange exchange, String id) {
 		Assert.notNull(id, "'id' is required.");
-		exchange.getResponse().getHeaders().set(this.headerName, id);
+		exchange.getResponse().getHeaders().set(getHeaderName(), id);
 	}
 
 	@Override
 	public void expireSession(ServerWebExchange exchange) {
 		this.setSessionId(exchange, "");
 	}
+
 }
diff --git a/spring-web/src/test/java/org/springframework/web/server/session/HeaderSessionIdResolverTests.java b/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java
similarity index 89%
rename from spring-web/src/test/java/org/springframework/web/server/session/HeaderSessionIdResolverTests.java
rename to spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java
index b1b5a9374be..d0d4a7117a0 100644
--- a/spring-web/src/test/java/org/springframework/web/server/session/HeaderSessionIdResolverTests.java
+++ b/spring-web/src/test/java/org/springframework/web/server/session/HeaderWebSessionIdResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 the original author or authors.
+ * Copyright 2002-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,6 @@
  */
 package org.springframework.web.server.session;
 
-import static org.hamcrest.collection.IsCollectionWithSize.*;
-import static org.hamcrest.core.Is.*;
-import static org.hamcrest.core.IsCollectionContaining.*;
-import static org.junit.Assert.*;
-
 import java.time.Clock;
 import java.time.Duration;
 import java.time.Instant;
@@ -29,6 +24,7 @@ import java.util.UUID;
 import org.junit.Before;
 import org.junit.Test;
 import reactor.core.publisher.Mono;
+
 import org.springframework.http.codec.ServerCodecConfigurer;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpRequest;
 import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse;
@@ -37,24 +33,36 @@ import org.springframework.web.server.WebSession;
 import org.springframework.web.server.adapter.DefaultServerWebExchange;
 import org.springframework.web.server.i18n.AcceptHeaderLocaleContextResolver;
 
+import static org.hamcrest.collection.IsCollectionWithSize.hasSize;
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsCollectionContaining.hasItem;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+
 /**
- * Tests using {@link HeaderSessionIdResolver}.
+ * Tests using {@link HeaderWebSessionIdResolver}.
  *
  * @author Greg Turnquist
  */
-public class HeaderSessionIdResolverTests {
+public class HeaderWebSessionIdResolverTests {
 
 	private static final Clock CLOCK = Clock.system(ZoneId.of("GMT"));
 
-	private HeaderSessionIdResolver idResolver;
+
+	private HeaderWebSessionIdResolver idResolver;
 
 	private DefaultWebSessionManager manager;
 
 	private ServerWebExchange exchange;
 
+
 	@Before
 	public void setUp() {
-		this.idResolver = new HeaderSessionIdResolver();
+		this.idResolver = new HeaderWebSessionIdResolver();
 		this.manager = new DefaultWebSessionManager();
 		this.manager.setSessionIdResolver(this.idResolver);
 
@@ -172,4 +180,5 @@ public class HeaderSessionIdResolverTests {
 	private DefaultWebSession createDefaultWebSession(UUID sessionId) {
 		return new DefaultWebSession(() -> sessionId, CLOCK, (s, session) -> Mono.empty(), s -> Mono.empty());
 	}
+
 }