9 files changed, 30 insertions, 30 deletions
diff --git a/js/compiler.ts b/js/compiler.ts
index 9496610da..7eba87549 100644
--- a/js/compiler.ts
+++ b/js/compiler.ts
@@ -3,7 +3,7 @@
 import * as ts from "typescript";
 import { assetSourceCode } from "./assets";
 import * as deno from "./deno";
-import { globalEval } from "./global-eval";
+import { globalEval } from "./global_eval";
 import { libdeno } from "./libdeno";
 import { window } from "./globals";
 import * as os from "./os";
diff --git a/js/deno.ts b/js/deno.ts
index c12df1236..53ca4c009 100644
--- a/js/deno.ts
+++ b/js/deno.ts
@@ -20,6 +20,6 @@ export { libdeno } from "./libdeno";
 export { platform } from "./platform";
 export { trace } from "./trace";
 export { truncateSync, truncate } from "./truncate";
-export { FileInfo } from "./fileinfo";
+export { FileInfo } from "./file_info";
 export { connect, dial, listen, Listener, Conn } from "./net";
 export const args: string[] = [];
diff --git a/js/fileinfo.ts b/js/file_info.ts
index 00e68ac91..00e68ac91 100644
--- a/js/fileinfo.ts
+++ b/js/file_info.ts
diff --git a/js/global-eval.ts b/js/global_eval.ts
index 1f77c4952..1f77c4952 100644
--- a/js/global-eval.ts
+++ b/js/global_eval.ts
diff --git a/js/globals.ts b/js/globals.ts
index d88e1b28d..2e6b24305 100644
--- a/js/globals.ts
+++ b/js/globals.ts
@@ -5,7 +5,7 @@ import * as timers from "./timers";
 import * as textEncoding from "./text_encoding";
 import * as fetch_ from "./fetch";
 import { libdeno } from "./libdeno";
-import { globalEval } from "./global-eval";
+import { globalEval } from "./global_eval";
 import { DenoHeaders } from "./fetch";
 import { DenoBlob } from "./blob";
 
diff --git a/js/libdeno.ts b/js/libdeno.ts
index afd6f1aec..97269c36c 100644
--- a/js/libdeno.ts
+++ b/js/libdeno.ts
@@ -1,5 +1,5 @@
 import { RawSourceMap } from "./types";
-import { globalEval } from "./global-eval";
+import { globalEval } from "./global_eval";
 
 // The libdeno functions are moved so that users can't access them.
 type MessageCallback = (msg: Uint8Array) => void;
diff --git a/js/net.ts b/js/net.ts
index a0307bfe9..ccbd331dd 100644
--- a/js/net.ts
+++ b/js/net.ts
@@ -1,7 +1,7 @@
 // Copyright 2018 the Deno authors. All rights reserved. MIT license.
 
 import { ReadResult, Reader, Writer, Closer } from "./io";
-import * as fbs from "gen/msg_generated";
+import * as msg from "gen/msg_generated";
 import { assert, notImplemented } from "./util";
 import * as dispatch from "./dispatch";
 import { flatbuffers } from "flatbuffers";
