diff --git a/code2yaml.json b/code2yaml.json
index 08ca2b4..9d8f5ed 100644
--- a/code2yaml.json
+++ b/code2yaml.json
@@ -1,5 +1,7 @@
 {
-    "input_paths": ["src/aspnet-signalr-java/clients/java/signalr/src/main/java"],
+    "input_paths": [
+        "src/aspnet-signalr-java/src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr"
+    ],
     "exclude_paths": [],
     "language": "java"
   }
diff --git a/docs-ref-autogen/com.microsoft.signalr.Action.yml b/docs-ref-autogen/com.microsoft.signalr.Action.yml
new file mode 100644
index 0000000..2e2e2e9
--- /dev/null
+++ b/docs-ref-autogen/com.microsoft.signalr.Action.yml
@@ -0,0 +1,49 @@
+### YamlMime:ManagedReference
+items:
+- uid: com.microsoft.signalr.Action
+  id: Action
+  parent: com.microsoft.signalr
+  children:
+  - com.microsoft.signalr.Action.invoke()
+  href: com.microsoft.signalr.Action.yml
+  langs:
+  - java
+  name: Action
+  nameWithType: Action
+  fullName: com.microsoft.signalr.Action
+  type: Interface
+  source:
+    remote: &o0
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
+      branch: release/2.2
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
+    startLine: 8
+  package: com.microsoft.signalr
+  summary: "<p>A callback that takes no parameters. </p>"
+  syntax:
+    content: public interface Action
+- uid: com.microsoft.signalr.Action.invoke()
+  id: invoke()
+  parent: com.microsoft.signalr.Action
+  href: com.microsoft.signalr.Action.yml
+  langs:
+  - java
+  name: invoke()
+  nameWithType: Action.invoke()
+  fullName: com.microsoft.signalr.Action.invoke()
+  overload: com.microsoft.signalr.Action.invoke*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
+    startLine: 11
+  package: com.microsoft.signalr
+  syntax:
+    content: public void invoke()
+references:
+- uid: com.microsoft.signalr.Action.invoke*
+  name: invoke
+  nameWithType: Action.invoke
+  fullName: com.microsoft.signalr.Action.invoke
+  package: com.microsoft.signalr
diff --git a/docs-ref-autogen/com.microsoft.signalr._action1.yml b/docs-ref-autogen/com.microsoft.signalr.Action1.yml
similarity index 56%
rename from docs-ref-autogen/com.microsoft.signalr._action1.yml
rename to docs-ref-autogen/com.microsoft.signalr.Action1.yml
index 9735946..86fdaf1 100644
--- a/docs-ref-autogen/com.microsoft.signalr._action1.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.Action1.yml
@@ -1,11 +1,11 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._action1
-  id: _action1
+- uid: com.microsoft.signalr.Action1
+  id: Action1
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._action1.invoke(T1)
-  href: com.microsoft.signalr._action1.yml
+  - com.microsoft.signalr.Action1.invoke(T1)
+  href: com.microsoft.signalr.Action1.yml
   langs:
   - java
   name: Action1<T1>
@@ -14,37 +14,34 @@ items:
   type: Interface
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
-    startLine: 11
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
+    startLine: 10
   package: com.microsoft.signalr
-  summary: >-
-    <p>A callback that takes one parameter.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes one parameter.</p>\r\n<p></p>"
   syntax:
     content: public interface Action1<T1>
     typeParameters:
     - id: T1
       type: ea9d49ce
       description: <p>The type of the first parameter to the callback. </p>
-- uid: com.microsoft.signalr._action1.invoke(T1)
+- uid: com.microsoft.signalr.Action1.invoke(T1)
   id: invoke(T1)
-  parent: com.microsoft.signalr._action1
-  href: com.microsoft.signalr._action1.yml
+  parent: com.microsoft.signalr.Action1
+  href: com.microsoft.signalr.Action1.yml
   langs:
   - java
   name: invoke(T1 param1)
   nameWithType: Action1<T1>.invoke(T1 param1)
   fullName: com.microsoft.signalr.Action1<T1>.invoke(T1 param1)
-  overload: com.microsoft.signalr._action1.invoke*
+  overload: com.microsoft.signalr.Action1.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
-    startLine: 12
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action1.java
+    startLine: 13
   package: com.microsoft.signalr
   syntax:
     content: public void invoke(T1 param1)
@@ -56,7 +53,7 @@ references:
   spec.java:
   - name: T1
     fullName: T1
-- uid: com.microsoft.signalr._action1.invoke*
+- uid: com.microsoft.signalr.Action1.invoke*
   name: invoke
   nameWithType: Action1<T1>.invoke
   fullName: com.microsoft.signalr.Action1<T1>.invoke
diff --git a/docs-ref-autogen/com.microsoft.signalr._action2.yml b/docs-ref-autogen/com.microsoft.signalr.Action2.yml
similarity index 62%
rename from docs-ref-autogen/com.microsoft.signalr._action2.yml
rename to docs-ref-autogen/com.microsoft.signalr.Action2.yml
index 06e1132..feffdc1 100644
--- a/docs-ref-autogen/com.microsoft.signalr._action2.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.Action2.yml
@@ -1,11 +1,11 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._action2
-  id: _action2
+- uid: com.microsoft.signalr.Action2
+  id: Action2
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._action2.invoke(T1,T2)
-  href: com.microsoft.signalr._action2.yml
+  - com.microsoft.signalr.Action2.invoke(T1,T2)
+  href: com.microsoft.signalr.Action2.yml
   langs:
   - java
   name: Action2<T1,T2>
@@ -14,16 +14,13 @@ items:
   type: Interface
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
-    startLine: 12
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
+    startLine: 11
   package: com.microsoft.signalr
-  summary: >-
-    <p>A callback that takes two parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes two parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action2<T1,T2>
     typeParameters:
@@ -33,21 +30,21 @@ items:
     - id: T2
       type: 6ac4d271
       description: <p>The type of the second parameter to the callback. </p>
-- uid: com.microsoft.signalr._action2.invoke(T1,T2)
+- uid: com.microsoft.signalr.Action2.invoke(T1,T2)
   id: invoke(T1,T2)
-  parent: com.microsoft.signalr._action2
-  href: com.microsoft.signalr._action2.yml
+  parent: com.microsoft.signalr.Action2
+  href: com.microsoft.signalr.Action2.yml
   langs:
   - java
   name: invoke(T1 param1, T2 param2)
   nameWithType: Action2<T1,T2>.invoke(T1 param1, T2 param2)
   fullName: com.microsoft.signalr.Action2<T1, T2>.invoke(T1 param1, T2 param2)
-  overload: com.microsoft.signalr._action2.invoke*
+  overload: com.microsoft.signalr.Action2.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
-    startLine: 13
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action2.java
+    startLine: 14
   package: com.microsoft.signalr
   syntax:
     content: public void invoke(T1 param1, T2 param2)
@@ -65,7 +62,7 @@ references:
   spec.java:
   - name: T2
     fullName: T2
-- uid: com.microsoft.signalr._action2.invoke*
+- uid: com.microsoft.signalr.Action2.invoke*
   name: invoke
   nameWithType: Action2<T1,T2>.invoke
   fullName: com.microsoft.signalr.Action2<T1, T2>.invoke
diff --git a/docs-ref-autogen/com.microsoft.signalr._action3.yml b/docs-ref-autogen/com.microsoft.signalr.Action3.yml
similarity index 66%
rename from docs-ref-autogen/com.microsoft.signalr._action3.yml
rename to docs-ref-autogen/com.microsoft.signalr.Action3.yml
index 2ffad93..4390653 100644
--- a/docs-ref-autogen/com.microsoft.signalr._action3.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.Action3.yml
@@ -1,11 +1,11 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._action3
-  id: _action3
+- uid: com.microsoft.signalr.Action3
+  id: Action3
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._action3.invoke(T1,T2,T3)
-  href: com.microsoft.signalr._action3.yml
+  - com.microsoft.signalr.Action3.invoke(T1,T2,T3)
+  href: com.microsoft.signalr.Action3.yml
   langs:
   - java
   name: Action3<T1,T2,T3>
@@ -14,16 +14,13 @@ items:
   type: Interface
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
-    startLine: 13
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
+    startLine: 12
   package: com.microsoft.signalr
-  summary: >-
-    <p>A callback that takes three parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes three parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action3<T1,T2,T3>
     typeParameters:
@@ -36,21 +33,21 @@ items:
     - id: T3
       type: e92ab054
       description: <p>The type of the third parameter to the callback. </p>
-- uid: com.microsoft.signalr._action3.invoke(T1,T2,T3)
+- uid: com.microsoft.signalr.Action3.invoke(T1,T2,T3)
   id: invoke(T1,T2,T3)
-  parent: com.microsoft.signalr._action3
-  href: com.microsoft.signalr._action3.yml
+  parent: com.microsoft.signalr.Action3
+  href: com.microsoft.signalr.Action3.yml
   langs:
   - java
   name: invoke(T1 param1, T2 param2, T3 param3)
   nameWithType: Action3<T1,T2,T3>.invoke(T1 param1, T2 param2, T3 param3)
   fullName: com.microsoft.signalr.Action3<T1, T2, T3>.invoke(T1 param1, T2 param2, T3 param3)
-  overload: com.microsoft.signalr._action3.invoke*
+  overload: com.microsoft.signalr.Action3.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
-    startLine: 14
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action3.java
+    startLine: 15
   package: com.microsoft.signalr
   syntax:
     content: public void invoke(T1 param1, T2 param2, T3 param3)
@@ -74,7 +71,7 @@ references:
   spec.java:
   - name: T3
     fullName: T3
-- uid: com.microsoft.signalr._action3.invoke*
+- uid: com.microsoft.signalr.Action3.invoke*
   name: invoke
   nameWithType: Action3<T1,T2,T3>.invoke
   fullName: com.microsoft.signalr.Action3<T1, T2, T3>.invoke
diff --git a/docs-ref-autogen/com.microsoft.signalr._action4.yml b/docs-ref-autogen/com.microsoft.signalr.Action4.yml
similarity index 69%
rename from docs-ref-autogen/com.microsoft.signalr._action4.yml
rename to docs-ref-autogen/com.microsoft.signalr.Action4.yml
index 67e7a6d..45b69ff 100644
--- a/docs-ref-autogen/com.microsoft.signalr._action4.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.Action4.yml
@@ -1,11 +1,11 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._action4
-  id: _action4
+- uid: com.microsoft.signalr.Action4
+  id: Action4
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._action4.invoke(T1,T2,T3,T4)
-  href: com.microsoft.signalr._action4.yml
+  - com.microsoft.signalr.Action4.invoke(T1,T2,T3,T4)
+  href: com.microsoft.signalr.Action4.yml
   langs:
   - java
   name: Action4<T1,T2,T3,T4>
@@ -14,16 +14,13 @@ items:
   type: Interface
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
-    startLine: 14
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
+    startLine: 13
   package: com.microsoft.signalr
-  summary: >-
-    <p>A callback that takes four parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes four parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action4<T1,T2,T3,T4>
     typeParameters:
@@ -39,21 +36,21 @@ items:
     - id: T4
       type: 21b77ff4
       description: <p>The type of the fourth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action4.invoke(T1,T2,T3,T4)
+- uid: com.microsoft.signalr.Action4.invoke(T1,T2,T3,T4)
   id: invoke(T1,T2,T3,T4)
-  parent: com.microsoft.signalr._action4
-  href: com.microsoft.signalr._action4.yml
+  parent: com.microsoft.signalr.Action4
+  href: com.microsoft.signalr.Action4.yml
   langs:
   - java
   name: invoke(T1 param1, T2 param2, T3 param3, T4 param4)
   nameWithType: Action4<T1,T2,T3,T4>.invoke(T1 param1, T2 param2, T3 param3, T4 param4)
   fullName: com.microsoft.signalr.Action4<T1, T2, T3, T4>.invoke(T1 param1, T2 param2, T3 param3, T4 param4)
-  overload: com.microsoft.signalr._action4.invoke*
+  overload: com.microsoft.signalr.Action4.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
-    startLine: 15
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action4.java
+    startLine: 16
   package: com.microsoft.signalr
   syntax:
     content: public void invoke(T1 param1, T2 param2, T3 param3, T4 param4)
@@ -83,7 +80,7 @@ references:
   spec.java:
   - name: T4
     fullName: T4
-- uid: com.microsoft.signalr._action4.invoke*
+- uid: com.microsoft.signalr.Action4.invoke*
   name: invoke
   nameWithType: Action4<T1,T2,T3,T4>.invoke
   fullName: com.microsoft.signalr.Action4<T1, T2, T3, T4>.invoke
diff --git a/docs-ref-autogen/com.microsoft.signalr._action5.yml b/docs-ref-autogen/com.microsoft.signalr.Action5.yml
similarity index 72%
rename from docs-ref-autogen/com.microsoft.signalr._action5.yml
rename to docs-ref-autogen/com.microsoft.signalr.Action5.yml
index 4882a42..c61a075 100644
--- a/docs-ref-autogen/com.microsoft.signalr._action5.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.Action5.yml
@@ -1,11 +1,11 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._action5
-  id: _action5
+- uid: com.microsoft.signalr.Action5
+  id: Action5
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._action5.invoke(T1,T2,T3,T4,T5)
-  href: com.microsoft.signalr._action5.yml
+  - com.microsoft.signalr.Action5.invoke(T1,T2,T3,T4,T5)
+  href: com.microsoft.signalr.Action5.yml
   langs:
   - java
   name: Action5<T1,T2,T3,T4,T5>
@@ -14,16 +14,13 @@ items:
   type: Interface
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
-    startLine: 15
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
+    startLine: 14
   package: com.microsoft.signalr
-  summary: >-
-    <p>A callback that takes five parameter.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes five parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action5<T1,T2,T3,T4,T5>
     typeParameters:
@@ -42,21 +39,21 @@ items:
     - id: T5
       type: 136da300
       description: <p>The type of the fifth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action5.invoke(T1,T2,T3,T4,T5)
+- uid: com.microsoft.signalr.Action5.invoke(T1,T2,T3,T4,T5)
   id: invoke(T1,T2,T3,T4,T5)
-  parent: com.microsoft.signalr._action5
-  href: com.microsoft.signalr._action5.yml
+  parent: com.microsoft.signalr.Action5
+  href: com.microsoft.signalr.Action5.yml
   langs:
   - java
   name: invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5)
   nameWithType: Action5<T1,T2,T3,T4,T5>.invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5)
   fullName: com.microsoft.signalr.Action5<T1, T2, T3, T4, T5>.invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5)
-  overload: com.microsoft.signalr._action5.invoke*
+  overload: com.microsoft.signalr.Action5.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
-    startLine: 16
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action5.java
+    startLine: 17
   package: com.microsoft.signalr
   syntax:
     content: public void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5)
@@ -92,7 +89,7 @@ references:
   spec.java:
   - name: T5
     fullName: T5
-- uid: com.microsoft.signalr._action5.invoke*
+- uid: com.microsoft.signalr.Action5.invoke*
   name: invoke
   nameWithType: Action5<T1,T2,T3,T4,T5>.invoke
   fullName: com.microsoft.signalr.Action5<T1, T2, T3, T4, T5>.invoke
diff --git a/docs-ref-autogen/com.microsoft.signalr._action6.yml b/docs-ref-autogen/com.microsoft.signalr.Action6.yml
similarity index 74%
rename from docs-ref-autogen/com.microsoft.signalr._action6.yml
rename to docs-ref-autogen/com.microsoft.signalr.Action6.yml
index 11fd1e0..5184854 100644
--- a/docs-ref-autogen/com.microsoft.signalr._action6.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.Action6.yml
@@ -1,11 +1,11 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._action6
-  id: _action6
+- uid: com.microsoft.signalr.Action6
+  id: Action6
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._action6.invoke(T1,T2,T3,T4,T5,T6)
-  href: com.microsoft.signalr._action6.yml
+  - com.microsoft.signalr.Action6.invoke(T1,T2,T3,T4,T5,T6)
+  href: com.microsoft.signalr.Action6.yml
   langs:
   - java
   name: Action6<T1,T2,T3,T4,T5,T6>
@@ -14,16 +14,13 @@ items:
   type: Interface
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
-    startLine: 16
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
+    startLine: 15
   package: com.microsoft.signalr
-  summary: >-
-    <p>A callback that takes six parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes six parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action6<T1,T2,T3,T4,T5,T6>
     typeParameters:
@@ -45,21 +42,21 @@ items:
     - id: T6
       type: 43cd3771
       description: <p>The type of the sixth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action6.invoke(T1,T2,T3,T4,T5,T6)
+- uid: com.microsoft.signalr.Action6.invoke(T1,T2,T3,T4,T5,T6)
   id: invoke(T1,T2,T3,T4,T5,T6)
-  parent: com.microsoft.signalr._action6
-  href: com.microsoft.signalr._action6.yml
+  parent: com.microsoft.signalr.Action6
+  href: com.microsoft.signalr.Action6.yml
   langs:
   - java
   name: invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6)
   nameWithType: Action6<T1,T2,T3,T4,T5,T6>.invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6)
   fullName: com.microsoft.signalr.Action6<T1, T2, T3, T4, T5, T6>.invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6)
-  overload: com.microsoft.signalr._action6.invoke*
+  overload: com.microsoft.signalr.Action6.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
-    startLine: 17
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action6.java
+    startLine: 18
   package: com.microsoft.signalr
   syntax:
     content: public void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6)
@@ -101,7 +98,7 @@ references:
   spec.java:
   - name: T6
     fullName: T6
-- uid: com.microsoft.signalr._action6.invoke*
+- uid: com.microsoft.signalr.Action6.invoke*
   name: invoke
   nameWithType: Action6<T1,T2,T3,T4,T5,T6>.invoke
   fullName: com.microsoft.signalr.Action6<T1, T2, T3, T4, T5, T6>.invoke
