5 files changed, 10 insertions, 9 deletions
diff --git a/extensions/renderer/resources/data_receiver.js b/extensions/renderer/resources/data_receiver.js
index 38d0567..b4fc543 100644
--- a/extensions/renderer/resources/data_receiver.js
+++ b/extensions/renderer/resources/data_receiver.js
@@ -107,7 +107,7 @@ define('data_receiver', [
   }
 
   DataReceiver.prototype =
-      $Object.create(dataStream.DataSourceClientStub.prototype);
+      $Object.create(dataStream.DataSourceClient.stubClass.prototype);
 
   /**
    * Closes this DataReceiver.
@@ -154,7 +154,7 @@ define('data_receiver', [
      * The connection to the DataSource.
      * @private
      */
-    this.source_ = new dataStream.DataSourceProxy(this.router_);
+    this.source_ = new dataStream.DataSource.proxyClass(this.router_);
     this.router_.setIncomingReceiver(this);
     /**
      * The handle to the data pipe to use for receiving data.
diff --git a/extensions/renderer/resources/data_sender.js b/extensions/renderer/resources/data_sender.js
index b95cd0b..63c97c0 100644
--- a/extensions/renderer/resources/data_sender.js
+++ b/extensions/renderer/resources/data_sender.js
@@ -182,7 +182,7 @@ define('data_sender', [
   }
 
   DataSender.prototype =
-      $Object.create(dataStreamMojom.DataSinkClientStub.prototype);
+      $Object.create(dataStreamMojom.DataSinkClient.stubClass.prototype);
 
   /**
    * Closes this DataSender.
@@ -242,7 +242,7 @@ define('data_sender', [
      * The connection to the DataSink.
      * @private
      */
-    this.sink_ = new dataStreamMojom.DataSinkProxy(this.router_);
+    this.sink_ = new dataStreamMojom.DataSink.proxyClass(this.router_);
     this.router_.setIncomingReceiver(this);
     /**
      * The async waiter used to wait for
diff --git a/extensions/renderer/resources/serial_service.js b/extensions/renderer/resources/serial_service.js
index aa53eb4..6d57cee 100644
--- a/extensions/renderer/resources/serial_service.js
+++ b/extensions/renderer/resources/serial_service.js
@@ -26,8 +26,9 @@ define('serial_service', [
    * Mojo types.
    */
 
-  var service = new serialMojom.SerialServiceProxy(new routerModule.Router(
-      serviceProvider.connectToService(serialMojom.SerialServiceProxy.NAME_)));
+  var service = new serialMojom.SerialService.proxyClass(
+      new routerModule.Router(
+          serviceProvider.connectToService(serialMojom.SerialService.name)));
 
   function getDevices() {
     return service.getDevices().then(function(response) {
@@ -193,7 +194,7 @@ define('serial_service', [
                     sendPipe.handle0,
                     receivePipe.handle0);
     var router = new routerModule.Router(pipe.handle1);
-    var connection = new serialMojom.ConnectionProxy(router);
+    var connection = new serialMojom.Connection.proxyClass(router);
     return connection.getInfo().then(convertServiceInfo).then(function(info) {
       return Promise.all([info, allocateConnectionId()]);
     }).catch(function(e) {
diff --git a/extensions/test/data/data_receiver_unittest.js b/extensions/test/data/data_receiver_unittest.js
index d47b581..e4fad3e 100644
--- a/extensions/test/data/data_receiver_unittest.js
+++ b/extensions/test/data/data_receiver_unittest.js
@@ -21,7 +21,7 @@ function createReceiver() {
     var dataReceiver = modules[1];
     var dataStream = modules[2];
     return new dataReceiver.DataReceiver(
-        serviceProvider.connectToService(dataStream.DataSourceProxy.NAME_),
+        serviceProvider.connectToService(dataStream.DataSource.name),
         BUFFER_SIZE,
         FATAL_ERROR);
   });
diff --git a/extensions/test/data/data_sender_unittest.js b/extensions/test/data/data_sender_unittest.js
index 46db710..0b6a5cf 100644
--- a/extensions/test/data/data_sender_unittest.js
+++ b/extensions/test/data/data_sender_unittest.js
@@ -32,7 +32,7 @@ function createSender() {
     var dataSender = modules[1];
     var dataStream = modules[2];
     return new dataSender.DataSender(
-        serviceProvider.connectToService(dataStream.DataSinkProxy.NAME_),
+        serviceProvider.connectToService(dataStream.DataSink.name),
         BUFFER_SIZE,
         FATAL_ERROR);
   });