diff --git a/README.md b/README.md
index 2251fd1a1e..75eb9b9701 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Travis:   [![Travis](https://travis-ci.org/aspnet/SignalR.svg?branch=dev)](https
 
 ASP.NET Core SignalR is a new library for ASP.NET Core developers that makes it incredibly simple to add real-time web functionality to your applications. What is "real-time web" functionality? It's the ability to have your server-side code push content to the connected clients as it happens, in real-time.
 
-You can watch an introductory presentation here - [Introducing ASP.NET Core Sockets](https://vimeo.com/204078084).
+You can watch an introductory presentation here - [Introducing ASP.NET Core SignalR](https://www.youtube.com/watch?v=fgTu-xYFDdM)
 
 This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.
 
diff --git a/samples/SignalRSamples/wwwroot/index.html b/samples/SignalRSamples/wwwroot/index.html
index b1c78f1c2e..364424e20d 100644
--- a/samples/SignalRSamples/wwwroot/index.html
+++ b/samples/SignalRSamples/wwwroot/index.html
@@ -5,7 +5,7 @@
     <title></title>
 </head>
 <body>
-    <h1>ASP.NET Core Sockets</h1>
+    <h1>ASP.NET Core Connections</h1>
     <ul>
         <li><a href="sockets.html?transport=LongPolling">Long polling</a></li>
         <li><a href="sockets.html?transport=ServerSentEvents">Server Sent Events</a></li>
diff --git a/src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs b/src/Microsoft.AspNetCore.SignalR.Core/SignalRConnectionBuilderExtensions.cs
similarity index 89%
rename from src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs
rename to src/Microsoft.AspNetCore.SignalR.Core/SignalRConnectionBuilderExtensions.cs
index fdd2d54f5a..8be4f78179 100644
--- a/src/Microsoft.AspNetCore.SignalR.Core/SignalRSocketBuilderExtensions.cs
+++ b/src/Microsoft.AspNetCore.SignalR.Core/SignalRConnectionBuilderExtensions.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNetCore.Connections;
 
 namespace Microsoft.AspNetCore.SignalR
 {
-    public static class SignalRSocketBuilderExtensions
+    public static class SignalRConnectionBuilderExtensions
     {
         public static IConnectionBuilder UseHub<THub>(this IConnectionBuilder connectionBuilder) where THub : Hub
         {