diff --git a/docs-ref-autogen/com.microsoft.signalr._action7.yml b/docs-ref-autogen/com.microsoft.signalr.Action7.yml
similarity index 76%
rename from docs-ref-autogen/com.microsoft.signalr._action7.yml
rename to docs-ref-autogen/com.microsoft.signalr.Action7.yml
index ad7b60e..417d3f5 100644
--- a/docs-ref-autogen/com.microsoft.signalr._action7.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.Action7.yml
@@ -1,11 +1,11 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._action7
-  id: _action7
+- uid: com.microsoft.signalr.Action7
+  id: Action7
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._action7.invoke(T1,T2,T3,T4,T5,T6,T7)
-  href: com.microsoft.signalr._action7.yml
+  - com.microsoft.signalr.Action7.invoke(T1,T2,T3,T4,T5,T6,T7)
+  href: com.microsoft.signalr.Action7.yml
   langs:
   - java
   name: Action7<T1,T2,T3,T4,T5,T6,T7>
@@ -14,16 +14,13 @@ items:
   type: Interface
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
-    startLine: 17
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
+    startLine: 16
   package: com.microsoft.signalr
-  summary: >-
-    <p>A callback that takes seven parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes seven parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action7<T1,T2,T3,T4,T5,T6,T7>
     typeParameters:
@@ -48,21 +45,21 @@ items:
     - id: T7
       type: 308f4ff4
       description: <p>The type of the seventh parameter to the callback. </p>
-- uid: com.microsoft.signalr._action7.invoke(T1,T2,T3,T4,T5,T6,T7)
+- uid: com.microsoft.signalr.Action7.invoke(T1,T2,T3,T4,T5,T6,T7)
   id: invoke(T1,T2,T3,T4,T5,T6,T7)
-  parent: com.microsoft.signalr._action7
-  href: com.microsoft.signalr._action7.yml
+  parent: com.microsoft.signalr.Action7
+  href: com.microsoft.signalr.Action7.yml
   langs:
   - java
   name: invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7)
   nameWithType: Action7<T1,T2,T3,T4,T5,T6,T7>.invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7)
   fullName: com.microsoft.signalr.Action7<T1, T2, T3, T4, T5, T6, T7>.invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7)
-  overload: com.microsoft.signalr._action7.invoke*
+  overload: com.microsoft.signalr.Action7.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
-    startLine: 18
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action7.java
+    startLine: 19
   package: com.microsoft.signalr
   syntax:
     content: public void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7)
@@ -110,7 +107,7 @@ references:
   spec.java:
   - name: T7
     fullName: T7
-- uid: com.microsoft.signalr._action7.invoke*
+- uid: com.microsoft.signalr.Action7.invoke*
   name: invoke
   nameWithType: Action7<T1,T2,T3,T4,T5,T6,T7>.invoke
   fullName: com.microsoft.signalr.Action7<T1, T2, T3, T4, T5, T6, T7>.invoke
diff --git a/docs-ref-autogen/com.microsoft.signalr._action8.yml b/docs-ref-autogen/com.microsoft.signalr.Action8.yml
similarity index 78%
rename from docs-ref-autogen/com.microsoft.signalr._action8.yml
rename to docs-ref-autogen/com.microsoft.signalr.Action8.yml
index 271e163..4c2797b 100644
--- a/docs-ref-autogen/com.microsoft.signalr._action8.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.Action8.yml
@@ -1,11 +1,11 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._action8
-  id: _action8
+- uid: com.microsoft.signalr.Action8
+  id: Action8
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._action8.invoke(T1,T2,T3,T4,T5,T6,T7,T8)
-  href: com.microsoft.signalr._action8.yml
+  - com.microsoft.signalr.Action8.invoke(T1,T2,T3,T4,T5,T6,T7,T8)
+  href: com.microsoft.signalr.Action8.yml
   langs:
   - java
   name: Action8<T1,T2,T3,T4,T5,T6,T7,T8>
@@ -14,16 +14,13 @@ items:
   type: Interface
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
-    startLine: 18
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
+    startLine: 17
   package: com.microsoft.signalr
-  summary: >-
-    <p>A callback that takes eight parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes eight parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action8<T1,T2,T3,T4,T5,T6,T7,T8>
     typeParameters:
@@ -51,21 +48,21 @@ items:
     - id: T8
       type: 57f41c00
       description: <p>The type of the eighth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action8.invoke(T1,T2,T3,T4,T5,T6,T7,T8)
+- uid: com.microsoft.signalr.Action8.invoke(T1,T2,T3,T4,T5,T6,T7,T8)
   id: invoke(T1,T2,T3,T4,T5,T6,T7,T8)
-  parent: com.microsoft.signalr._action8
-  href: com.microsoft.signalr._action8.yml
+  parent: com.microsoft.signalr.Action8
+  href: com.microsoft.signalr.Action8.yml
   langs:
   - java
   name: invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8)
   nameWithType: Action8<T1,T2,T3,T4,T5,T6,T7,T8>.invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8)
   fullName: com.microsoft.signalr.Action8<T1, T2, T3, T4, T5, T6, T7, T8>.invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8)
-  overload: com.microsoft.signalr._action8.invoke*
+  overload: com.microsoft.signalr.Action8.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
-    startLine: 19
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action8.java
+    startLine: 20
   package: com.microsoft.signalr
   syntax:
     content: public void invoke(T1 param1, T2 param2, T3 param3, T4 param4, T5 param5, T6 param6, T7 param7, T8 param8)
@@ -119,7 +116,7 @@ references:
   spec.java:
   - name: T8
     fullName: T8
-- uid: com.microsoft.signalr._action8.invoke*
+- uid: com.microsoft.signalr.Action8.invoke*
   name: invoke
   nameWithType: Action8<T1,T2,T3,T4,T5,T6,T7,T8>.invoke
   fullName: com.microsoft.signalr.Action8<T1, T2, T3, T4, T5, T6, T7, T8>.invoke
diff --git a/docs-ref-autogen/com.microsoft.signalr.HttpHubConnectionBuilder.yml b/docs-ref-autogen/com.microsoft.signalr.HttpHubConnectionBuilder.yml
new file mode 100644
index 0000000..c2a6777
--- /dev/null
+++ b/docs-ref-autogen/com.microsoft.signalr.HttpHubConnectionBuilder.yml
@@ -0,0 +1,257 @@
+### YamlMime:ManagedReference
+items:
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder
+  id: HttpHubConnectionBuilder
+  parent: com.microsoft.signalr
+  children:
+  - com.microsoft.signalr.HttpHubConnectionBuilder.build()
+  - com.microsoft.signalr.HttpHubConnectionBuilder.shouldSkipNegotiate(boolean)
+  - com.microsoft.signalr.HttpHubConnectionBuilder.withAccessTokenProvider(Single<String>)
+  - com.microsoft.signalr.HttpHubConnectionBuilder.withHandshakeResponseTimeout(long)
+  - com.microsoft.signalr.HttpHubConnectionBuilder.withHeader(String,String)
+  - com.microsoft.signalr.HttpHubConnectionBuilder.withHeaders(Map<String, String>)
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  langs:
+  - java
+  name: HttpHubConnectionBuilder
+  nameWithType: HttpHubConnectionBuilder
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder
+  type: Class
+  source:
+    remote: &o0
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+      branch: release/2.2
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+    startLine: 13
+  package: com.microsoft.signalr
+  summary: "<p>A builder for configuring <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> instances. </p>"
+  syntax: &o1
+    content: public class HttpHubConnectionBuilder
+  inheritance:
+  - java.lang.Object
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.build()
+  id: build()
+  parent: com.microsoft.signalr.HttpHubConnectionBuilder
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  langs:
+  - java
+  name: build()
+  nameWithType: HttpHubConnectionBuilder.build()
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.build()
+  overload: com.microsoft.signalr.HttpHubConnectionBuilder.build*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+    startLine: 113
+  package: com.microsoft.signalr
+  summary: "<p>Builds a new instance of <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref>.</p>\r\n<p></p>"
+  syntax:
+    content: public HubConnection build()
+    return:
+      type: com.microsoft.signalr.HubConnection
+      description: <p>A new instance of <xref uid="com.microsoft.signalr.HubConnection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.shouldSkipNegotiate(boolean)
+  id: shouldSkipNegotiate(boolean)
+  parent: com.microsoft.signalr.HttpHubConnectionBuilder
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  langs:
+  - java
+  name: shouldSkipNegotiate(boolean skipNegotiate)
+  nameWithType: HttpHubConnectionBuilder.shouldSkipNegotiate(boolean skipNegotiate)
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.shouldSkipNegotiate(boolean skipNegotiate)
+  overload: com.microsoft.signalr.HttpHubConnectionBuilder.shouldSkipNegotiate*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+    startLine: 55
+  package: com.microsoft.signalr
+  summary: "<p>Indicates to the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> that it should skip the negotiate process. Note: This option only works with the Websockets transport and the Azure SignalR Service require the negotiate step.</p>\r\n<p></p>"
+  syntax:
+    content: public HttpHubConnectionBuilder shouldSkipNegotiate(boolean skipNegotiate)
+    parameters:
+    - id: skipNegotiate
+      type: 4fc6e284
+      description: <p>Boolean indicating if the <xref uid="com.microsoft.signalr.HubConnection" data-throw-if-not-resolved="false">HubConnection</xref> should skip the negotiate step. </p>
+    return:
+      type: com.microsoft.signalr.HttpHubConnectionBuilder
+      description: <p>This instance of the HttpHubConnectionBuilder. </p>
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.withAccessTokenProvider(Single<String>)
+  id: withAccessTokenProvider(Single<String>)
+  parent: com.microsoft.signalr.HttpHubConnectionBuilder
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  langs:
+  - java
+  name: withAccessTokenProvider(Single<String> accessTokenProvider)
+  nameWithType: HttpHubConnectionBuilder.withAccessTokenProvider(Single<String> accessTokenProvider)
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withAccessTokenProvider(Single<String> accessTokenProvider)
+  overload: com.microsoft.signalr.HttpHubConnectionBuilder.withAccessTokenProvider*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+    startLine: 66
+  package: com.microsoft.signalr
+  summary: "<p>Sets the access token provider for the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref>.</p>\r\n<p></p>"
+  syntax:
+    content: public HttpHubConnectionBuilder withAccessTokenProvider(Single<String> accessTokenProvider)
+    parameters:
+    - id: accessTokenProvider
+      type: 0488a115
+      description: <p>The access token provider to be used by the <xref uid="com.microsoft.signalr.HubConnection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
+    return:
+      type: com.microsoft.signalr.HttpHubConnectionBuilder
+      description: <p>This instance of the HttpHubConnectionBuilder. </p>
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.withHandshakeResponseTimeout(long)
+  id: withHandshakeResponseTimeout(long)
+  parent: com.microsoft.signalr.HttpHubConnectionBuilder
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  langs:
+  - java
+  name: withHandshakeResponseTimeout(long timeoutInMilliseconds)
+  nameWithType: HttpHubConnectionBuilder.withHandshakeResponseTimeout(long timeoutInMilliseconds)
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHandshakeResponseTimeout(long timeoutInMilliseconds)
+  overload: com.microsoft.signalr.HttpHubConnectionBuilder.withHandshakeResponseTimeout*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+    startLine: 77
+  package: com.microsoft.signalr
+  summary: "<p>Sets the duration the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> should wait for a Handshake Response from the server.</p>\r\n<p></p>"
+  syntax:
+    content: public HttpHubConnectionBuilder withHandshakeResponseTimeout(long timeoutInMilliseconds)
+    parameters:
+    - id: timeoutInMilliseconds
+      type: 0364520f
+      description: <p>The duration (specified in milliseconds) that the <xref uid="com.microsoft.signalr.HubConnection" data-throw-if-not-resolved="false">HubConnection</xref> should wait for a Handshake Response from the server. </p>
+    return:
+      type: com.microsoft.signalr.HttpHubConnectionBuilder
+      description: <p>This instance of the HttpHubConnectionBuilder. </p>
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.withHeader(String,String)
+  id: withHeader(String,String)
+  parent: com.microsoft.signalr.HttpHubConnectionBuilder
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  langs:
+  - java
+  name: withHeader(String name, String value)
+  nameWithType: HttpHubConnectionBuilder.withHeader(String name, String value)
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHeader(String name, String value)
+  overload: com.microsoft.signalr.HttpHubConnectionBuilder.withHeader*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+    startLine: 100
+  package: com.microsoft.signalr
+  summary: "<p>Sets a single header for the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> to send.</p>\r\n<p></p>"
+  syntax:
+    content: public HttpHubConnectionBuilder withHeader(String name, String value)
+    parameters:
+    - id: name
+      type: "26831127"
+      description: <p>The name of the header to set. </p>
+    - id: value
+      type: "26831127"
+      description: <p>The value of the header to be set. </p>
+    return:
+      type: com.microsoft.signalr.HttpHubConnectionBuilder
+      description: <p>This instance of the HttpHubConnectionBuilder. </p>
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.withHeaders(Map<String, String>)
+  id: withHeaders(Map<String, String>)
+  parent: com.microsoft.signalr.HttpHubConnectionBuilder
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  langs:
+  - java
+  name: withHeaders(Map<String, String> headers)
+  nameWithType: HttpHubConnectionBuilder.withHeaders(Map<String, String> headers)
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHeaders(Map<String, String> headers)
+  overload: com.microsoft.signalr.HttpHubConnectionBuilder.withHeaders*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
+    startLine: 88
+  package: com.microsoft.signalr
+  summary: "<p>Sets a collection of Headers for the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> to send with every Http request.</p>\r\n<p></p>"
+  syntax:
+    content: public HttpHubConnectionBuilder withHeaders(Map<String, String> headers)
+    parameters:
+    - id: headers
+      type: 689c8cb5
+      description: <p>A Map representing the collection of Headers that the <xref uid="com.microsoft.signalr.HubConnection" data-throw-if-not-resolved="false">HubConnection</xref> should send. </p>
+    return:
+      type: com.microsoft.signalr.HttpHubConnectionBuilder
+      description: <p>This instance of the HttpHubConnectionBuilder. </p>
+references:
+- uid: 4fc6e284
+  spec.java:
+  - name: boolean
+    fullName: boolean
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.shouldSkipNegotiate*
+  name: shouldSkipNegotiate
+  nameWithType: HttpHubConnectionBuilder.shouldSkipNegotiate
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.shouldSkipNegotiate
+  package: com.microsoft.signalr
+- uid: 0488a115
+  spec.java:
+  - name: Single<String>
+    fullName: Single<String>
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.withAccessTokenProvider*
+  name: withAccessTokenProvider
+  nameWithType: HttpHubConnectionBuilder.withAccessTokenProvider
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withAccessTokenProvider
+  package: com.microsoft.signalr
+- uid: 0364520f
+  spec.java:
+  - name: long
+    fullName: long
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.withHandshakeResponseTimeout*
+  name: withHandshakeResponseTimeout
+  nameWithType: HttpHubConnectionBuilder.withHandshakeResponseTimeout
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHandshakeResponseTimeout
+  package: com.microsoft.signalr
+- uid: 689c8cb5
+  spec.java:
+  - name: Map<String, String>
+    fullName: Map<String, String>
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.withHeaders*
+  name: withHeaders
+  nameWithType: HttpHubConnectionBuilder.withHeaders
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHeaders
+  package: com.microsoft.signalr
+- uid: "26831127"
+  spec.java:
+  - name: String
+    fullName: String
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.withHeader*
+  name: withHeader
+  nameWithType: HttpHubConnectionBuilder.withHeader
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHeader
+  package: com.microsoft.signalr
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder.build*
+  name: build
+  nameWithType: HttpHubConnectionBuilder.build
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.build
+  package: com.microsoft.signalr
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder
+  parent: com.microsoft.signalr
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  name: HttpHubConnectionBuilder
+  nameWithType: HttpHubConnectionBuilder
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder
+  type: Class
+  summary: "<p>A builder for configuring <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> instances. </p>"
+  syntax: *o1
+- uid: com.microsoft.signalr.HubConnection
+  parent: com.microsoft.signalr
+  href: com.microsoft.signalr.HubConnection.yml
+  name: HubConnection
+  nameWithType: HubConnection
+  fullName: com.microsoft.signalr.HubConnection
+  type: Class
+  summary: "<p>A connection used to invoke hub methods on a SignalR Server. </p>"
+  syntax:
+    content: public class HubConnection
diff --git a/docs-ref-autogen/com.microsoft.signalr._hub_connection.yml b/docs-ref-autogen/com.microsoft.signalr.HubConnection.yml
similarity index 58%
rename from docs-ref-autogen/com.microsoft.signalr._hub_connection.yml
rename to docs-ref-autogen/com.microsoft.signalr.HubConnection.yml
index 736cca0..8b6c966 100644
--- a/docs-ref-autogen/com.microsoft.signalr._hub_connection.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.HubConnection.yml
@@ -1,30 +1,30 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._hub_connection
-  id: _hub_connection
+- uid: com.microsoft.signalr.HubConnection
+  id: HubConnection
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._hub_connection.getConnectionState()
-  - com.microsoft.signalr._hub_connection.getKeepAliveInterval()
-  - com.microsoft.signalr._hub_connection.getServerTimeout()
-  - com.microsoft.signalr._hub_connection.invoke(Class<T>,String,Object...)
-  - com.microsoft.signalr._hub_connection.on(String,Action)
-  - com.microsoft.signalr._hub_connection.on(String,Action1<T1>,Class<T1>)
-  - com.microsoft.signalr._hub_connection.on(String,Action2<T1, T2>,Class<T1>,Class<T2>)
-  - com.microsoft.signalr._hub_connection.on(String,Action3<T1, T2, T3>,Class<T1>,Class<T2>,Class<T3>)
-  - com.microsoft.signalr._hub_connection.on(String,Action4<T1, T2, T3, T4>,Class<T1>,Class<T2>,Class<T3>,Class<T4>)
-  - com.microsoft.signalr._hub_connection.on(String,Action5<T1, T2, T3, T4, T5>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>)
-  - com.microsoft.signalr._hub_connection.on(String,Action6<T1, T2, T3, T4, T5, T6>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>)
-  - com.microsoft.signalr._hub_connection.on(String,Action7<T1, T2, T3, T4, T5, T6, T7>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>)
-  - com.microsoft.signalr._hub_connection.on(String,Action8<T1, T2, T3, T4, T5, T6, T7, T8>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>,Class<T8>)
-  - com.microsoft.signalr._hub_connection.onClosed(Consumer<Exception>)
-  - com.microsoft.signalr._hub_connection.remove(String)
-  - com.microsoft.signalr._hub_connection.send(String,Object...)
-  - com.microsoft.signalr._hub_connection.setKeepAliveInterval(Duration)
-  - com.microsoft.signalr._hub_connection.setServerTimeout(Duration)
-  - com.microsoft.signalr._hub_connection.start()
-  - com.microsoft.signalr._hub_connection.stop()
-  href: com.microsoft.signalr._hub_connection.yml
+  - com.microsoft.signalr.HubConnection.getConnectionState()
+  - com.microsoft.signalr.HubConnection.getKeepAliveInterval()
+  - com.microsoft.signalr.HubConnection.getServerTimeout()
+  - com.microsoft.signalr.HubConnection.invoke(Class<T>,String,Object...)
+  - com.microsoft.signalr.HubConnection.on(String,Action)
+  - com.microsoft.signalr.HubConnection.on(String,Action1<T1>,Class<T1>)
+  - com.microsoft.signalr.HubConnection.on(String,Action2<T1, T2>,Class<T1>,Class<T2>)
+  - com.microsoft.signalr.HubConnection.on(String,Action3<T1, T2, T3>,Class<T1>,Class<T2>,Class<T3>)
+  - com.microsoft.signalr.HubConnection.on(String,Action4<T1, T2, T3, T4>,Class<T1>,Class<T2>,Class<T3>,Class<T4>)
+  - com.microsoft.signalr.HubConnection.on(String,Action5<T1, T2, T3, T4, T5>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>)
+  - com.microsoft.signalr.HubConnection.on(String,Action6<T1, T2, T3, T4, T5, T6>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>)
+  - com.microsoft.signalr.HubConnection.on(String,Action7<T1, T2, T3, T4, T5, T6, T7>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>)
+  - com.microsoft.signalr.HubConnection.on(String,Action8<T1, T2, T3, T4, T5, T6, T7, T8>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>,Class<T8>)
+  - com.microsoft.signalr.HubConnection.onClosed(OnClosedCallback)
+  - com.microsoft.signalr.HubConnection.remove(String)
+  - com.microsoft.signalr.HubConnection.send(String,Object...)
+  - com.microsoft.signalr.HubConnection.setKeepAliveInterval(long)
+  - com.microsoft.signalr.HubConnection.setServerTimeout(long)
+  - com.microsoft.signalr.HubConnection.start()
+  - com.microsoft.signalr.HubConnection.stop()
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: HubConnection
@@ -33,111 +33,100 @@ items:
   type: Class
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 26
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 30
   package: com.microsoft.signalr