@@ -32,14 +32,14 @@ class ListenerImpl implements Listener {
 
   async accept(): Promise<Conn> {
     const builder = new flatbuffers.Builder();
-    fbs.Accept.startAccept(builder);
-    fbs.Accept.addRid(builder, this.fd);
-    const msg = fbs.Accept.endAccept(builder);
-    const baseRes = await dispatch.sendAsync(builder, fbs.Any.Accept, msg);
+    msg.Accept.startAccept(builder);
+    msg.Accept.addRid(builder, this.fd);
+    const inner = msg.Accept.endAccept(builder);
+    const baseRes = await dispatch.sendAsync(builder, msg.Any.Accept, inner);
     assert(baseRes != null);
-    assert(fbs.Any.NewConn === baseRes!.msgType());
-    const res = new fbs.NewConn();
-    assert(baseRes!.msg(res) != null);
+    assert(msg.Any.NewConn === baseRes!.innerType());
+    const res = new msg.NewConn();
+    assert(baseRes!.inner(res) != null);
     return new ConnImpl(res.rid(), res.remoteAddr()!, res.localAddr()!);
   }
 
@@ -112,15 +112,15 @@ export function listen(network: Network, address: string): Listener {
   const builder = new flatbuffers.Builder();
   const network_ = builder.createString(network);
   const address_ = builder.createString(address);
-  fbs.Listen.startListen(builder);
-  fbs.Listen.addNetwork(builder, network_);
-  fbs.Listen.addAddress(builder, address_);
-  const msg = fbs.Listen.endListen(builder);
-  const baseRes = dispatch.sendSync(builder, fbs.Any.Listen, msg);
+  msg.Listen.startListen(builder);
+  msg.Listen.addNetwork(builder, network_);
+  msg.Listen.addAddress(builder, address_);
+  const inner = msg.Listen.endListen(builder);
+  const baseRes = dispatch.sendSync(builder, msg.Any.Listen, inner);
   assert(baseRes != null);
-  assert(fbs.Any.ListenRes === baseRes!.msgType());
-  const res = new fbs.ListenRes();
-  assert(baseRes!.msg(res) != null);
+  assert(msg.Any.ListenRes === baseRes!.innerType());
+  const res = new msg.ListenRes();
+  assert(baseRes!.inner(res) != null);
   return new ListenerImpl(res.rid());
 }
 
@@ -154,15 +154,15 @@ export async function dial(network: Network, address: string): Promise<Conn> {
   const builder = new flatbuffers.Builder();
   const network_ = builder.createString(network);
   const address_ = builder.createString(address);
-  fbs.Dial.startDial(builder);
-  fbs.Dial.addNetwork(builder, network_);
-  fbs.Dial.addAddress(builder, address_);
-  const msg = fbs.Dial.endDial(builder);
-  const baseRes = await dispatch.sendAsync(builder, fbs.Any.Dial, msg);
+  msg.Dial.startDial(builder);
+  msg.Dial.addNetwork(builder, network_);
+  msg.Dial.addAddress(builder, address_);
+  const inner = msg.Dial.endDial(builder);
+  const baseRes = await dispatch.sendAsync(builder, msg.Any.Dial, inner);
   assert(baseRes != null);
-  assert(fbs.Any.NewConn === baseRes!.msgType());
-  const res = new fbs.NewConn();
-  assert(baseRes!.msg(res) != null);
+  assert(msg.Any.NewConn === baseRes!.innerType());
+  const res = new msg.NewConn();
+  assert(baseRes!.inner(res) != null);
   return new ConnImpl(res.rid(), res.remoteAddr()!, res.localAddr()!);
 }
 
diff --git a/js/read_dir.ts b/js/read_dir.ts
index b1977549d..d99b085ec 100644
--- a/js/read_dir.ts
+++ b/js/read_dir.ts
@@ -2,7 +2,7 @@
 import * as msg from "gen/msg_generated";
 import { flatbuffers } from "flatbuffers";
 import * as dispatch from "./dispatch";
-import { FileInfo, FileInfoImpl } from "./fileinfo";
+import { FileInfo, FileInfoImpl } from "./file_info";
 import { assert } from "./util";
 
 /**
diff --git a/js/stat.ts b/js/stat.ts
index 21d80dab3..4cfc4290f 100644
--- a/js/stat.ts
+++ b/js/stat.ts
@@ -3,7 +3,7 @@ import * as msg from "gen/msg_generated";
 import { flatbuffers } from "flatbuffers";
 import * as dispatch from "./dispatch";
 import { assert } from "./util";
-import { FileInfo, FileInfoImpl } from "./fileinfo";
+import { FileInfo, FileInfoImpl } from "./file_info";
 
 /**
  * Queries the file system for information on the path provided.