diff --git a/server.go b/server.go
index 05d2d1534..55932be72 100644
--- a/server.go
+++ b/server.go
@@ -48,7 +48,7 @@ func NewServer(tlsConfig *tls.Config, cb StreamCallback) (*Server, error) {
 		scfg:           scfg,
 		streamCallback: cb,
 		sessions:       map[protocol.ConnectionID]packetHandler{},
-		newSession:     NewSession,
+		newSession:     newSession,
 	}, nil
 }
 
diff --git a/session.go b/session.go
index 5cefe8c36..5da7fbb5f 100644
--- a/session.go
+++ b/session.go
@@ -75,8 +75,8 @@ type Session struct {
 	congestion congestion.SendAlgorithm
 }
 
-// NewSession makes a new session
-func NewSession(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback CloseCallback) packetHandler {
+// newSession makes a new session
+func newSession(conn connection, v protocol.VersionNumber, connectionID protocol.ConnectionID, sCfg *handshake.ServerConfig, streamCallback StreamCallback, closeCallback CloseCallback) packetHandler {
 	stopWaitingManager := ackhandler.NewStopWaitingManager()
 	session := &Session{
 		connectionID:                connectionID,
diff --git a/session_test.go b/session_test.go
index 5464a8bbf..b8c8ba23e 100644
--- a/session_test.go
+++ b/session_test.go
@@ -314,7 +314,7 @@ var _ = Describe("Session", func() {
 			Expect(err).ToNot(HaveOccurred())
 			scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
 			nGoRoutinesBefore = runtime.NumGoroutine()
-			session = NewSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) { closed = true }).(*Session)
+			session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) { closed = true }).(*Session)
 			go session.Run()
 			Eventually(func() int { return runtime.NumGoroutine() }).Should(Equal(nGoRoutinesBefore + 2))
 		})
@@ -346,7 +346,7 @@ var _ = Describe("Session", func() {
 			signer, err := crypto.NewRSASigner(testdata.GetTLSConfig())
 			Expect(err).ToNot(HaveOccurred())
 			scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
-			session = NewSession(conn, 0, 0, scfg, nil, nil).(*Session)
+			session = newSession(conn, 0, 0, scfg, nil, nil).(*Session)
 		})
 
 		It("sends ack frames", func() {
@@ -415,7 +415,7 @@ var _ = Describe("Session", func() {
 			signer, err := crypto.NewRSASigner(testdata.GetTLSConfig())
 			Expect(err).ToNot(HaveOccurred())
 			scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
-			session = NewSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
+			session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
 		})
 
 		It("sends after queuing a stream frame", func() {
@@ -514,7 +514,7 @@ var _ = Describe("Session", func() {
 		signer, err := crypto.NewRSASigner(testdata.GetTLSConfig())
 		Expect(err).ToNot(HaveOccurred())
 		scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
-		session = NewSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
+		session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
 		s, err := session.NewStream(3)
 		Expect(err).NotTo(HaveOccurred())
 		err = session.handleStreamFrame(&frames.StreamFrame{
@@ -531,7 +531,7 @@ var _ = Describe("Session", func() {
 		signer, err := crypto.NewRSASigner(testdata.GetTLSConfig())
 		Expect(err).ToNot(HaveOccurred())
 		scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
-		session = NewSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
+		session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
 
 		// Write protocol.MaxUndecryptablePackets and expect a public reset to happen
 		for i := 0; i < protocol.MaxUndecryptablePackets; i++ {
@@ -550,7 +550,7 @@ var _ = Describe("Session", func() {
 		signer, err := crypto.NewRSASigner(testdata.GetTLSConfig())
 		Expect(err).ToNot(HaveOccurred())
 		scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
-		session = NewSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
+		session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
 		session.undecryptablePackets = []receivedPacket{{
 			nil,
 			&PublicHeader{PacketNumber: protocol.PacketNumber(42)},
@@ -582,7 +582,7 @@ var _ = Describe("Session", func() {
 			signer, err := crypto.NewRSASigner(testdata.GetTLSConfig())
 			Expect(err).ToNot(HaveOccurred())
 			scfg := handshake.NewServerConfig(crypto.NewCurve25519KEX(), signer)
-			session = NewSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
+			session = newSession(conn, 0, 0, scfg, nil, func(protocol.ConnectionID) {}).(*Session)
 
 			cong = &mockCongestion{}
 			session.congestion = cong