+  summary: "<p>A connection used to invoke hub methods on a SignalR Server. </p>"
   syntax: &o1
     content: public class HubConnection
   inheritance:
   - java.lang.Object
-- uid: com.microsoft.signalr._hub_connection.getConnectionState()
+- uid: com.microsoft.signalr.HubConnection.getConnectionState()
   id: getConnectionState()
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: getConnectionState()
   nameWithType: HubConnection.getConnectionState()
   fullName: com.microsoft.signalr.HubConnection.getConnectionState()
-  overload: com.microsoft.signalr._hub_connection.getConnectionState*
+  overload: com.microsoft.signalr.HubConnection.getConnectionState*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 245
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 259
   package: com.microsoft.signalr
-  summary: >-
-    <p>Indicates the state of the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> to the server.</p>
-
-    <p></p>
+  summary: "<p>Indicates the state of the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> to the server.</p>\r\n<p></p>"
   syntax:
     content: public HubConnectionState getConnectionState()
     return:
-      type: com.microsoft.signalr._hub_connection_state
+      type: com.microsoft.signalr.HubConnectionState
       description: <p>HubConnection state enum. </p>
-- uid: com.microsoft.signalr._hub_connection.getKeepAliveInterval()
+- uid: com.microsoft.signalr.HubConnection.getKeepAliveInterval()
   id: getKeepAliveInterval()
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: getKeepAliveInterval()
   nameWithType: HubConnection.getKeepAliveInterval()
   fullName: com.microsoft.signalr.HubConnection.getKeepAliveInterval()
-  overload: com.microsoft.signalr._hub_connection.getKeepAliveInterval*
+  overload: com.microsoft.signalr.HubConnection.getKeepAliveInterval*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 89
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 93
   package: com.microsoft.signalr
-  summary: >-
-    <p>Gets the keep alive interval.</p>
-
-    <p></p>
+  summary: "<p>Gets the keep alive interval.</p>\r\n<p></p>"
   syntax:
-    content: public Duration getKeepAliveInterval()
+    content: public long getKeepAliveInterval()
     return:
-      type: e02a2de0
-      description: <p>The interval between keep alive messages. </p>
-- uid: com.microsoft.signalr._hub_connection.getServerTimeout()
+      type: 0364520f
+      description: <p>The interval (specified in milliseconds) between keep alive messages. </p>
+- uid: com.microsoft.signalr.HubConnection.getServerTimeout()
   id: getServerTimeout()
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: getServerTimeout()
   nameWithType: HubConnection.getServerTimeout()
   fullName: com.microsoft.signalr.HubConnection.getServerTimeout()
-  overload: com.microsoft.signalr._hub_connection.getServerTimeout*
+  overload: com.microsoft.signalr.HubConnection.getServerTimeout*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 71
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 75
   package: com.microsoft.signalr
-  summary: >-
-    <p>Gets the server timeout duration.</p>
-
-    <p></p>
+  summary: "<p>Gets the server timeout duration.</p>\r\n<p></p>"
   syntax:
-    content: public Duration getServerTimeout()
+    content: public long getServerTimeout()
     return:
-      type: e02a2de0
-      description: <p>The server timeout duration. </p>
-- uid: com.microsoft.signalr._hub_connection.invoke(Class<T>,String,Object...)
+      type: 0364520f
+      description: <p>The server timeout duration (specified in milliseconds). </p>
+- uid: com.microsoft.signalr.HubConnection.invoke(Class<T>,String,Object...)
   id: )
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: invoke(Class<T> returnType, String method, Object... args)
   nameWithType: HubConnection.invoke(Class<T> returnType, String method, Object... args)
   fullName: com.microsoft.signalr.HubConnection.invoke(Class<T> returnType, String method, Object... args)
-  overload: com.microsoft.signalr._hub_connection.invoke*
+  overload: com.microsoft.signalr.HubConnection.invoke*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 450
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 473
   package: com.microsoft.signalr
-  summary: >-
-    <p>Invokes a hub method on the server using the specified method name and arguments.</p>
-
-    <p></p>
+  summary: "<p>Invokes a hub method on the server using the specified method name and arguments.</p>\r\n<p></p>"
   syntax:
     content: public <T> Single<T> invoke(Class<T> returnType, String method, Object... args)
     parameters:
@@ -153,26 +142,23 @@ items:
     return:
       type: 36c4c497
       description: <p>A Single that yields the return value when the invocation has completed. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action)
+- uid: com.microsoft.signalr.HubConnection.on(String,Action)
   id: on(String,Action)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action callback)
   nameWithType: HubConnection.on(String target, Action callback)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action callback)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 531
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 554
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public Subscription on(String target, Action callback)
     parameters:
@@ -180,31 +166,28 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action
+      type: com.microsoft.signalr.Action
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     return:
-      type: com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action1<T1>,Class<T1>)
+      type: com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.on(String,Action1<T1>,Class<T1>)
   id: on(String,Action1<T1>,Class<T1>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action1<T1> callback, Class<T1> param1)
   nameWithType: HubConnection.on(String target, Action1<T1> callback, Class<T1> param1)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action1<T1> callback, Class<T1> param1)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 545
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 568
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public <T1> Subscription on(String target, Action1<T1> callback, Class<T1> param1)
     parameters:
@@ -212,34 +195,31 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action1db2ace7f
+      type: com.microsoft.signalr.Action1db2ace7f
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     - id: param1
       type: bd7e4e46
       description: <p>The first parameter. </p>
     return:
-      type: bdf0abc0com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action2<T1, T2>,Class<T1>,Class<T2>)
+      type: bdf0abc0com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.on(String,Action2<T1, T2>,Class<T1>,Class<T2>)
   id: on(String,Action2<T1, T2>,Class<T1>,Class<T2>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action2<T1, T2> callback, Class<T1> param1, Class<T2> param2)
   nameWithType: HubConnection.on(String target, Action2<T1, T2> callback, Class<T1> param1, Class<T2> param2)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action2<T1, T2> callback, Class<T1> param1, Class<T2> param2)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 562
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 585
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public <T1, T2> Subscription on(String target, Action2<T1, T2> callback, Class<T1> param1, Class<T2> param2)
     parameters:
@@ -247,7 +227,7 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action23a3c39b1
+      type: com.microsoft.signalr.Action23a3c39b1
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     - id: param1
       type: bd7e4e46
@@ -256,28 +236,25 @@ items:
       type: 5bf83f21
       description: <p>The second parameter. </p>
     return:
-      type: 9fff9d58com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action3<T1, T2, T3>,Class<T1>,Class<T2>,Class<T3>)
+      type: 9fff9d58com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.on(String,Action3<T1, T2, T3>,Class<T1>,Class<T2>,Class<T3>)
   id: on(String,Action3<T1, T2, T3>,Class<T1>,Class<T2>,Class<T3>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action3<T1, T2, T3> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3)
   nameWithType: HubConnection.on(String target, Action3<T1, T2, T3> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action3<T1, T2, T3> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 582
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 605
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public <T1, T2, T3> Subscription on(String target, Action3<T1, T2, T3> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3)
     parameters:
@@ -285,7 +262,7 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action3cdfbe1c9
+      type: com.microsoft.signalr.Action3cdfbe1c9
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     - id: param1
       type: bd7e4e46
@@ -297,28 +274,25 @@ items:
       type: 6401a29b
       description: <p>The third parameter. </p>
     return:
-      type: 6cc5db36com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action4<T1, T2, T3, T4>,Class<T1>,Class<T2>,Class<T3>,Class<T4>)
+      type: 6cc5db36com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.on(String,Action4<T1, T2, T3, T4>,Class<T1>,Class<T2>,Class<T3>,Class<T4>)
   id: on(String,Action4<T1, T2, T3, T4>,Class<T1>,Class<T2>,Class<T3>,Class<T4>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action4<T1, T2, T3, T4> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4)
   nameWithType: HubConnection.on(String target, Action4<T1, T2, T3, T4> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action4<T1, T2, T3, T4> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 605
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 628
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public <T1, T2, T3, T4> Subscription on(String target, Action4<T1, T2, T3, T4> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4)
     parameters:
@@ -326,7 +300,7 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action452633229
+      type: com.microsoft.signalr.Action452633229
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     - id: param1
       type: bd7e4e46
@@ -341,28 +315,25 @@ items:
       type: 0b47a77c
       description: <p>The fourth parameter. </p>
     return:
-      type: 4601eee9com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action5<T1, T2, T3, T4, T5>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>)
+      type: 4601eee9com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.on(String,Action5<T1, T2, T3, T4, T5>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>)
   id: on(String,Action5<T1, T2, T3, T4, T5>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action5<T1, T2, T3, T4, T5> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5)
   nameWithType: HubConnection.on(String target, Action5<T1, T2, T3, T4, T5> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action5<T1, T2, T3, T4, T5> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 630
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 653
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public <T1, T2, T3, T4, T5> Subscription on(String target, Action5<T1, T2, T3, T4, T5> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5)
     parameters:
@@ -370,7 +341,7 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action592a43092
+      type: com.microsoft.signalr.Action592a43092
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     - id: param1
       type: bd7e4e46
@@ -388,28 +359,25 @@ items:
       type: 8d84073f
       description: <p>The fifth parameter. </p>
     return:
-      type: 66548d09com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action6<T1, T2, T3, T4, T5, T6>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>)
+      type: 66548d09com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.on(String,Action6<T1, T2, T3, T4, T5, T6>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>)
   id: on(String,Action6<T1, T2, T3, T4, T5, T6>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action6<T1, T2, T3, T4, T5, T6> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6)
   nameWithType: HubConnection.on(String target, Action6<T1, T2, T3, T4, T5, T6> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action6<T1, T2, T3, T4, T5, T6> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 658
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 681
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public <T1, T2, T3, T4, T5, T6> Subscription on(String target, Action6<T1, T2, T3, T4, T5, T6> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6)
     parameters:
@@ -417,7 +385,7 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action6a9c1adee
+      type: com.microsoft.signalr.Action6a9c1adee
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     - id: param1
       type: bd7e4e46
@@ -438,28 +406,25 @@ items:
       type: ba8f519c
       description: <p>The sixth parameter. </p>
     return:
-      type: 1ea07816com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action7<T1, T2, T3, T4, T5, T6, T7>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>)
+      type: 1ea07816com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.on(String,Action7<T1, T2, T3, T4, T5, T6, T7>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>)
   id: on(String,Action7<T1, T2, T3, T4, T5, T6, T7>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action7<T1, T2, T3, T4, T5, T6, T7> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6, Class<T7> param7)
   nameWithType: HubConnection.on(String target, Action7<T1, T2, T3, T4, T5, T6, T7> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6, Class<T7> param7)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action7<T1, T2, T3, T4, T5, T6, T7> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6, Class<T7> param7)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 688
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 711
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public <T1, T2, T3, T4, T5, T6, T7> Subscription on(String target, Action7<T1, T2, T3, T4, T5, T6, T7> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6, Class<T7> param7)
     parameters:
@@ -467,7 +432,7 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action7d919bd9a
+      type: com.microsoft.signalr.Action7d919bd9a
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     - id: param1
       type: bd7e4e46
@@ -491,28 +456,25 @@ items:
       type: c35f184f
       description: <p>The seventh parameter. </p>
     return:
-      type: ee835c10com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.on(String,Action8<T1, T2, T3, T4, T5, T6, T7, T8>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>,Class<T8>)
+      type: ee835c10com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.on(String,Action8<T1, T2, T3, T4, T5, T6, T7, T8>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>,Class<T8>)
   id: on(String,Action8<T1, T2, T3, T4, T5, T6, T7, T8>,Class<T1>,Class<T2>,Class<T3>,Class<T4>,Class<T5>,Class<T6>,Class<T7>,Class<T8>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: on(String target, Action8<T1, T2, T3, T4, T5, T6, T7, T8> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6, Class<T7> param7, Class<T8> param8)
   nameWithType: HubConnection.on(String target, Action8<T1, T2, T3, T4, T5, T6, T7, T8> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6, Class<T7> param7, Class<T8> param8)
   fullName: com.microsoft.signalr.HubConnection.on(String target, Action8<T1, T2, T3, T4, T5, T6, T7, T8> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6, Class<T7> param7, Class<T8> param8)
-  overload: com.microsoft.signalr._hub_connection.on*
+  overload: com.microsoft.signalr.HubConnection.on*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 720
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 743
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>
-
-    <p></p>
+  summary: "<p>Registers a handler that will be invoked when the hub method with the specified method name is invoked.</p>\r\n<p></p>"
   syntax:
     content: public <T1, T2, T3, T4, T5, T6, T7, T8> Subscription on(String target, Action8<T1, T2, T3, T4, T5, T6, T7, T8> callback, Class<T1> param1, Class<T2> param2, Class<T3> param3, Class<T4> param4, Class<T5> param5, Class<T6> param6, Class<T7> param7, Class<T8> param8)
     parameters:
@@ -520,7 +482,7 @@ items:
       type: "26831127"
       description: <p>The name of the hub method to define. </p>
     - id: callback
-      type: com.microsoft.signalr._action8022a6a0e
+      type: com.microsoft.signalr.Action8022a6a0e
       description: <p>The handler that will be raised when the hub method is invoked. </p>
     - id: param1
       type: bd7e4e46
@@ -547,80 +509,71 @@ items:
       type: 724080d4
       description: <p>The eighth parameter </p>
     return:
-      type: a3794381com.microsoft.signalr._subscription
-      description: <p>A <xref uid="com.microsoft.signalr._subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
-- uid: com.microsoft.signalr._hub_connection.onClosed(Consumer<Exception>)
-  id: onClosed(Consumer<Exception>)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+      type: a3794381com.microsoft.signalr.Subscription
+      description: <p>A <xref uid="com.microsoft.signalr.Subscription" data-throw-if-not-resolved="false">Subscription</xref> that can be disposed to unsubscribe from the hub method. </p>
+- uid: com.microsoft.signalr.HubConnection.onClosed(OnClosedCallback)
+  id: onClosed(OnClosedCallback)
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
-  name: onClosed(Consumer<Exception> callback)
-  nameWithType: HubConnection.onClosed(Consumer<Exception> callback)
-  fullName: com.microsoft.signalr.HubConnection.onClosed(Consumer<Exception> callback)
-  overload: com.microsoft.signalr._hub_connection.onClosed*
+  name: onClosed(OnClosedCallback callback)
+  nameWithType: HubConnection.onClosed(OnClosedCallback callback)
+  fullName: com.microsoft.signalr.HubConnection.onClosed(OnClosedCallback callback)
+  overload: com.microsoft.signalr.HubConnection.onClosed*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 516
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 539
   package: com.microsoft.signalr
-  summary: >-
-    <p>Registers a callback to run when the connection is closed.</p>
-
-    <p></p>
+  summary: "<p>Registers a callback to run when the connection is closed.</p>\r\n<p></p>"
   syntax:
-    content: public void onClosed(Consumer<Exception> callback)
+    content: public void onClosed(OnClosedCallback callback)
     parameters:
     - id: callback
-      type: 04a5a28f
+      type: com.microsoft.signalr.OnClosedCallback
       description: <p>A callback to run when the connection closes. </p>
-- uid: com.microsoft.signalr._hub_connection.remove(String)
+- uid: com.microsoft.signalr.HubConnection.remove(String)
   id: remove(String)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: remove(String name)
   nameWithType: HubConnection.remove(String name)
   fullName: com.microsoft.signalr.HubConnection.remove(String name)
-  overload: com.microsoft.signalr._hub_connection.remove*
+  overload: com.microsoft.signalr.HubConnection.remove*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 506
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 529
   package: com.microsoft.signalr
-  summary: >-
-    <p>Removes all handlers associated with the method with the specified method name.</p>
-
-    <p></p>
+  summary: "<p>Removes all handlers associated with the method with the specified method name.</p>\r\n<p></p>"
   syntax:
     content: public void remove(String name)
     parameters:
     - id: name
       type: "26831127"
       description: <p>The name of the hub method from which handlers are being removed. </p>
-- uid: com.microsoft.signalr._hub_connection.send(String,Object...)
+- uid: com.microsoft.signalr.HubConnection.send(String,Object...)
   id: )
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: send(String method, Object... args)
   nameWithType: HubConnection.send(String method, Object... args)
   fullName: com.microsoft.signalr.HubConnection.send(String method, Object... args)
