diff --git a/.gitignore b/.gitignore
index 6e02278d4c..93aa307b37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ runtimes/
 .testPublish/
 launchSettings.json
 node_modules/
+npm-debug.log
 *.tmp
 *.nuget.props
 *.nuget.targets
diff --git a/samples/ChatSample/Views/Home/Index.cshtml b/samples/ChatSample/Views/Home/Index.cshtml
index 02716de06a..686bffa382 100644
--- a/samples/ChatSample/Views/Home/Index.cshtml
+++ b/samples/ChatSample/Views/Home/Index.cshtml
@@ -14,7 +14,7 @@
 </div>
 <script src="lib/signalr-client/signalr-client.js"></script>
 <script>
-let connection = new signalR.RpcConnection(`http://${document.location.host}/chat`, 'formatType=json&format=text');
+let connection = new signalR.HubConnection(`http://${document.location.host}/chat`, 'formatType=json&format=text');
 
 connection.on('Send', function (message) {
     var child = document.createElement('li');
diff --git a/samples/SocketsSample/wwwroot/hubs.html b/samples/SocketsSample/wwwroot/hubs.html
index 68a0cbb13d..d8f6d3828b 100644
--- a/samples/SocketsSample/wwwroot/hubs.html
+++ b/samples/SocketsSample/wwwroot/hubs.html
@@ -108,7 +108,7 @@ let transport = getParameterByName('transport') || 'webSockets';
 
 document.getElementById('head1').innerHTML = transport;
 
-let connection = new signalR.RpcConnection(`http://${document.location.host}/hubs`, 'formatType=json&format=text');
+let connection = new signalR.HubConnection(`http://${document.location.host}/hubs`, 'formatType=json&format=text');
 connection.on('Send', msg => {
     addLine(msg);
 });
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/RpcConnection.ts b/src/Microsoft.AspNetCore.SignalR.Client.TS/HubConnection.ts
similarity index 96%
rename from src/Microsoft.AspNetCore.SignalR.Client.TS/RpcConnection.ts
rename to src/Microsoft.AspNetCore.SignalR.Client.TS/HubConnection.ts
index c7a3bb5363..ae5f530519 100644
--- a/src/Microsoft.AspNetCore.SignalR.Client.TS/RpcConnection.ts
+++ b/src/Microsoft.AspNetCore.SignalR.Client.TS/HubConnection.ts
@@ -12,7 +12,7 @@ interface InvocationResultDescriptor {
     readonly Result: any;
 }
 
-export class RpcConnection {
+export class HubConnection {
     private connection: Connection;
     private callbacks: Map<string, (any) => void>;
     private methods: Map<string, (...args:any[]) => void>;
@@ -21,9 +21,9 @@ export class RpcConnection {
     constructor(url: string, queryString?: string) {
         this.connection = new Connection(url, queryString);
 
-        let thisRpcConnection = this;
+        let thisHubConnection = this;
         this.connection.dataReceived = data => {
-            thisRpcConnection.dataReceived(data);
+            thisHubConnection.dataReceived(data);
         };
 
         this.callbacks = new Map<string, (any) => void>();
diff --git a/src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js b/src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js
index 5888aeec86..33b93b7989 100644
--- a/src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js
+++ b/src/Microsoft.AspNetCore.SignalR.Client.TS/gulpfile.js
@@ -19,7 +19,7 @@ gulp.task('compile-ts-client', () => {
 });
 
 gulp.task('browserify-client', ['compile-ts-client'], () => {
-    return browserify(clientOutDir + '/RpcConnection.js', {standalone: 'signalR'})
+    return browserify(clientOutDir + '/HubConnection.js', {standalone: 'signalR'})
         .bundle()
         .pipe(source('signalr-client.js'))
         .pipe(gulp.dest(clientOutDir + '/../signalr-client-bundle'));