diff --git a/src/ServiceHost/LanguageServices/LanguageService.cs b/src/ServiceHost/LanguageServices/LanguageService.cs
index d40aa5fc..21b89c19 100644
--- a/src/ServiceHost/LanguageServices/LanguageService.cs
+++ b/src/ServiceHost/LanguageServices/LanguageService.cs
@@ -38,9 +38,8 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
 
         /// <summary>
         /// Default, parameterless constructor.
-        /// TODO: Figure out how to make this truely singleton even with dependency injection for tests
         /// </summary>
-        public LanguageService()
+        internal LanguageService()
         {
         }
 
diff --git a/src/ServiceHost/Properties/AssemblyInfo.cs b/src/ServiceHost/Properties/AssemblyInfo.cs
index 27c1daba..ee34cfc1 100644
--- a/src/ServiceHost/Properties/AssemblyInfo.cs
+++ b/src/ServiceHost/Properties/AssemblyInfo.cs
@@ -41,4 +41,4 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyFileVersion("1.0.0.0")]
 [assembly: AssemblyInformationalVersion("1.0.0.0")]
 
-[assembly: InternalsVisibleTo("Microsoft.SqlTools.EditorServices.Test.Protocol")]
+[assembly: InternalsVisibleTo("Microsoft.SqlTools.ServiceHost.Test")]
diff --git a/src/ServiceHost/project.json b/src/ServiceHost/project.json
index 31dac66d..bd889b55 100644
--- a/src/ServiceHost/project.json
+++ b/src/ServiceHost/project.json
@@ -1,4 +1,5 @@
 {
+  "name": "Microsoft.SqlTools.ServiceHost",
   "version": "1.0.0-*",
   "buildOptions": {
     "debugType": "portable",
diff --git a/test/ServiceHost.Test/project.json b/test/ServiceHost.Test/project.json
index a248b200..a32fe523 100644
--- a/test/ServiceHost.Test/project.json
+++ b/test/ServiceHost.Test/project.json
@@ -1,4 +1,5 @@
 {
+  "name": "Microsoft.SqlTools.ServiceHost.Test",
   "version": "1.0.0-*",
   "buildOptions": {
     "debugType": "portable"