-  overload: com.microsoft.signalr._hub_connection.send*
+  overload: com.microsoft.signalr.HubConnection.send*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 431
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 454
   package: com.microsoft.signalr
-  summary: >-
-    <p>Invokes a hub method on the server using the specified method name. Does not wait for a response from the receiver.</p>
-
-    <p></p>
+  summary: "<p>Invokes a hub method on the server using the specified method name. Does not wait for a response from the receiver.</p>\r\n<p></p>"
   syntax:
     content: public void send(String method, Object... args)
     parameters:
@@ -630,131 +583,122 @@ items:
     - id: args
       type: 1355eaf1
       description: <p>The arguments to be passed to the method. </p>
-- uid: com.microsoft.signalr._hub_connection.setKeepAliveInterval(Duration)
-  id: setKeepAliveInterval(Duration)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+- uid: com.microsoft.signalr.HubConnection.setKeepAliveInterval(long)
+  id: setKeepAliveInterval(long)
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
-  name: setKeepAliveInterval(Duration keepAliveInterval)
-  nameWithType: HubConnection.setKeepAliveInterval(Duration keepAliveInterval)
-  fullName: com.microsoft.signalr.HubConnection.setKeepAliveInterval(Duration keepAliveInterval)
-  overload: com.microsoft.signalr._hub_connection.setKeepAliveInterval*
+  name: setKeepAliveInterval(long keepAliveIntervalInMilliseconds)
+  nameWithType: HubConnection.setKeepAliveInterval(long keepAliveIntervalInMilliseconds)
+  fullName: com.microsoft.signalr.HubConnection.setKeepAliveInterval(long keepAliveIntervalInMilliseconds)
+  overload: com.microsoft.signalr.HubConnection.setKeepAliveInterval*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 80
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 84
   package: com.microsoft.signalr
-  summary: >-
-    <p>Sets the keep alive interval duration.</p>
-
-    <p></p>
+  summary: "<p>Sets the keep alive interval duration.</p>\r\n<p></p>"
   syntax:
-    content: public void setKeepAliveInterval(Duration keepAliveInterval)
+    content: public void setKeepAliveInterval(long keepAliveIntervalInMilliseconds)
     parameters:
-    - id: keepAliveInterval
-      type: e02a2de0
-      description: <p>The interval at which the connection should send keep alive messages. </p>
-- uid: com.microsoft.signalr._hub_connection.setServerTimeout(Duration)
-  id: setServerTimeout(Duration)
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+    - id: keepAliveIntervalInMilliseconds
+      type: 0364520f
+      description: <p>The interval (specified in milliseconds) at which the connection should send keep alive messages. </p>
+- uid: com.microsoft.signalr.HubConnection.setServerTimeout(long)
+  id: setServerTimeout(long)
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
-  name: setServerTimeout(Duration serverTimeout)
-  nameWithType: HubConnection.setServerTimeout(Duration serverTimeout)
-  fullName: com.microsoft.signalr.HubConnection.setServerTimeout(Duration serverTimeout)
-  overload: com.microsoft.signalr._hub_connection.setServerTimeout*
+  name: setServerTimeout(long serverTimeoutInMilliseconds)
+  nameWithType: HubConnection.setServerTimeout(long serverTimeoutInMilliseconds)
+  fullName: com.microsoft.signalr.HubConnection.setServerTimeout(long serverTimeoutInMilliseconds)
+  overload: com.microsoft.signalr.HubConnection.setServerTimeout*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 62
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 66
   package: com.microsoft.signalr
-  summary: >-
-    <p>Sets the server timeout interval for the connection.</p>
-
-    <p></p>
+  summary: "<p>Sets the server timeout interval for the connection.</p>\r\n<p></p>"
   syntax:
-    content: public void setServerTimeout(Duration serverTimeout)
+    content: public void setServerTimeout(long serverTimeoutInMilliseconds)
     parameters:
-    - id: serverTimeout
-      type: e02a2de0
-      description: <p>The server timeout duration. </p>
-- uid: com.microsoft.signalr._hub_connection.start()
+    - id: serverTimeoutInMilliseconds
+      type: 0364520f
+      description: <p>The server timeout duration (specified in milliseconds). </p>
+- uid: com.microsoft.signalr.HubConnection.start()
   id: start()
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: start()
   nameWithType: HubConnection.start()
   fullName: com.microsoft.signalr.HubConnection.start()
-  overload: com.microsoft.signalr._hub_connection.start*
+  overload: com.microsoft.signalr.HubConnection.start*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 253
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 268
   package: com.microsoft.signalr
-  summary: <p>Starts a connection to the server. </p>
+  summary: "<p>Starts a connection to the server.</p>\r\n<p></p>"
   syntax:
     content: public Completable start()
     return:
       type: "56537e90"
       description: <p>A Completable that completes when the connection has been established. </p>
-- uid: com.microsoft.signalr._hub_connection.stop()
+- uid: com.microsoft.signalr.HubConnection.stop()
   id: stop()
-  parent: com.microsoft.signalr._hub_connection
-  href: com.microsoft.signalr._hub_connection.yml
+  parent: com.microsoft.signalr.HubConnection
+  href: com.microsoft.signalr.HubConnection.yml
   langs:
   - java
   name: stop()
   nameWithType: HubConnection.stop()
   fullName: com.microsoft.signalr.HubConnection.stop()
-  overload: com.microsoft.signalr._hub_connection.stop*
+  overload: com.microsoft.signalr.HubConnection.stop*
   type: Method
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
-    startLine: 390
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnection.java
+    startLine: 413
   package: com.microsoft.signalr
-  summary: >-
-    <p>Stops a connection to the server.</p>
-
-    <p></p>
+  summary: "<p>Stops a connection to the server.</p>\r\n<p></p>"
   syntax:
     content: public Completable stop()
     return:
       type: "56537e90"
       description: <p>A Completable that completes when the connection has been stopped. </p>
 references:
-- uid: e02a2de0
+- uid: 0364520f
   spec.java:
-  - name: Duration
-    fullName: Duration
-- uid: com.microsoft.signalr._hub_connection.setServerTimeout*
+  - name: long
+    fullName: long
+- uid: com.microsoft.signalr.HubConnection.setServerTimeout*
   name: setServerTimeout
   nameWithType: HubConnection.setServerTimeout
   fullName: com.microsoft.signalr.HubConnection.setServerTimeout
   package: com.microsoft.signalr
-- uid: com.microsoft.signalr._hub_connection.getServerTimeout*
+- uid: com.microsoft.signalr.HubConnection.getServerTimeout*
   name: getServerTimeout
   nameWithType: HubConnection.getServerTimeout
   fullName: com.microsoft.signalr.HubConnection.getServerTimeout
   package: com.microsoft.signalr
-- uid: com.microsoft.signalr._hub_connection.setKeepAliveInterval*
+- uid: com.microsoft.signalr.HubConnection.setKeepAliveInterval*
   name: setKeepAliveInterval
   nameWithType: HubConnection.setKeepAliveInterval
   fullName: com.microsoft.signalr.HubConnection.setKeepAliveInterval
   package: com.microsoft.signalr
-- uid: com.microsoft.signalr._hub_connection.getKeepAliveInterval*
+- uid: com.microsoft.signalr.HubConnection.getKeepAliveInterval*
   name: getKeepAliveInterval
   nameWithType: HubConnection.getKeepAliveInterval
   fullName: com.microsoft.signalr.HubConnection.getKeepAliveInterval
   package: com.microsoft.signalr
-- uid: com.microsoft.signalr._hub_connection.getConnectionState*
+- uid: com.microsoft.signalr.HubConnection.getConnectionState*
   name: getConnectionState
   nameWithType: HubConnection.getConnectionState
   fullName: com.microsoft.signalr.HubConnection.getConnectionState
@@ -763,12 +707,12 @@ references:
   spec.java:
   - name: Completable
     fullName: Completable
-- uid: com.microsoft.signalr._hub_connection.start*
+- uid: com.microsoft.signalr.HubConnection.start*
   name: start
   nameWithType: HubConnection.start
   fullName: com.microsoft.signalr.HubConnection.start
   package: com.microsoft.signalr
-- uid: com.microsoft.signalr._hub_connection.stop*
+- uid: com.microsoft.signalr.HubConnection.stop*
   name: stop
   nameWithType: HubConnection.stop
   fullName: com.microsoft.signalr.HubConnection.stop
@@ -781,26 +725,22 @@ references:
   spec.java:
   - name: Object...
     fullName: Object...
-- uid: com.microsoft.signalr._hub_connection.send*
+- uid: com.microsoft.signalr.HubConnection.send*
   name: send
   nameWithType: HubConnection.send
   fullName: com.microsoft.signalr.HubConnection.send
   package: com.microsoft.signalr
-- uid: com.microsoft.signalr._hub_connection.remove*
+- uid: com.microsoft.signalr.HubConnection.remove*
   name: remove
   nameWithType: HubConnection.remove
   fullName: com.microsoft.signalr.HubConnection.remove
   package: com.microsoft.signalr
-- uid: 04a5a28f
-  spec.java:
-  - name: Consumer<Exception>
-    fullName: Consumer<Exception>
-- uid: com.microsoft.signalr._hub_connection.onClosed*
+- uid: com.microsoft.signalr.HubConnection.onClosed*
   name: onClosed
   nameWithType: HubConnection.onClosed
   fullName: com.microsoft.signalr.HubConnection.onClosed
   package: com.microsoft.signalr
-- uid: com.microsoft.signalr._hub_connection.on*
+- uid: com.microsoft.signalr.HubConnection.on*
   name: on
   nameWithType: HubConnection.on
   fullName: com.microsoft.signalr.HubConnection.on
@@ -813,237 +753,242 @@ references:
   spec.java:
   - name: <T> Single<T>
     fullName: <T> Single<T>
-- uid: com.microsoft.signalr._hub_connection.invoke*
+- uid: com.microsoft.signalr.HubConnection.invoke*
   name: invoke
   nameWithType: HubConnection.invoke
   fullName: com.microsoft.signalr.HubConnection.invoke
   package: com.microsoft.signalr
-- uid: com.microsoft.signalr._action1db2ace7f
+- uid: com.microsoft.signalr.Action1db2ace7f
   spec.java:
-  - uid: com.microsoft.signalr._action1
+  - uid: com.microsoft.signalr.Action1
     name: Action1
     fullName: com.microsoft.signalr.Action1
-    href: com.microsoft.signalr._action1.yml
+    href: com.microsoft.signalr.Action1.yml
   - name: <T1>
     fullName: <T1>
 - uid: bd7e4e46
   spec.java:
   - name: Class<T1>
     fullName: Class<T1>
-- uid: bdf0abc0com.microsoft.signalr._subscription
+- uid: bdf0abc0com.microsoft.signalr.Subscription
   spec.java:
   - name: '<T1> '
     fullName: '<T1> '
-  - uid: com.microsoft.signalr._subscription
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
     fullName: com.microsoft.signalr.Subscription
-    href: com.microsoft.signalr._subscription.yml
-- uid: com.microsoft.signalr._action23a3c39b1
+    href: com.microsoft.signalr.Subscription.yml
+- uid: com.microsoft.signalr.Action23a3c39b1
   spec.java:
-  - uid: com.microsoft.signalr._action2
+  - uid: com.microsoft.signalr.Action2
     name: Action2
     fullName: com.microsoft.signalr.Action2
-    href: com.microsoft.signalr._action2.yml
+    href: com.microsoft.signalr.Action2.yml
   - name: <T1, T2>
     fullName: <T1, T2>
 - uid: 5bf83f21
   spec.java:
   - name: Class<T2>
     fullName: Class<T2>
-- uid: 9fff9d58com.microsoft.signalr._subscription
+- uid: 9fff9d58com.microsoft.signalr.Subscription
   spec.java:
   - name: '<T1, T2> '
     fullName: '<T1, T2> '
-  - uid: com.microsoft.signalr._subscription
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
     fullName: com.microsoft.signalr.Subscription
-    href: com.microsoft.signalr._subscription.yml
-- uid: com.microsoft.signalr._action3cdfbe1c9
+    href: com.microsoft.signalr.Subscription.yml
+- uid: com.microsoft.signalr.Action3cdfbe1c9
   spec.java:
-  - uid: com.microsoft.signalr._action3
+  - uid: com.microsoft.signalr.Action3
     name: Action3
     fullName: com.microsoft.signalr.Action3
-    href: com.microsoft.signalr._action3.yml
+    href: com.microsoft.signalr.Action3.yml
   - name: <T1, T2, T3>
     fullName: <T1, T2, T3>
 - uid: 6401a29b
   spec.java:
   - name: Class<T3>
     fullName: Class<T3>
-- uid: 6cc5db36com.microsoft.signalr._subscription
+- uid: 6cc5db36com.microsoft.signalr.Subscription
   spec.java:
   - name: '<T1, T2, T3> '
     fullName: '<T1, T2, T3> '
-  - uid: com.microsoft.signalr._subscription
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
     fullName: com.microsoft.signalr.Subscription
-    href: com.microsoft.signalr._subscription.yml
-- uid: com.microsoft.signalr._action452633229
+    href: com.microsoft.signalr.Subscription.yml
+- uid: com.microsoft.signalr.Action452633229
   spec.java:
-  - uid: com.microsoft.signalr._action4
+  - uid: com.microsoft.signalr.Action4
     name: Action4
     fullName: com.microsoft.signalr.Action4
-    href: com.microsoft.signalr._action4.yml
+    href: com.microsoft.signalr.Action4.yml
   - name: <T1, T2, T3, T4>
     fullName: <T1, T2, T3, T4>
 - uid: 0b47a77c
   spec.java:
   - name: Class<T4>
     fullName: Class<T4>
-- uid: 4601eee9com.microsoft.signalr._subscription
+- uid: 4601eee9com.microsoft.signalr.Subscription
   spec.java:
   - name: '<T1, T2, T3, T4> '
     fullName: '<T1, T2, T3, T4> '
-  - uid: com.microsoft.signalr._subscription
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
     fullName: com.microsoft.signalr.Subscription
-    href: com.microsoft.signalr._subscription.yml
-- uid: com.microsoft.signalr._action592a43092
+    href: com.microsoft.signalr.Subscription.yml
+- uid: com.microsoft.signalr.Action592a43092
   spec.java:
-  - uid: com.microsoft.signalr._action5
+  - uid: com.microsoft.signalr.Action5
     name: Action5
     fullName: com.microsoft.signalr.Action5
-    href: com.microsoft.signalr._action5.yml
+    href: com.microsoft.signalr.Action5.yml
   - name: <T1, T2, T3, T4, T5>
     fullName: <T1, T2, T3, T4, T5>
 - uid: 8d84073f
   spec.java:
   - name: Class<T5>
     fullName: Class<T5>
-- uid: 66548d09com.microsoft.signalr._subscription
+- uid: 66548d09com.microsoft.signalr.Subscription
   spec.java:
   - name: '<T1, T2, T3, T4, T5> '
     fullName: '<T1, T2, T3, T4, T5> '
-  - uid: com.microsoft.signalr._subscription
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
     fullName: com.microsoft.signalr.Subscription
-    href: com.microsoft.signalr._subscription.yml
-- uid: com.microsoft.signalr._action6a9c1adee
+    href: com.microsoft.signalr.Subscription.yml
+- uid: com.microsoft.signalr.Action6a9c1adee
   spec.java:
-  - uid: com.microsoft.signalr._action6
+  - uid: com.microsoft.signalr.Action6
     name: Action6
     fullName: com.microsoft.signalr.Action6
-    href: com.microsoft.signalr._action6.yml
+    href: com.microsoft.signalr.Action6.yml
   - name: <T1, T2, T3, T4, T5, T6>
     fullName: <T1, T2, T3, T4, T5, T6>
 - uid: ba8f519c
   spec.java:
   - name: Class<T6>
     fullName: Class<T6>
-- uid: 1ea07816com.microsoft.signalr._subscription
+- uid: 1ea07816com.microsoft.signalr.Subscription
   spec.java:
   - name: '<T1, T2, T3, T4, T5, T6> '
     fullName: '<T1, T2, T3, T4, T5, T6> '
-  - uid: com.microsoft.signalr._subscription
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
     fullName: com.microsoft.signalr.Subscription
-    href: com.microsoft.signalr._subscription.yml
-- uid: com.microsoft.signalr._action7d919bd9a
+    href: com.microsoft.signalr.Subscription.yml
+- uid: com.microsoft.signalr.Action7d919bd9a
   spec.java:
-  - uid: com.microsoft.signalr._action7
+  - uid: com.microsoft.signalr.Action7
     name: Action7
     fullName: com.microsoft.signalr.Action7
