diff --git a/Jakefile b/Jakefile
index acd81b0ccd5..bb57469ac33 100644
--- a/Jakefile
+++ b/Jakefile
@@ -94,7 +94,8 @@ var servicesSources = [
 var serverSources = [
     "node.d.ts",
     "editorServices.ts",
-    "protocol.ts",
+    "protocol.d.ts",
+    "session.ts",
     "server.ts"
 ].map(function (f) {
     return path.join(serverDirectory, f);
@@ -141,7 +142,8 @@ var harnessSources = [
 ].map(function (f) {
     return path.join(unittestsDirectory, f);
 })).concat([
-    "protocol.ts",
+    "protocol.d.ts",
+    "session.ts",
     "client.ts",
     "editorServices.ts",
 ].map(function (f) {
diff --git a/src/harness/harness.ts b/src/harness/harness.ts
index cbc4064119a..8ee51f89c9c 100644
--- a/src/harness/harness.ts
+++ b/src/harness/harness.ts
@@ -16,7 +16,7 @@
 
 /// <reference path='..\services\services.ts' />
 /// <reference path='..\services\shims.ts' />
-/// <reference path='..\server\protocol.ts' />
+/// <reference path='..\server\session.ts' />
 /// <reference path='..\server\client.ts' />
 /// <reference path='..\server\node.d.ts' />
 /// <reference path='external\mocha.d.ts'/>
diff --git a/src/server/client.ts b/src/server/client.ts
index 8ff881611d3..9da5ed9fdbd 100644
--- a/src/server/client.ts
+++ b/src/server/client.ts
@@ -1,4 +1,4 @@
-/// <reference path="protocol.ts" />
+/// <reference path="session.ts" />
 
 module ts.server {
 
diff --git a/src/server/protodef.d.ts b/src/server/protocol.d.ts
similarity index 100%
rename from src/server/protodef.d.ts
rename to src/server/protocol.d.ts
diff --git a/src/server/server.ts b/src/server/server.ts
index 6d210ff0d13..8921a4b4768 100644
--- a/src/server/server.ts
+++ b/src/server/server.ts
@@ -1,5 +1,5 @@
 /// <reference path="node.d.ts" />
-/// <reference path="protocol.ts" />
+/// <reference path="session.ts" />
 
 module ts.server {
     var nodeproto: typeof NodeJS._debugger = require('_debugger');
diff --git a/src/server/protocol.ts b/src/server/session.ts
similarity index 97%
rename from src/server/protocol.ts
rename to src/server/session.ts
index 0b62e86d16e..715b8fa3d6a 100644
--- a/src/server/protocol.ts
+++ b/src/server/session.ts
@@ -1,7 +1,7 @@
 /// <reference path="..\compiler\commandLineParser.ts" />
 /// <reference path="..\services\services.ts" />
 /// <reference path="node.d.ts" />
-/// <reference path="protodef.d.ts" />
+/// <reference path="protocol.d.ts" />
 /// <reference path="editorServices.ts" />
 
 module ts.server {
@@ -587,13 +587,13 @@ module ts.server {
             var compilerService = project.compilerService;
 
             return items.map(item => ({
-                text: item.text,
-                kind: item.kind,
-                kindModifiers: item.kindModifiers,
+                text: item.text,
+                kind: item.kind,
+                kindModifiers: item.kindModifiers,
                 spans: item.spans.map(span => ({
                     start: compilerService.host.positionToLineCol(fileName, span.start),
                     end: compilerService.host.positionToLineCol(fileName, ts.textSpanEnd(span))
-                })),
+                })),
                 childItems: this.decorateNavigationBarItem(project, fileName, item.childItems)
             }));
         }