-    href: com.microsoft.signalr._action7.yml
+    href: com.microsoft.signalr.Action7.yml
   - name: <T1, T2, T3, T4, T5, T6, T7>
     fullName: <T1, T2, T3, T4, T5, T6, T7>
 - uid: c35f184f
   spec.java:
   - name: Class<T7>
     fullName: Class<T7>
-- uid: ee835c10com.microsoft.signalr._subscription
+- uid: ee835c10com.microsoft.signalr.Subscription
   spec.java:
   - name: '<T1, T2, T3, T4, T5, T6, T7> '
     fullName: '<T1, T2, T3, T4, T5, T6, T7> '
-  - uid: com.microsoft.signalr._subscription
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
     fullName: com.microsoft.signalr.Subscription
-    href: com.microsoft.signalr._subscription.yml
-- uid: com.microsoft.signalr._action8022a6a0e
+    href: com.microsoft.signalr.Subscription.yml
+- uid: com.microsoft.signalr.Action8022a6a0e
   spec.java:
-  - uid: com.microsoft.signalr._action8
+  - uid: com.microsoft.signalr.Action8
     name: Action8
     fullName: com.microsoft.signalr.Action8
-    href: com.microsoft.signalr._action8.yml
+    href: com.microsoft.signalr.Action8.yml
   - name: <T1, T2, T3, T4, T5, T6, T7, T8>
     fullName: <T1, T2, T3, T4, T5, T6, T7, T8>
 - uid: 724080d4
   spec.java:
   - name: Class<T8>
     fullName: Class<T8>
-- uid: a3794381com.microsoft.signalr._subscription
+- uid: a3794381com.microsoft.signalr.Subscription
   spec.java:
   - name: '<T1, T2, T3, T4, T5, T6, T7, T8> '
     fullName: '<T1, T2, T3, T4, T5, T6, T7, T8> '
-  - uid: com.microsoft.signalr._subscription
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
     fullName: com.microsoft.signalr.Subscription
-    href: com.microsoft.signalr._subscription.yml
-- uid: com.microsoft.signalr._hub_connection_state
+    href: com.microsoft.signalr.Subscription.yml
+- uid: com.microsoft.signalr.HubConnectionState
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_connection_state.yml
+  href: com.microsoft.signalr.HubConnectionState.yml
   name: HubConnectionState
   nameWithType: HubConnectionState
   fullName: com.microsoft.signalr.HubConnectionState
   type: Enum
-  summary: <p>Indicates the state of the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
+  summary: "<p>Indicates the state of the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref>. </p>"
   syntax:
     content: public enum HubConnectionState
-- uid: com.microsoft.signalr._hub_connection
+- uid: com.microsoft.signalr.OnClosedCallback
+  parent: com.microsoft.signalr
+  href: com.microsoft.signalr.OnClosedCallback.yml
+  name: OnClosedCallback
+  nameWithType: OnClosedCallback
+  fullName: com.microsoft.signalr.OnClosedCallback
+  type: Interface
+  summary: "<p>A callback to create and register on a HubConnections OnClosed method. </p>"
+  syntax:
+    content: public interface OnClosedCallback
+- uid: com.microsoft.signalr.HubConnection
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_connection.yml
+  href: com.microsoft.signalr.HubConnection.yml
   name: HubConnection
   nameWithType: HubConnection
   fullName: com.microsoft.signalr.HubConnection
   type: Class
+  summary: "<p>A connection used to invoke hub methods on a SignalR Server. </p>"
   syntax: *o1
-- uid: com.microsoft.signalr._subscription
+- uid: com.microsoft.signalr.Subscription
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._subscription.yml
+  href: com.microsoft.signalr.Subscription.yml
   name: Subscription
   nameWithType: Subscription
   fullName: com.microsoft.signalr.Subscription
   type: Class
-  summary: <p>Represents the registration of a handler for a client method. </p>
+  summary: "<p>Represents the registration of a handler for a client method. </p>"
   syntax:
     content: public class Subscription
-- uid: com.microsoft.signalr._action
+- uid: com.microsoft.signalr.Action
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action.yml
+  href: com.microsoft.signalr.Action.yml
   name: Action
   nameWithType: Action
   fullName: com.microsoft.signalr.Action
   type: Interface
-  summary: <p>A callback that takes no parameters. </p>
+  summary: "<p>A callback that takes no parameters. </p>"
   syntax:
     content: public interface Action
-- uid: com.microsoft.signalr._action1
+- uid: com.microsoft.signalr.Action1
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action1.yml
+  href: com.microsoft.signalr.Action1.yml
   name: Action1<T1>
   nameWithType: Action1<T1>
   fullName: com.microsoft.signalr.Action1<T1>
   type: Interface
-  summary: >-
-    <p>A callback that takes one parameter.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes one parameter.</p>\r\n<p></p>"
   syntax:
     content: public interface Action1<T1>
     typeParameters:
     - id: T1
       type: ea9d49ce
       description: <p>The type of the first parameter to the callback. </p>
-- uid: com.microsoft.signalr._action2
+- uid: com.microsoft.signalr.Action2
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action2.yml
+  href: com.microsoft.signalr.Action2.yml
   name: Action2<T1,T2>
   nameWithType: Action2<T1,T2>
   fullName: com.microsoft.signalr.Action2<T1,T2>
   type: Interface
-  summary: >-
-    <p>A callback that takes two parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes two parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action2<T1,T2>
     typeParameters:
@@ -1053,17 +998,14 @@ references:
     - id: T2
       type: 6ac4d271
       description: <p>The type of the second parameter to the callback. </p>
-- uid: com.microsoft.signalr._action3
+- uid: com.microsoft.signalr.Action3
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action3.yml
+  href: com.microsoft.signalr.Action3.yml
   name: Action3<T1,T2,T3>
   nameWithType: Action3<T1,T2,T3>
   fullName: com.microsoft.signalr.Action3<T1,T2,T3>
   type: Interface
-  summary: >-
-    <p>A callback that takes three parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes three parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action3<T1,T2,T3>
     typeParameters:
@@ -1076,17 +1018,14 @@ references:
     - id: T3
       type: e92ab054
       description: <p>The type of the third parameter to the callback. </p>
-- uid: com.microsoft.signalr._action4
+- uid: com.microsoft.signalr.Action4
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action4.yml
+  href: com.microsoft.signalr.Action4.yml
   name: Action4<T1,T2,T3,T4>
   nameWithType: Action4<T1,T2,T3,T4>
   fullName: com.microsoft.signalr.Action4<T1,T2,T3,T4>
   type: Interface
-  summary: >-
-    <p>A callback that takes four parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes four parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action4<T1,T2,T3,T4>
     typeParameters:
@@ -1102,17 +1041,14 @@ references:
     - id: T4
       type: 21b77ff4
       description: <p>The type of the fourth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action5
+- uid: com.microsoft.signalr.Action5
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action5.yml
+  href: com.microsoft.signalr.Action5.yml
   name: Action5<T1,T2,T3,T4,T5>
   nameWithType: Action5<T1,T2,T3,T4,T5>
   fullName: com.microsoft.signalr.Action5<T1,T2,T3,T4,T5>
   type: Interface
-  summary: >-
-    <p>A callback that takes five parameter.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes five parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action5<T1,T2,T3,T4,T5>
     typeParameters:
@@ -1131,17 +1067,14 @@ references:
     - id: T5
       type: 136da300
       description: <p>The type of the fifth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action6
+- uid: com.microsoft.signalr.Action6
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action6.yml
+  href: com.microsoft.signalr.Action6.yml
   name: Action6<T1,T2,T3,T4,T5,T6>
   nameWithType: Action6<T1,T2,T3,T4,T5,T6>
   fullName: com.microsoft.signalr.Action6<T1,T2,T3,T4,T5,T6>
   type: Interface
-  summary: >-
-    <p>A callback that takes six parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes six parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action6<T1,T2,T3,T4,T5,T6>
     typeParameters:
@@ -1163,17 +1096,14 @@ references:
     - id: T6
       type: 43cd3771
       description: <p>The type of the sixth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action7
+- uid: com.microsoft.signalr.Action7
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action7.yml
+  href: com.microsoft.signalr.Action7.yml
   name: Action7<T1,T2,T3,T4,T5,T6,T7>
   nameWithType: Action7<T1,T2,T3,T4,T5,T6,T7>
   fullName: com.microsoft.signalr.Action7<T1,T2,T3,T4,T5,T6,T7>
   type: Interface
-  summary: >-
-    <p>A callback that takes seven parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes seven parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action7<T1,T2,T3,T4,T5,T6,T7>
     typeParameters:
@@ -1198,17 +1128,14 @@ references:
     - id: T7
       type: 308f4ff4
       description: <p>The type of the seventh parameter to the callback. </p>
-- uid: com.microsoft.signalr._action8
+- uid: com.microsoft.signalr.Action8
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action8.yml
+  href: com.microsoft.signalr.Action8.yml
   name: Action8<T1,T2,T3,T4,T5,T6,T7,T8>
   nameWithType: Action8<T1,T2,T3,T4,T5,T6,T7,T8>
   fullName: com.microsoft.signalr.Action8<T1,T2,T3,T4,T5,T6,T7,T8>
   type: Interface
-  summary: >-
-    <p>A callback that takes eight parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes eight parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action8<T1,T2,T3,T4,T5,T6,T7,T8>
     typeParameters:
diff --git a/docs-ref-autogen/com.microsoft.signalr.HubConnectionBuilder.yml b/docs-ref-autogen/com.microsoft.signalr.HubConnectionBuilder.yml
new file mode 100644
index 0000000..0b3bd3c
--- /dev/null
+++ b/docs-ref-autogen/com.microsoft.signalr.HubConnectionBuilder.yml
@@ -0,0 +1,119 @@
+### YamlMime:ManagedReference
+items:
+- uid: com.microsoft.signalr.HubConnectionBuilder
+  id: HubConnectionBuilder
+  parent: com.microsoft.signalr
+  children:
+  - com.microsoft.signalr.HubConnectionBuilder.build()
+  - com.microsoft.signalr.HubConnectionBuilder.create(String)
+  href: com.microsoft.signalr.HubConnectionBuilder.yml
+  langs:
+  - java
+  name: HubConnectionBuilder
+  nameWithType: HubConnectionBuilder
+  fullName: com.microsoft.signalr.HubConnectionBuilder
+  type: Class
+  source:
+    remote: &o0
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java
+      branch: release/2.2
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java
+    startLine: 8
+  package: com.microsoft.signalr
+  summary: "<p>A builder for configuring <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> instances. </p>"
+  syntax:
+    content: public class HubConnectionBuilder
+  inheritance:
+  - java.lang.Object
+- uid: com.microsoft.signalr.HubConnectionBuilder.build()
+  id: build()
+  parent: com.microsoft.signalr.HubConnectionBuilder
+  href: com.microsoft.signalr.HubConnectionBuilder.yml
+  langs:
+  - java
+  name: build()
+  nameWithType: HubConnectionBuilder.build()
+  fullName: com.microsoft.signalr.HubConnectionBuilder.build()
+  overload: com.microsoft.signalr.HubConnectionBuilder.build*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java
+    startLine: 27
+  package: com.microsoft.signalr
+  summary: "<p>Builds a new instance of <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref>.</p>\r\n<p></p>"
+  syntax:
+    content: public abstract HubConnection build()
+    return:
+      type: 13c86962com.microsoft.signalr.HubConnection
+      description: <p>A new instance of <xref uid="com.microsoft.signalr.HubConnection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
+- uid: com.microsoft.signalr.HubConnectionBuilder.create(String)
+  id: create(String)
+  parent: com.microsoft.signalr.HubConnectionBuilder
+  href: com.microsoft.signalr.HubConnectionBuilder.yml
+  langs:
+  - java
+  name: create(String url)
+  nameWithType: HubConnectionBuilder.create(String url)
+  fullName: com.microsoft.signalr.HubConnectionBuilder.create(String url)
+  overload: com.microsoft.signalr.HubConnectionBuilder.create*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java
+    startLine: 15
+  package: com.microsoft.signalr
+  summary: "<p>Creates a new instance of <xref uid=\"com.microsoft.signalr.HttpHubConnectionBuilder\" data-throw-if-not-resolved=\"false\">HttpHubConnectionBuilder</xref>.</p>\r\n<p></p>"
+  syntax:
+    content: public static HttpHubConnectionBuilder create(String url)
+    parameters:
+    - id: url
+      type: "26831127"
+      description: <p>The URL of the SignalR hub to connect to. </p>
+    return:
+      type: com.microsoft.signalr.HttpHubConnectionBuilder
+      description: <p>An instance of <xref uid="com.microsoft.signalr.HttpHubConnectionBuilder" data-throw-if-not-resolved="false">HttpHubConnectionBuilder</xref>. </p>
+references:
+- uid: "26831127"
+  spec.java:
+  - name: String
+    fullName: String
+- uid: com.microsoft.signalr.HubConnectionBuilder.create*
+  name: create
+  nameWithType: HubConnectionBuilder.create
+  fullName: com.microsoft.signalr.HubConnectionBuilder.create
+  package: com.microsoft.signalr
+- uid: 13c86962com.microsoft.signalr.HubConnection
+  spec.java:
+  - name: 'abstract '
+    fullName: 'abstract '
+  - uid: com.microsoft.signalr.HubConnection
+    name: HubConnection
+    fullName: com.microsoft.signalr.HubConnection
+    href: com.microsoft.signalr.HubConnection.yml
+- uid: com.microsoft.signalr.HubConnectionBuilder.build*
+  name: build
+  nameWithType: HubConnectionBuilder.build
+  fullName: com.microsoft.signalr.HubConnectionBuilder.build
+  package: com.microsoft.signalr
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder
+  parent: com.microsoft.signalr
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  name: HttpHubConnectionBuilder
+  nameWithType: HttpHubConnectionBuilder
+  fullName: com.microsoft.signalr.HttpHubConnectionBuilder
+  type: Class
+  summary: "<p>A builder for configuring <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> instances. </p>"
+  syntax:
+    content: public class HttpHubConnectionBuilder
+- uid: com.microsoft.signalr.HubConnection
+  parent: com.microsoft.signalr
+  href: com.microsoft.signalr.HubConnection.yml
+  name: HubConnection
+  nameWithType: HubConnection
+  fullName: com.microsoft.signalr.HubConnection
+  type: Class
+  summary: "<p>A connection used to invoke hub methods on a SignalR Server. </p>"
+  syntax:
+    content: public class HubConnection
diff --git a/docs-ref-autogen/com.microsoft.signalr.HubConnectionState.yml b/docs-ref-autogen/com.microsoft.signalr.HubConnectionState.yml
new file mode 100644
index 0000000..b4ad73d
--- /dev/null
+++ b/docs-ref-autogen/com.microsoft.signalr.HubConnectionState.yml
@@ -0,0 +1,74 @@
+### YamlMime:ManagedReference
+items:
+- uid: com.microsoft.signalr.HubConnectionState
+  id: HubConnectionState
+  parent: com.microsoft.signalr
+  children:
+  - com.microsoft.signalr.HubConnectionState.CONNECTED
+  - com.microsoft.signalr.HubConnectionState.DISCONNECTED
+  href: com.microsoft.signalr.HubConnectionState.yml
+  langs:
+  - java
+  name: HubConnectionState
+  nameWithType: HubConnectionState
+  fullName: com.microsoft.signalr.HubConnectionState
+  type: Enum
+  source:
+    remote: &o0
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java
+      branch: release/2.2
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java
+    startLine: 8
+  package: com.microsoft.signalr
+  summary: "<p>Indicates the state of the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref>. </p>"
+  syntax:
+    content: public enum HubConnectionState
+  inheritance:
+  - java.lang.Object
+  - java.lang.Enum<HubConnectionState>
+- uid: com.microsoft.signalr.HubConnectionState.CONNECTED
+  id: CONNECTED
+  parent: com.microsoft.signalr.HubConnectionState
+  href: com.microsoft.signalr.HubConnectionState.yml
+  langs:
+  - java
+  name: CONNECTED
+  nameWithType: HubConnectionState.CONNECTED
+  fullName: com.microsoft.signalr.HubConnectionState.CONNECTED
+  type: Field
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java
+    startLine: 9
+  package: com.microsoft.signalr
+  syntax:
+    content: public CONNECTED
+- uid: com.microsoft.signalr.HubConnectionState.DISCONNECTED
+  id: DISCONNECTED
+  parent: com.microsoft.signalr.HubConnectionState
+  href: com.microsoft.signalr.HubConnectionState.yml
+  langs:
+  - java
+  name: DISCONNECTED
+  nameWithType: HubConnectionState.DISCONNECTED
+  fullName: com.microsoft.signalr.HubConnectionState.DISCONNECTED
+  type: Field
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java
+    startLine: 10
+  package: com.microsoft.signalr
+  syntax:
+    content: public DISCONNECTED
+references:
+- uid: com.microsoft.signalr.HubConnection
+  parent: com.microsoft.signalr
+  href: com.microsoft.signalr.HubConnection.yml
+  name: HubConnection
+  nameWithType: HubConnection
+  fullName: com.microsoft.signalr.HubConnection
+  type: Class
+  summary: "<p>A connection used to invoke hub methods on a SignalR Server. </p>"
+  syntax:
+    content: public class HubConnection
diff --git a/docs-ref-autogen/com.microsoft.signalr._hub_exception.yml b/docs-ref-autogen/com.microsoft.signalr.HubException.yml
similarity index 51%
rename from docs-ref-autogen/com.microsoft.signalr._hub_exception.yml
rename to docs-ref-autogen/com.microsoft.signalr.HubException.yml
index 3e7e7ff..518f4bb 100644
--- a/docs-ref-autogen/com.microsoft.signalr._hub_exception.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.HubException.yml
@@ -1,13 +1,13 @@
 ### YamlMime:ManagedReference
 items:
-- uid: com.microsoft.signalr._hub_exception
-  id: _hub_exception
+- uid: com.microsoft.signalr.HubException
+  id: HubException
   parent: com.microsoft.signalr
   children:
-  - com.microsoft.signalr._hub_exception.HubException()
-  - com.microsoft.signalr._hub_exception.HubException(String)
-  - com.microsoft.signalr._hub_exception.HubException(String,Exception)
-  href: com.microsoft.signalr._hub_exception.yml
+  - com.microsoft.signalr.HubException.HubException()
+  - com.microsoft.signalr.HubException.HubException(String)
+  - com.microsoft.signalr.HubException.HubException(String,Exception)
+  href: com.microsoft.signalr.HubException.yml
   langs:
   - java
   name: HubException
@@ -16,83 +16,77 @@ items:
   type: Class
   source:
     remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
     startLine: 8
   package: com.microsoft.signalr
-  summary: <p>An exception thrown when the server fails to invoke a Hub method. </p>
+  summary: "<p>An exception thrown when the server fails to invoke a Hub method. </p>"
   syntax: &o1
     content: public class HubException
   inheritance:
   - java.lang.Object
   - RuntimeException
-- uid: com.microsoft.signalr._hub_exception.HubException()
+- uid: com.microsoft.signalr.HubException.HubException()
   id: HubException()
-  parent: com.microsoft.signalr._hub_exception
-  href: com.microsoft.signalr._hub_exception.yml
+  parent: com.microsoft.signalr.HubException
+  href: com.microsoft.signalr.HubException.yml
   langs:
   - java
   name: HubException()
   nameWithType: HubException.HubException()
   fullName: com.microsoft.signalr.HubException.HubException()
-  overload: com.microsoft.signalr._hub_exception.HubException*
+  overload: com.microsoft.signalr.HubException.HubException*
   type: Constructor
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
     startLine: 14
   package: com.microsoft.signalr
-  summary: <p>Initializes a new instance of the <xref uid="com.microsoft.signalr._hub_exception" data-throw-if-not-resolved="false">HubException</xref> class. </p>
+  summary: "<p>Initializes a new instance of the <xref uid=\"com.microsoft.signalr.HubException\" data-throw-if-not-resolved=\"false\">HubException</xref> class. </p>"
   syntax:
     content: public HubException()
-- uid: com.microsoft.signalr._hub_exception.HubException(String)
+- uid: com.microsoft.signalr.HubException.HubException(String)
   id: HubException(String)
-  parent: com.microsoft.signalr._hub_exception
-  href: com.microsoft.signalr._hub_exception.yml
+  parent: com.microsoft.signalr.HubException
+  href: com.microsoft.signalr.HubException.yml
   langs:
   - java
   name: HubException(String errorMessage)
   nameWithType: HubException.HubException(String errorMessage)
   fullName: com.microsoft.signalr.HubException.HubException(String errorMessage)
-  overload: com.microsoft.signalr._hub_exception.HubException*
+  overload: com.microsoft.signalr.HubException.HubException*
   type: Constructor
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
     startLine: 22
   package: com.microsoft.signalr
-  summary: >-
-    <p>Initializes a new instance of the <xref uid="com.microsoft.signalr._hub_exception" data-throw-if-not-resolved="false">HubException</xref> class with a specified error message.</p>
-
-    <p></p>
+  summary: "<p>Initializes a new instance of the <xref uid=\"com.microsoft.signalr.HubException\" data-throw-if-not-resolved=\"false\">HubException</xref> class with a specified error message.</p>\r\n<p></p>"
   syntax:
     content: public HubException(String errorMessage)
     parameters:
     - id: errorMessage
       type: "26831127"
       description: <p>The error message that explains the reason for the exception. </p>
-- uid: com.microsoft.signalr._hub_exception.HubException(String,Exception)
+- uid: com.microsoft.signalr.HubException.HubException(String,Exception)
   id: HubException(String,Exception)
-  parent: com.microsoft.signalr._hub_exception
-  href: com.microsoft.signalr._hub_exception.yml
+  parent: com.microsoft.signalr.HubException
+  href: com.microsoft.signalr.HubException.yml
   langs:
   - java
   name: HubException(String errorMessage, Exception innerException)
   nameWithType: HubException.HubException(String errorMessage, Exception innerException)
   fullName: com.microsoft.signalr.HubException.HubException(String errorMessage, Exception innerException)
-  overload: com.microsoft.signalr._hub_exception.HubException*
+  overload: com.microsoft.signalr.HubException.HubException*
   type: Constructor
   source:
     remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/HubException.java
     startLine: 33
   package: com.microsoft.signalr
-  summary: >-
-    <p>Initializes a new instance of the <xref uid="com.microsoft.signalr._hub_exception" data-throw-if-not-resolved="false">HubException</xref> class with a specified error message and a reference to the exception that is the cause of this exception.</p>
-
-    <p></p>
+  summary: "<p>Initializes a new instance of the <xref uid=\"com.microsoft.signalr.HubException\" data-throw-if-not-resolved=\"false\">HubException</xref> class with a specified error message and a reference to the exception that is the cause of this exception.</p>\r\n<p></p>"
   syntax:
     content: public HubException(String errorMessage, Exception innerException)
     parameters:
@@ -103,7 +97,7 @@ items:
       type: 8a99d4b0
       description: <p>The exception that is the cause of the current exception, or null if no inner exception is specified. </p>
 references:
-- uid: com.microsoft.signalr._hub_exception.HubException*
+- uid: com.microsoft.signalr.HubException.HubException*
   name: HubException
   nameWithType: HubException.HubException
   fullName: com.microsoft.signalr.HubException.HubException
@@ -116,12 +110,12 @@ references:
   spec.java:
   - name: Exception
     fullName: Exception
-- uid: com.microsoft.signalr._hub_exception
+- uid: com.microsoft.signalr.HubException
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_exception.yml
+  href: com.microsoft.signalr.HubException.yml
   name: HubException
   nameWithType: HubException
   fullName: com.microsoft.signalr.HubException
   type: Class
-  summary: <p>An exception thrown when the server fails to invoke a Hub method. </p>
+  summary: "<p>An exception thrown when the server fails to invoke a Hub method. </p>"
   syntax: *o1
diff --git a/docs-ref-autogen/com.microsoft.signalr.OnClosedCallback.yml b/docs-ref-autogen/com.microsoft.signalr.OnClosedCallback.yml
new file mode 100644
index 0000000..a9c2372
--- /dev/null
+++ b/docs-ref-autogen/com.microsoft.signalr.OnClosedCallback.yml
@@ -0,0 +1,56 @@
+### YamlMime:ManagedReference
+items:
+- uid: com.microsoft.signalr.OnClosedCallback
+  id: OnClosedCallback
+  parent: com.microsoft.signalr
+  children:
+  - com.microsoft.signalr.OnClosedCallback.invoke(Exception)
+  href: com.microsoft.signalr.OnClosedCallback.yml
+  langs:
+  - java
+  name: OnClosedCallback
+  nameWithType: OnClosedCallback
+  fullName: com.microsoft.signalr.OnClosedCallback
+  type: Interface
+  source:
+    remote: &o0
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnClosedCallback.java
+      branch: release/2.2
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnClosedCallback.java
+    startLine: 8
+  package: com.microsoft.signalr
+  summary: "<p>A callback to create and register on a HubConnections OnClosed method. </p>"
+  syntax:
+    content: public interface OnClosedCallback
+- uid: com.microsoft.signalr.OnClosedCallback.invoke(Exception)
+  id: invoke(Exception)
+  parent: com.microsoft.signalr.OnClosedCallback
+  href: com.microsoft.signalr.OnClosedCallback.yml
+  langs:
+  - java
+  name: invoke(Exception exception)
+  nameWithType: OnClosedCallback.invoke(Exception exception)
+  fullName: com.microsoft.signalr.OnClosedCallback.invoke(Exception exception)
+  overload: com.microsoft.signalr.OnClosedCallback.invoke*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/OnClosedCallback.java
+    startLine: 9
+  package: com.microsoft.signalr
+  syntax:
+    content: public void invoke(Exception exception)
+    parameters:
+    - id: exception
+      type: 8a99d4b0
+references:
+- uid: 8a99d4b0
+  spec.java:
+  - name: Exception
+    fullName: Exception
+- uid: com.microsoft.signalr.OnClosedCallback.invoke*
+  name: invoke
+  nameWithType: OnClosedCallback.invoke
+  fullName: com.microsoft.signalr.OnClosedCallback.invoke
+  package: com.microsoft.signalr
diff --git a/docs-ref-autogen/com.microsoft.signalr.Subscription.yml b/docs-ref-autogen/com.microsoft.signalr.Subscription.yml
new file mode 100644
index 0000000..e5fecef
--- /dev/null
+++ b/docs-ref-autogen/com.microsoft.signalr.Subscription.yml
@@ -0,0 +1,52 @@
+### YamlMime:ManagedReference
+items:
+- uid: com.microsoft.signalr.Subscription
+  id: Subscription
+  parent: com.microsoft.signalr
+  children:
+  - com.microsoft.signalr.Subscription.unsubscribe()
+  href: com.microsoft.signalr.Subscription.yml
+  langs:
+  - java
+  name: Subscription
+  nameWithType: Subscription
+  fullName: com.microsoft.signalr.Subscription
+  type: Class
+  source:
+    remote: &o0
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java
+      branch: release/2.2
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java
+    startLine: 10
+  package: com.microsoft.signalr
+  summary: "<p>Represents the registration of a handler for a client method. </p>"
+  syntax:
+    content: public class Subscription
+  inheritance:
+  - java.lang.Object
+- uid: com.microsoft.signalr.Subscription.unsubscribe()
+  id: unsubscribe()
+  parent: com.microsoft.signalr.Subscription
+  href: com.microsoft.signalr.Subscription.yml
+  langs:
+  - java
+  name: unsubscribe()
+  nameWithType: Subscription.unsubscribe()
+  fullName: com.microsoft.signalr.Subscription.unsubscribe()
+  overload: com.microsoft.signalr.Subscription.unsubscribe*
+  type: Method
+  source:
+    remote: *o0
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java
+    startLine: 24
+  package: com.microsoft.signalr
+  summary: "<p>Removes the client method handler represented by this subscription. </p>"
+  syntax:
+    content: public void unsubscribe()
+references:
+- uid: com.microsoft.signalr.Subscription.unsubscribe*
+  name: unsubscribe
+  nameWithType: Subscription.unsubscribe
+  fullName: com.microsoft.signalr.Subscription.unsubscribe
+  package: com.microsoft.signalr
diff --git a/docs-ref-autogen/com.microsoft.signalr._action.yml b/docs-ref-autogen/com.microsoft.signalr._action.yml
deleted file mode 100644
index fa33b66..0000000
--- a/docs-ref-autogen/com.microsoft.signalr._action.yml
+++ /dev/null
@@ -1,49 +0,0 @@
-### YamlMime:ManagedReference
-items:
-- uid: com.microsoft.signalr._action
-  id: _action
-  parent: com.microsoft.signalr
-  children:
-  - com.microsoft.signalr._action.invoke()
-  href: com.microsoft.signalr._action.yml
-  langs:
-  - java
-  name: Action
-  nameWithType: Action
-  fullName: com.microsoft.signalr.Action
-  type: Interface
-  source:
-    remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
-      branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
-    startLine: 9
-  package: com.microsoft.signalr
-  summary: <p>A callback that takes no parameters. </p>
-  syntax:
-    content: public interface Action
-- uid: com.microsoft.signalr._action.invoke()
-  id: invoke()
-  parent: com.microsoft.signalr._action
-  href: com.microsoft.signalr._action.yml
-  langs:
-  - java
-  name: invoke()
-  nameWithType: Action.invoke()
-  fullName: com.microsoft.signalr.Action.invoke()
-  overload: com.microsoft.signalr._action.invoke*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
-    startLine: 10
-  package: com.microsoft.signalr
-  syntax:
-    content: public void invoke()
-references:
-- uid: com.microsoft.signalr._action.invoke*
-  name: invoke
-  nameWithType: Action.invoke
-  fullName: com.microsoft.signalr.Action.invoke
-  package: com.microsoft.signalr
diff --git a/docs-ref-autogen/com.microsoft.signalr._http_hub_connection_builder.yml b/docs-ref-autogen/com.microsoft.signalr._http_hub_connection_builder.yml
deleted file mode 100644
index 38f71dc..0000000
--- a/docs-ref-autogen/com.microsoft.signalr._http_hub_connection_builder.yml
+++ /dev/null
@@ -1,274 +0,0 @@
-### YamlMime:ManagedReference
-items:
-- uid: com.microsoft.signalr._http_hub_connection_builder
-  id: _http_hub_connection_builder
-  parent: com.microsoft.signalr
-  children:
-  - com.microsoft.signalr._http_hub_connection_builder.build()
-  - com.microsoft.signalr._http_hub_connection_builder.shouldSkipNegotiate(boolean)
-  - com.microsoft.signalr._http_hub_connection_builder.withAccessTokenProvider(Single<String>)
-  - com.microsoft.signalr._http_hub_connection_builder.withHandshakeResponseTimeout(Duration)
-  - com.microsoft.signalr._http_hub_connection_builder.withHeader(String,String)
-  - com.microsoft.signalr._http_hub_connection_builder.withHeaders(Map<String, String>)
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  langs:
-  - java
-  name: HttpHubConnectionBuilder
-  nameWithType: HttpHubConnectionBuilder
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder
-  type: Class
-  source:
-    remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
-      branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
-    startLine: 14
-  package: com.microsoft.signalr
-  summary: <p>A builder for configuring <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> instances. </p>
-  syntax: &o1
-    content: public class HttpHubConnectionBuilder
-  inheritance:
-  - java.lang.Object
-- uid: com.microsoft.signalr._http_hub_connection_builder.build()
-  id: build()
-  parent: com.microsoft.signalr._http_hub_connection_builder
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  langs:
-  - java
-  name: build()
-  nameWithType: HttpHubConnectionBuilder.build()
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.build()
-  overload: com.microsoft.signalr._http_hub_connection_builder.build*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
-    startLine: 114
-  package: com.microsoft.signalr
-  summary: >-
-    <p>Builds a new instance of <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>.</p>
-
-    <p></p>
-  syntax:
-    content: public HubConnection build()
-    return:
-      type: com.microsoft.signalr._hub_connection
-      description: <p>A new instance of <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
-- uid: com.microsoft.signalr._http_hub_connection_builder.shouldSkipNegotiate(boolean)
-  id: shouldSkipNegotiate(boolean)
-  parent: com.microsoft.signalr._http_hub_connection_builder
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  langs:
-  - java
-  name: shouldSkipNegotiate(boolean skipNegotiate)
-  nameWithType: HttpHubConnectionBuilder.shouldSkipNegotiate(boolean skipNegotiate)
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.shouldSkipNegotiate(boolean skipNegotiate)
-  overload: com.microsoft.signalr._http_hub_connection_builder.shouldSkipNegotiate*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
-    startLine: 56
-  package: com.microsoft.signalr
-  summary: >-
-    <p>Indicates to the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> that it should skip the negotiate process. Note: This option only works with the Websockets transport and the Azure SignalR Service require the negotiate step.</p>
-
-    <p></p>
-  syntax:
-    content: public HttpHubConnectionBuilder shouldSkipNegotiate(boolean skipNegotiate)
-    parameters:
-    - id: skipNegotiate
-      type: 4fc6e284
-      description: <p>Boolean indicating if the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> should skip the negotiate step. </p>
-    return:
-      type: com.microsoft.signalr._http_hub_connection_builder
-      description: <p>This instance of the HttpHubConnectionBuilder. </p>
-- uid: com.microsoft.signalr._http_hub_connection_builder.withAccessTokenProvider(Single<String>)
-  id: withAccessTokenProvider(Single<String>)
-  parent: com.microsoft.signalr._http_hub_connection_builder
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  langs:
-  - java
-  name: withAccessTokenProvider(Single<String> accessTokenProvider)
-  nameWithType: HttpHubConnectionBuilder.withAccessTokenProvider(Single<String> accessTokenProvider)
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withAccessTokenProvider(Single<String> accessTokenProvider)
-  overload: com.microsoft.signalr._http_hub_connection_builder.withAccessTokenProvider*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
-    startLine: 67
-  package: com.microsoft.signalr
-  summary: >-
-    <p>Sets the access token provider for the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>.</p>
-
-    <p></p>
-  syntax:
-    content: public HttpHubConnectionBuilder withAccessTokenProvider(Single<String> accessTokenProvider)
-    parameters:
-    - id: accessTokenProvider
-      type: 0488a115
-      description: <p>The access token provider to be used by the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
-    return:
-      type: com.microsoft.signalr._http_hub_connection_builder
-      description: <p>This instance of the HttpHubConnectionBuilder. </p>
-- uid: com.microsoft.signalr._http_hub_connection_builder.withHandshakeResponseTimeout(Duration)
-  id: withHandshakeResponseTimeout(Duration)
-  parent: com.microsoft.signalr._http_hub_connection_builder
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  langs:
-  - java
-  name: withHandshakeResponseTimeout(Duration timeout)
-  nameWithType: HttpHubConnectionBuilder.withHandshakeResponseTimeout(Duration timeout)
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHandshakeResponseTimeout(Duration timeout)
-  overload: com.microsoft.signalr._http_hub_connection_builder.withHandshakeResponseTimeout*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
-    startLine: 78
-  package: com.microsoft.signalr
-  summary: >-
-    <p>Sets the duration the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> should wait for a Handshake Response from the server.</p>
-
-    <p></p>
-  syntax:
-    content: public HttpHubConnectionBuilder withHandshakeResponseTimeout(Duration timeout)
-    parameters:
-    - id: timeout
-      type: e02a2de0
-      description: <p>The duration that the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> should wait for a Handshake Response from the server. </p>
-    return:
-      type: com.microsoft.signalr._http_hub_connection_builder
-      description: <p>This instance of the HttpHubConnectionBuilder. </p>
-- uid: com.microsoft.signalr._http_hub_connection_builder.withHeader(String,String)
-  id: withHeader(String,String)
-  parent: com.microsoft.signalr._http_hub_connection_builder
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  langs:
-  - java
-  name: withHeader(String name, String value)
-  nameWithType: HttpHubConnectionBuilder.withHeader(String name, String value)
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHeader(String name, String value)
-  overload: com.microsoft.signalr._http_hub_connection_builder.withHeader*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
-    startLine: 101
-  package: com.microsoft.signalr
-  summary: >-
-    <p>Sets a single header for the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> to send.</p>
-
-    <p></p>
-  syntax:
-    content: public HttpHubConnectionBuilder withHeader(String name, String value)
-    parameters:
-    - id: name
-      type: "26831127"
-      description: <p>The name of the header to set. </p>
-    - id: value
-      type: "26831127"
-      description: <p>The value of the header to be set. </p>
-    return:
-      type: com.microsoft.signalr._http_hub_connection_builder
-      description: <p>This instance of the HttpHubConnectionBuilder. </p>
-- uid: com.microsoft.signalr._http_hub_connection_builder.withHeaders(Map<String, String>)
-  id: withHeaders(Map<String, String>)
-  parent: com.microsoft.signalr._http_hub_connection_builder
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  langs:
-  - java
-  name: withHeaders(Map<String, String> headers)
-  nameWithType: HttpHubConnectionBuilder.withHeaders(Map<String, String> headers)
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHeaders(Map<String, String> headers)
-  overload: com.microsoft.signalr._http_hub_connection_builder.withHeaders*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HttpHubConnectionBuilder.java
-    startLine: 89
-  package: com.microsoft.signalr
-  summary: >-
-    <p>Sets a collection of Headers for the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> to send with every Http request.</p>
-
-    <p></p>
-  syntax:
-    content: public HttpHubConnectionBuilder withHeaders(Map<String, String> headers)
-    parameters:
-    - id: headers
-      type: 689c8cb5
-      description: <p>A Map representing the collection of Headers that the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> should send. </p>
-    return:
-      type: com.microsoft.signalr._http_hub_connection_builder
-      description: <p>This instance of the HttpHubConnectionBuilder. </p>
-references:
-- uid: 4fc6e284
-  spec.java:
-  - name: boolean
-    fullName: boolean
-- uid: com.microsoft.signalr._http_hub_connection_builder.shouldSkipNegotiate*
-  name: shouldSkipNegotiate
-  nameWithType: HttpHubConnectionBuilder.shouldSkipNegotiate
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.shouldSkipNegotiate
-  package: com.microsoft.signalr
-- uid: 0488a115
-  spec.java:
-  - name: Single<String>
-    fullName: Single<String>
-- uid: com.microsoft.signalr._http_hub_connection_builder.withAccessTokenProvider*
-  name: withAccessTokenProvider
-  nameWithType: HttpHubConnectionBuilder.withAccessTokenProvider
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withAccessTokenProvider
-  package: com.microsoft.signalr
-- uid: e02a2de0
-  spec.java:
-  - name: Duration
-    fullName: Duration
-- uid: com.microsoft.signalr._http_hub_connection_builder.withHandshakeResponseTimeout*
-  name: withHandshakeResponseTimeout
-  nameWithType: HttpHubConnectionBuilder.withHandshakeResponseTimeout
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHandshakeResponseTimeout
-  package: com.microsoft.signalr
-- uid: 689c8cb5
-  spec.java:
-  - name: Map<String, String>
-    fullName: Map<String, String>
-- uid: com.microsoft.signalr._http_hub_connection_builder.withHeaders*
-  name: withHeaders
-  nameWithType: HttpHubConnectionBuilder.withHeaders
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHeaders
-  package: com.microsoft.signalr
-- uid: "26831127"
-  spec.java:
-  - name: String
-    fullName: String
-- uid: com.microsoft.signalr._http_hub_connection_builder.withHeader*
-  name: withHeader
-  nameWithType: HttpHubConnectionBuilder.withHeader
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.withHeader
-  package: com.microsoft.signalr
-- uid: com.microsoft.signalr._http_hub_connection_builder.build*
-  name: build
-  nameWithType: HttpHubConnectionBuilder.build
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder.build
-  package: com.microsoft.signalr
-- uid: com.microsoft.signalr._http_hub_connection_builder
-  parent: com.microsoft.signalr
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  name: HttpHubConnectionBuilder
-  nameWithType: HttpHubConnectionBuilder
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder
-  type: Class
-  summary: <p>A builder for configuring <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> instances. </p>
-  syntax: *o1
-- uid: com.microsoft.signalr._hub_connection
-  parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_connection.yml
-  name: HubConnection
-  nameWithType: HubConnection
-  fullName: com.microsoft.signalr.HubConnection
-  type: Class
-  syntax:
-    content: public class HubConnection
diff --git a/docs-ref-autogen/com.microsoft.signalr._hub_connection_builder.yml b/docs-ref-autogen/com.microsoft.signalr._hub_connection_builder.yml
deleted file mode 100644
index a4b489b..0000000
--- a/docs-ref-autogen/com.microsoft.signalr._hub_connection_builder.yml
+++ /dev/null
@@ -1,124 +0,0 @@
-### YamlMime:ManagedReference
-items:
-- uid: com.microsoft.signalr._hub_connection_builder
-  id: _hub_connection_builder
-  parent: com.microsoft.signalr
-  children:
-  - com.microsoft.signalr._hub_connection_builder.build()
-  - com.microsoft.signalr._hub_connection_builder.create(String)
-  href: com.microsoft.signalr._hub_connection_builder.yml
-  langs:
-  - java
-  name: HubConnectionBuilder
-  nameWithType: HubConnectionBuilder
-  fullName: com.microsoft.signalr.HubConnectionBuilder
-  type: Class
-  source:
-    remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java
-      branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java
-    startLine: 8
-  package: com.microsoft.signalr
-  summary: <p>A builder for configuring <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> instances. </p>
-  syntax:
-    content: public class HubConnectionBuilder
-  inheritance:
-  - java.lang.Object
-- uid: com.microsoft.signalr._hub_connection_builder.build()
-  id: build()
-  parent: com.microsoft.signalr._hub_connection_builder
-  href: com.microsoft.signalr._hub_connection_builder.yml
-  langs:
-  - java
-  name: build()
-  nameWithType: HubConnectionBuilder.build()
-  fullName: com.microsoft.signalr.HubConnectionBuilder.build()
-  overload: com.microsoft.signalr._hub_connection_builder.build*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java
-    startLine: 27
-  package: com.microsoft.signalr
-  summary: >-
-    <p>Builds a new instance of <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>.</p>
-
-    <p></p>
-  syntax:
-    content: public abstract HubConnection build()
-    return:
-      type: 13c86962com.microsoft.signalr._hub_connection
-      description: <p>A new instance of <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
-- uid: com.microsoft.signalr._hub_connection_builder.create(String)
-  id: create(String)
-  parent: com.microsoft.signalr._hub_connection_builder
-  href: com.microsoft.signalr._hub_connection_builder.yml
-  langs:
-  - java
-  name: create(String url)
-  nameWithType: HubConnectionBuilder.create(String url)
-  fullName: com.microsoft.signalr.HubConnectionBuilder.create(String url)
-  overload: com.microsoft.signalr._hub_connection_builder.create*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionBuilder.java
-    startLine: 15
-  package: com.microsoft.signalr
-  summary: >-
-    <p>Creates a new instance of <xref uid="com.microsoft.signalr._http_hub_connection_builder" data-throw-if-not-resolved="false">HttpHubConnectionBuilder</xref>.</p>
-
-    <p></p>
-  syntax:
-    content: public static HttpHubConnectionBuilder create(String url)
-    parameters:
-    - id: url
-      type: "26831127"
-      description: <p>The URL of the SignalR hub to connect to. </p>
-    return:
-      type: com.microsoft.signalr._http_hub_connection_builder
-      description: <p>An instance of <xref uid="com.microsoft.signalr._http_hub_connection_builder" data-throw-if-not-resolved="false">HttpHubConnectionBuilder</xref>. </p>
-references:
-- uid: "26831127"
-  spec.java:
-  - name: String
-    fullName: String
-- uid: com.microsoft.signalr._hub_connection_builder.create*
-  name: create
-  nameWithType: HubConnectionBuilder.create
-  fullName: com.microsoft.signalr.HubConnectionBuilder.create
-  package: com.microsoft.signalr
-- uid: 13c86962com.microsoft.signalr._hub_connection
-  spec.java:
-  - name: 'abstract '
-    fullName: 'abstract '
-  - uid: com.microsoft.signalr._hub_connection
-    name: HubConnection
-    fullName: com.microsoft.signalr.HubConnection
-    href: com.microsoft.signalr._hub_connection.yml
-- uid: com.microsoft.signalr._hub_connection_builder.build*
-  name: build
-  nameWithType: HubConnectionBuilder.build
-  fullName: com.microsoft.signalr.HubConnectionBuilder.build
-  package: com.microsoft.signalr
-- uid: com.microsoft.signalr._http_hub_connection_builder
-  parent: com.microsoft.signalr
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
-  name: HttpHubConnectionBuilder
-  nameWithType: HttpHubConnectionBuilder
-  fullName: com.microsoft.signalr.HttpHubConnectionBuilder
-  type: Class
-  summary: <p>A builder for configuring <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> instances. </p>
-  syntax:
-    content: public class HttpHubConnectionBuilder
-- uid: com.microsoft.signalr._hub_connection
-  parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_connection.yml
-  name: HubConnection
-  nameWithType: HubConnection
-  fullName: com.microsoft.signalr.HubConnection
-  type: Class
-  syntax:
-    content: public class HubConnection
diff --git a/docs-ref-autogen/com.microsoft.signalr._hub_connection_state.yml b/docs-ref-autogen/com.microsoft.signalr._hub_connection_state.yml
deleted file mode 100644
index 4b1a45b..0000000
--- a/docs-ref-autogen/com.microsoft.signalr._hub_connection_state.yml
+++ /dev/null
@@ -1,73 +0,0 @@
-### YamlMime:ManagedReference
-items:
-- uid: com.microsoft.signalr._hub_connection_state
-  id: _hub_connection_state
-  parent: com.microsoft.signalr
-  children:
-  - com.microsoft.signalr._hub_connection_state.CONNECTED
-  - com.microsoft.signalr._hub_connection_state.DISCONNECTED
-  href: com.microsoft.signalr._hub_connection_state.yml
-  langs:
-  - java
-  name: HubConnectionState
-  nameWithType: HubConnectionState
-  fullName: com.microsoft.signalr.HubConnectionState
-  type: Enum
-  source:
-    remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java
-      branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java
-    startLine: 8
-  package: com.microsoft.signalr
-  summary: <p>Indicates the state of the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
-  syntax:
-    content: public enum HubConnectionState
-  inheritance:
-  - java.lang.Object
-  - java.lang.Enum<HubConnectionState>
-- uid: com.microsoft.signalr._hub_connection_state.CONNECTED
-  id: CONNECTED
-  parent: com.microsoft.signalr._hub_connection_state
-  href: com.microsoft.signalr._hub_connection_state.yml
-  langs:
-  - java
-  name: CONNECTED
-  nameWithType: HubConnectionState.CONNECTED
-  fullName: com.microsoft.signalr.HubConnectionState.CONNECTED
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java
-    startLine: 9
-  package: com.microsoft.signalr
-  syntax:
-    content: public CONNECTED
-- uid: com.microsoft.signalr._hub_connection_state.DISCONNECTED
-  id: DISCONNECTED
-  parent: com.microsoft.signalr._hub_connection_state
-  href: com.microsoft.signalr._hub_connection_state.yml
-  langs:
-  - java
-  name: DISCONNECTED
-  nameWithType: HubConnectionState.DISCONNECTED
-  fullName: com.microsoft.signalr.HubConnectionState.DISCONNECTED
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/HubConnectionState.java
-    startLine: 10
-  package: com.microsoft.signalr
-  syntax:
-    content: public DISCONNECTED
-references:
-- uid: com.microsoft.signalr._hub_connection
-  parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_connection.yml
-  name: HubConnection
-  nameWithType: HubConnection
-  fullName: com.microsoft.signalr.HubConnection
-  type: Class
-  syntax:
-    content: public class HubConnection
diff --git a/docs-ref-autogen/com.microsoft.signalr._log_level.yml b/docs-ref-autogen/com.microsoft.signalr._log_level.yml
deleted file mode 100644
index d855b10..0000000
--- a/docs-ref-autogen/com.microsoft.signalr._log_level.yml
+++ /dev/null
@@ -1,204 +0,0 @@
-### YamlMime:ManagedReference
-items:
-- uid: com.microsoft.signalr._log_level
-  id: _log_level
-  parent: com.microsoft.signalr
-  children:
-  - com.microsoft.signalr._log_level.Critical
-  - com.microsoft.signalr._log_level.Debug
-  - com.microsoft.signalr._log_level.Error
-  - com.microsoft.signalr._log_level.Information
-  - com.microsoft.signalr._log_level.LogLevel(int)
-  - com.microsoft.signalr._log_level.None
-  - com.microsoft.signalr._log_level.Trace
-  - com.microsoft.signalr._log_level.value
-  - com.microsoft.signalr._log_level.Warning
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: LogLevel
-  nameWithType: LogLevel
-  fullName: com.microsoft.signalr.LogLevel
-  type: Enum
-  source:
-    remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-      branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 5
-  package: com.microsoft.signalr
-  syntax:
-    content: public enum LogLevel
-  inheritance:
-  - java.lang.Object
-  - java.lang.Enum<LogLevel>
-- uid: com.microsoft.signalr._log_level.Critical
-  id: Critical
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: Critical
-  nameWithType: LogLevel.Critical
-  fullName: com.microsoft.signalr.LogLevel.Critical
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 11
-  package: com.microsoft.signalr
-  syntax:
-    content: public Critical=(5)
-- uid: com.microsoft.signalr._log_level.Debug
-  id: Debug
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: Debug
-  nameWithType: LogLevel.Debug
-  fullName: com.microsoft.signalr.LogLevel.Debug
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 7
-  package: com.microsoft.signalr
-  syntax:
-    content: public Debug=(1)
-- uid: com.microsoft.signalr._log_level.Error
-  id: Error
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: Error
-  nameWithType: LogLevel.Error
-  fullName: com.microsoft.signalr.LogLevel.Error
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 10
-  package: com.microsoft.signalr
-  syntax:
-    content: public Error=(4)
-- uid: com.microsoft.signalr._log_level.Information
-  id: Information
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: Information
-  nameWithType: LogLevel.Information
-  fullName: com.microsoft.signalr.LogLevel.Information
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 8
-  package: com.microsoft.signalr
-  syntax:
-    content: public Information=(2)
-- uid: com.microsoft.signalr._log_level.LogLevel(int)
-  id: LogLevel(int)
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: LogLevel(int id)
-  nameWithType: LogLevel.LogLevel(int id)
-  fullName: com.microsoft.signalr.LogLevel.LogLevel(int id)
-  overload: com.microsoft.signalr._log_level.LogLevel*
-  type: Constructor
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 15
-  package: com.microsoft.signalr
-  syntax:
-    content: public LogLevel(int id)
-    parameters:
-    - id: id
-      type: f75371fa
-- uid: com.microsoft.signalr._log_level.None
-  id: None
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: None
-  nameWithType: LogLevel.None
-  fullName: com.microsoft.signalr.LogLevel.None
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 12
-  package: com.microsoft.signalr
-  syntax:
-    content: public None=(6)
-- uid: com.microsoft.signalr._log_level.Trace
-  id: Trace
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: Trace
-  nameWithType: LogLevel.Trace
-  fullName: com.microsoft.signalr.LogLevel.Trace
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 6
-  package: com.microsoft.signalr
-  syntax:
-    content: public Trace=(0)
-- uid: com.microsoft.signalr._log_level.value
-  id: value
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: value
-  nameWithType: LogLevel.value
-  fullName: com.microsoft.signalr.LogLevel.value
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 14
-  package: com.microsoft.signalr
-  syntax:
-    content: public int value
-    return:
-      type: f75371fa
-- uid: com.microsoft.signalr._log_level.Warning
-  id: Warning
-  parent: com.microsoft.signalr._log_level
-  href: com.microsoft.signalr._log_level.yml
-  langs:
-  - java
-  name: Warning
-  nameWithType: LogLevel.Warning
-  fullName: com.microsoft.signalr.LogLevel.Warning
-  type: Field
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/LogLevel.java
-    startLine: 9
-  package: com.microsoft.signalr
-  syntax:
-    content: public Warning=(3)
-references:
-- uid: f75371fa
-  spec.java:
-  - name: int
-    fullName: int
-- uid: com.microsoft.signalr._log_level.LogLevel*
-  name: LogLevel
-  nameWithType: LogLevel.LogLevel
-  fullName: com.microsoft.signalr.LogLevel.LogLevel
-  package: com.microsoft.signalr
diff --git a/docs-ref-autogen/com.microsoft.signalr._subscription.yml b/docs-ref-autogen/com.microsoft.signalr._subscription.yml
deleted file mode 100644
index 47edaf0..0000000
--- a/docs-ref-autogen/com.microsoft.signalr._subscription.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-### YamlMime:ManagedReference
-items:
-- uid: com.microsoft.signalr._subscription
-  id: _subscription
-  parent: com.microsoft.signalr
-  children:
-  - com.microsoft.signalr._subscription.unsubscribe()
-  href: com.microsoft.signalr._subscription.yml
-  langs:
-  - java
-  name: Subscription
-  nameWithType: Subscription
-  fullName: com.microsoft.signalr.Subscription
-  type: Class
-  source:
-    remote: &o0
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java
-      branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java
-    startLine: 10
-  package: com.microsoft.signalr
-  summary: <p>Represents the registration of a handler for a client method. </p>
-  syntax:
-    content: public class Subscription
-  inheritance:
-  - java.lang.Object
-- uid: com.microsoft.signalr._subscription.unsubscribe()
-  id: unsubscribe()
-  parent: com.microsoft.signalr._subscription
-  href: com.microsoft.signalr._subscription.yml
-  langs:
-  - java
-  name: unsubscribe()
-  nameWithType: Subscription.unsubscribe()
-  fullName: com.microsoft.signalr.Subscription.unsubscribe()
-  overload: com.microsoft.signalr._subscription.unsubscribe*
-  type: Method
-  source:
-    remote: *o0
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Subscription.java
-    startLine: 24
-  package: com.microsoft.signalr
-  summary: <p>Removes the client method handler represented by this subscription. </p>
-  syntax:
-    content: public void unsubscribe()
-references:
-- uid: com.microsoft.signalr._subscription.unsubscribe*
-  name: unsubscribe
-  nameWithType: Subscription.unsubscribe
-  fullName: com.microsoft.signalr.Subscription.unsubscribe
-  package: com.microsoft.signalr
diff --git a/docs-ref-autogen/com.microsoft.signalr.yml b/docs-ref-autogen/com.microsoft.signalr.yml
index 247c81a..725e490 100644
--- a/docs-ref-autogen/com.microsoft.signalr.yml
+++ b/docs-ref-autogen/com.microsoft.signalr.yml
@@ -3,22 +3,22 @@ items:
 - uid: com.microsoft.signalr
   id: signalr
   children:
-  - com.microsoft.signalr._action
-  - com.microsoft.signalr._action1
-  - com.microsoft.signalr._action2
-  - com.microsoft.signalr._action3
-  - com.microsoft.signalr._action4
-  - com.microsoft.signalr._action5
-  - com.microsoft.signalr._action6
-  - com.microsoft.signalr._action7
-  - com.microsoft.signalr._action8
-  - com.microsoft.signalr._http_hub_connection_builder
-  - com.microsoft.signalr._hub_connection
-  - com.microsoft.signalr._hub_connection_builder
-  - com.microsoft.signalr._hub_connection_state
-  - com.microsoft.signalr._hub_exception
-  - com.microsoft.signalr._log_level
-  - com.microsoft.signalr._subscription
+  - com.microsoft.signalr.Action
+  - com.microsoft.signalr.Action1
+  - com.microsoft.signalr.Action2
+  - com.microsoft.signalr.Action3
+  - com.microsoft.signalr.Action4
+  - com.microsoft.signalr.Action5
+  - com.microsoft.signalr.Action6
+  - com.microsoft.signalr.Action7
+  - com.microsoft.signalr.Action8
+  - com.microsoft.signalr.HttpHubConnectionBuilder
+  - com.microsoft.signalr.HubConnection
+  - com.microsoft.signalr.HubConnectionBuilder
+  - com.microsoft.signalr.HubConnectionState
+  - com.microsoft.signalr.HubException
+  - com.microsoft.signalr.OnClosedCallback
+  - com.microsoft.signalr.Subscription
   href: com.microsoft.signalr.yml
   langs:
   - java
@@ -28,53 +28,47 @@ items:
   type: Namespace
   source:
     remote:
-      path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
+      path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
       branch: release/2.2
-      repo: https://github.com/aspnet/SignalR
-    path: clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
+      repo: https://github.com/aspnet/AspNetCore
+    path: src/SignalR/clients/java/signalr/src/main/java/com/microsoft/signalr/Action.java
     startLine: 3
-  summary: <p>This package contains the classes for SignalR Java client. </p>
+  summary: "<p>This package contains the classes for SignalR Java client. </p>"
   syntax:
     content: package com.microsoft.signalr
 references:
-- uid: com.microsoft.signalr._action
+- uid: com.microsoft.signalr.Action
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action.yml
+  href: com.microsoft.signalr.Action.yml
   name: Action
   nameWithType: Action
   fullName: com.microsoft.signalr.Action
   type: Interface
-  summary: <p>A callback that takes no parameters. </p>
+  summary: "<p>A callback that takes no parameters. </p>"
   syntax:
     content: public interface Action
-- uid: com.microsoft.signalr._action1
+- uid: com.microsoft.signalr.Action1
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action1.yml
+  href: com.microsoft.signalr.Action1.yml
   name: Action1<T1>
   nameWithType: Action1<T1>
   fullName: com.microsoft.signalr.Action1<T1>
   type: Interface
-  summary: >-
-    <p>A callback that takes one parameter.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes one parameter.</p>\r\n<p></p>"
   syntax:
     content: public interface Action1<T1>
     typeParameters:
     - id: T1
       type: ea9d49ce
       description: <p>The type of the first parameter to the callback. </p>
-- uid: com.microsoft.signalr._action2
+- uid: com.microsoft.signalr.Action2
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action2.yml
+  href: com.microsoft.signalr.Action2.yml
   name: Action2<T1,T2>
   nameWithType: Action2<T1,T2>
   fullName: com.microsoft.signalr.Action2<T1,T2>
   type: Interface
-  summary: >-
-    <p>A callback that takes two parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes two parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action2<T1,T2>
     typeParameters:
@@ -84,17 +78,14 @@ references:
     - id: T2
       type: 6ac4d271
       description: <p>The type of the second parameter to the callback. </p>
-- uid: com.microsoft.signalr._action3
+- uid: com.microsoft.signalr.Action3
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action3.yml
+  href: com.microsoft.signalr.Action3.yml
   name: Action3<T1,T2,T3>
   nameWithType: Action3<T1,T2,T3>
   fullName: com.microsoft.signalr.Action3<T1,T2,T3>
   type: Interface
-  summary: >-
-    <p>A callback that takes three parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes three parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action3<T1,T2,T3>
     typeParameters:
@@ -107,17 +98,14 @@ references:
     - id: T3
       type: e92ab054
       description: <p>The type of the third parameter to the callback. </p>
-- uid: com.microsoft.signalr._action4
+- uid: com.microsoft.signalr.Action4
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action4.yml
+  href: com.microsoft.signalr.Action4.yml
   name: Action4<T1,T2,T3,T4>
   nameWithType: Action4<T1,T2,T3,T4>
   fullName: com.microsoft.signalr.Action4<T1,T2,T3,T4>
   type: Interface
-  summary: >-
-    <p>A callback that takes four parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes four parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action4<T1,T2,T3,T4>
     typeParameters:
@@ -133,17 +121,14 @@ references:
     - id: T4
       type: 21b77ff4
       description: <p>The type of the fourth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action5
+- uid: com.microsoft.signalr.Action5
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action5.yml
+  href: com.microsoft.signalr.Action5.yml
   name: Action5<T1,T2,T3,T4,T5>
   nameWithType: Action5<T1,T2,T3,T4,T5>
   fullName: com.microsoft.signalr.Action5<T1,T2,T3,T4,T5>
   type: Interface
-  summary: >-
-    <p>A callback that takes five parameter.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes five parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action5<T1,T2,T3,T4,T5>
     typeParameters:
@@ -162,17 +147,14 @@ references:
     - id: T5
       type: 136da300
       description: <p>The type of the fifth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action6
+- uid: com.microsoft.signalr.Action6
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action6.yml
+  href: com.microsoft.signalr.Action6.yml
   name: Action6<T1,T2,T3,T4,T5,T6>
   nameWithType: Action6<T1,T2,T3,T4,T5,T6>
   fullName: com.microsoft.signalr.Action6<T1,T2,T3,T4,T5,T6>
   type: Interface
-  summary: >-
-    <p>A callback that takes six parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes six parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action6<T1,T2,T3,T4,T5,T6>
     typeParameters:
@@ -194,17 +176,14 @@ references:
     - id: T6
       type: 43cd3771
       description: <p>The type of the sixth parameter to the callback. </p>
-- uid: com.microsoft.signalr._action7
+- uid: com.microsoft.signalr.Action7
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action7.yml
+  href: com.microsoft.signalr.Action7.yml
   name: Action7<T1,T2,T3,T4,T5,T6,T7>
   nameWithType: Action7<T1,T2,T3,T4,T5,T6,T7>
   fullName: com.microsoft.signalr.Action7<T1,T2,T3,T4,T5,T6,T7>
   type: Interface
-  summary: >-
-    <p>A callback that takes seven parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes seven parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action7<T1,T2,T3,T4,T5,T6,T7>
     typeParameters:
@@ -229,17 +208,14 @@ references:
     - id: T7
       type: 308f4ff4
       description: <p>The type of the seventh parameter to the callback. </p>
-- uid: com.microsoft.signalr._action8
+- uid: com.microsoft.signalr.Action8
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._action8.yml
+  href: com.microsoft.signalr.Action8.yml
   name: Action8<T1,T2,T3,T4,T5,T6,T7,T8>
   nameWithType: Action8<T1,T2,T3,T4,T5,T6,T7,T8>
   fullName: com.microsoft.signalr.Action8<T1,T2,T3,T4,T5,T6,T7,T8>
   type: Interface
-  summary: >-
-    <p>A callback that takes eight parameters.</p>
-
-    <p></p>
+  summary: "<p>A callback that takes eight parameters.</p>\r\n<p></p>"
   syntax:
     content: public interface Action8<T1,T2,T3,T4,T5,T6,T7,T8>
     typeParameters:
@@ -267,71 +243,73 @@ references:
     - id: T8
       type: 57f41c00
       description: <p>The type of the eighth parameter to the callback. </p>
-- uid: com.microsoft.signalr._http_hub_connection_builder
+- uid: com.microsoft.signalr.HttpHubConnectionBuilder
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._http_hub_connection_builder.yml
+  href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
   name: HttpHubConnectionBuilder
   nameWithType: HttpHubConnectionBuilder
   fullName: com.microsoft.signalr.HttpHubConnectionBuilder
   type: Class
-  summary: <p>A builder for configuring <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> instances. </p>
+  summary: "<p>A builder for configuring <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> instances. </p>"
   syntax:
     content: public class HttpHubConnectionBuilder
-- uid: com.microsoft.signalr._hub_connection
+- uid: com.microsoft.signalr.HubConnection
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_connection.yml
+  href: com.microsoft.signalr.HubConnection.yml
   name: HubConnection
   nameWithType: HubConnection
   fullName: com.microsoft.signalr.HubConnection
   type: Class
+  summary: "<p>A connection used to invoke hub methods on a SignalR Server. </p>"
   syntax:
     content: public class HubConnection
-- uid: com.microsoft.signalr._hub_connection_builder
+- uid: com.microsoft.signalr.HubConnectionBuilder
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_connection_builder.yml
+  href: com.microsoft.signalr.HubConnectionBuilder.yml
   name: HubConnectionBuilder
   nameWithType: HubConnectionBuilder
   fullName: com.microsoft.signalr.HubConnectionBuilder
   type: Class
-  summary: <p>A builder for configuring <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref> instances. </p>
+  summary: "<p>A builder for configuring <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref> instances. </p>"
   syntax:
     content: public class HubConnectionBuilder
-- uid: com.microsoft.signalr._hub_connection_state
+- uid: com.microsoft.signalr.HubConnectionState
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_connection_state.yml
+  href: com.microsoft.signalr.HubConnectionState.yml
   name: HubConnectionState
   nameWithType: HubConnectionState
   fullName: com.microsoft.signalr.HubConnectionState
   type: Enum
-  summary: <p>Indicates the state of the <xref uid="com.microsoft.signalr._hub_connection" data-throw-if-not-resolved="false">HubConnection</xref>. </p>
+  summary: "<p>Indicates the state of the <xref uid=\"com.microsoft.signalr.HubConnection\" data-throw-if-not-resolved=\"false\">HubConnection</xref>. </p>"
   syntax:
     content: public enum HubConnectionState
-- uid: com.microsoft.signalr._hub_exception
+- uid: com.microsoft.signalr.HubException
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._hub_exception.yml
+  href: com.microsoft.signalr.HubException.yml
   name: HubException
   nameWithType: HubException
   fullName: com.microsoft.signalr.HubException
   type: Class
-  summary: <p>An exception thrown when the server fails to invoke a Hub method. </p>
+  summary: "<p>An exception thrown when the server fails to invoke a Hub method. </p>"
   syntax:
     content: public class HubException
-- uid: com.microsoft.signalr._log_level
+- uid: com.microsoft.signalr.OnClosedCallback
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._log_level.yml
-  name: LogLevel
-  nameWithType: LogLevel
-  fullName: com.microsoft.signalr.LogLevel
-  type: Enum
+  href: com.microsoft.signalr.OnClosedCallback.yml
+  name: OnClosedCallback
+  nameWithType: OnClosedCallback
+  fullName: com.microsoft.signalr.OnClosedCallback
+  type: Interface
+  summary: "<p>A callback to create and register on a HubConnections OnClosed method. </p>"
   syntax:
-    content: public enum LogLevel
-- uid: com.microsoft.signalr._subscription
+    content: public interface OnClosedCallback
+- uid: com.microsoft.signalr.Subscription
   parent: com.microsoft.signalr
-  href: com.microsoft.signalr._subscription.yml
+  href: com.microsoft.signalr.Subscription.yml
   name: Subscription
   nameWithType: Subscription
   fullName: com.microsoft.signalr.Subscription
   type: Class
-  summary: <p>Represents the registration of a handler for a client method. </p>
+  summary: "<p>Represents the registration of a handler for a client method. </p>"
   syntax:
     content: public class Subscription
diff --git a/docs-ref-autogen/toc.yml b/docs-ref-autogen/toc.yml
index d6d26e5..4356e6f 100644
--- a/docs-ref-autogen/toc.yml
+++ b/docs-ref-autogen/toc.yml
@@ -3,51 +3,51 @@
   name: com.microsoft.signalr
   href: com.microsoft.signalr.yml
   items:
-  - uid: com.microsoft.signalr._action
+  - uid: com.microsoft.signalr.Action
     name: Action
-    href: com.microsoft.signalr._action.yml
-  - uid: com.microsoft.signalr._action1
+    href: com.microsoft.signalr.Action.yml
+  - uid: com.microsoft.signalr.Action1
     name: Action1
-    href: com.microsoft.signalr._action1.yml
-  - uid: com.microsoft.signalr._action2
+    href: com.microsoft.signalr.Action1.yml
+  - uid: com.microsoft.signalr.Action2
     name: Action2
-    href: com.microsoft.signalr._action2.yml
-  - uid: com.microsoft.signalr._action3
+    href: com.microsoft.signalr.Action2.yml
+  - uid: com.microsoft.signalr.Action3
     name: Action3
-    href: com.microsoft.signalr._action3.yml
-  - uid: com.microsoft.signalr._action4
+    href: com.microsoft.signalr.Action3.yml
+  - uid: com.microsoft.signalr.Action4
     name: Action4
-    href: com.microsoft.signalr._action4.yml
-  - uid: com.microsoft.signalr._action5
+    href: com.microsoft.signalr.Action4.yml
+  - uid: com.microsoft.signalr.Action5
     name: Action5
-    href: com.microsoft.signalr._action5.yml
-  - uid: com.microsoft.signalr._action6
+    href: com.microsoft.signalr.Action5.yml
+  - uid: com.microsoft.signalr.Action6
     name: Action6
-    href: com.microsoft.signalr._action6.yml
-  - uid: com.microsoft.signalr._action7
+    href: com.microsoft.signalr.Action6.yml
+  - uid: com.microsoft.signalr.Action7
     name: Action7
-    href: com.microsoft.signalr._action7.yml
-  - uid: com.microsoft.signalr._action8
+    href: com.microsoft.signalr.Action7.yml
+  - uid: com.microsoft.signalr.Action8
     name: Action8
-    href: com.microsoft.signalr._action8.yml
-  - uid: com.microsoft.signalr._http_hub_connection_builder
+    href: com.microsoft.signalr.Action8.yml
+  - uid: com.microsoft.signalr.HttpHubConnectionBuilder
     name: HttpHubConnectionBuilder
-    href: com.microsoft.signalr._http_hub_connection_builder.yml
-  - uid: com.microsoft.signalr._hub_connection
+    href: com.microsoft.signalr.HttpHubConnectionBuilder.yml
+  - uid: com.microsoft.signalr.HubConnection
     name: HubConnection
-    href: com.microsoft.signalr._hub_connection.yml
-  - uid: com.microsoft.signalr._hub_connection_builder
+    href: com.microsoft.signalr.HubConnection.yml
+  - uid: com.microsoft.signalr.HubConnectionBuilder
     name: HubConnectionBuilder
-    href: com.microsoft.signalr._hub_connection_builder.yml
-  - uid: com.microsoft.signalr._hub_connection_state
+    href: com.microsoft.signalr.HubConnectionBuilder.yml
+  - uid: com.microsoft.signalr.HubConnectionState
     name: HubConnectionState
-    href: com.microsoft.signalr._hub_connection_state.yml
-  - uid: com.microsoft.signalr._hub_exception
+    href: com.microsoft.signalr.HubConnectionState.yml
+  - uid: com.microsoft.signalr.HubException
     name: HubException
-    href: com.microsoft.signalr._hub_exception.yml
-  - uid: com.microsoft.signalr._log_level
-    name: LogLevel
-    href: com.microsoft.signalr._log_level.yml
-  - uid: com.microsoft.signalr._subscription
+    href: com.microsoft.signalr.HubException.yml
+  - uid: com.microsoft.signalr.OnClosedCallback
+    name: OnClosedCallback
+    href: com.microsoft.signalr.OnClosedCallback.yml
+  - uid: com.microsoft.signalr.Subscription
     name: Subscription
-    href: com.microsoft.signalr._subscription.yml
+    href: com.microsoft.signalr.Subscription.yml
diff --git a/repo.json b/repo.json
index 23a27e4..505238c 100644
--- a/repo.json
+++ b/repo.json
@@ -1,9 +1,9 @@
 {
     "repo":[
        {
-          "url":"https://github.com/aspnet/SignalR",
+          "url":"https://github.com/aspnet/AspNetCore",
           "branch":"release/2.2",
           "name":"aspnet-signalr-java"
        }
     ]
-}
\ No newline at end of file
+}