diff --git a/packages/bigquery/src/index.js b/packages/bigquery/src/index.js
index 4c2b71b938f..5d15d941d03 100644
--- a/packages/bigquery/src/index.js
+++ b/packages/bigquery/src/index.js
@@ -66,7 +66,7 @@ function BigQuery(options) {
   }
 
   var config = {
-    baseUrl: 'https://www.googleapis.com/bigquery/v2',
+    baseUrl: 'https://www.googleapis.com./bigquery/v2',
     scopes: ['https://www.googleapis.com/auth/bigquery'],
     packageJson: require('../package.json')
   };
diff --git a/packages/bigquery/src/table.js b/packages/bigquery/src/table.js
index 38c1b2cca4e..7f748c5390a 100644
--- a/packages/bigquery/src/table.js
+++ b/packages/bigquery/src/table.js
@@ -548,7 +548,7 @@ Table.prototype.createWriteStream = function(metadata) {
       },
       request: {
         uri: format('{base}/{projectId}/jobs', {
-          base: 'https://www.googleapis.com/upload/bigquery/v2/projects',
+          base: 'https://www.googleapis.com./upload/bigquery/v2/projects',
           projectId: self.bigQuery.projectId
         })
       }
diff --git a/packages/bigquery/test/index.js b/packages/bigquery/test/index.js
index ed405f4d7e5..b05d7cccc4c 100644
--- a/packages/bigquery/test/index.js
+++ b/packages/bigquery/test/index.js
@@ -144,7 +144,7 @@ describe('BigQuery', function() {
 
       var calledWith = bq.calledWith_[0];
 
-      var baseUrl = 'https://www.googleapis.com/bigquery/v2';
+      var baseUrl = 'https://www.googleapis.com./bigquery/v2';
       assert.strictEqual(calledWith.baseUrl, baseUrl);
       assert.deepEqual(calledWith.scopes, [
         'https://www.googleapis.com/auth/bigquery'
diff --git a/packages/bigquery/test/table.js b/packages/bigquery/test/table.js
index 44538608384..64258bc5524 100644
--- a/packages/bigquery/test/table.js
+++ b/packages/bigquery/test/table.js
@@ -665,7 +665,7 @@ describe('BigQuery/Table', function() {
 
       it('should pass the correct request uri', function(done) {
         makeWritableStreamOverride = function(stream, options) {
-          var uri = 'https://www.googleapis.com/upload/bigquery/v2/projects/' +
+          var uri = 'https://www.googleapis.com./upload/bigquery/v2/projects/' +
             table.bigQuery.projectId + '/jobs';
           assert.equal(options.request.uri, uri);
           done();
diff --git a/packages/bigtable/src/index.js b/packages/bigtable/src/index.js
index 4443adbaa99..25dfbc6d09b 100644
--- a/packages/bigtable/src/index.js
+++ b/packages/bigtable/src/index.js
@@ -309,8 +309,8 @@ function Bigtable(options) {
     return new Bigtable(options);
   }
 
-  var baseUrl = 'bigtable.googleapis.com';
-  var adminBaseUrl = 'bigtableadmin.googleapis.com';
+  var baseUrl = 'bigtable.googleapis.com.';
+  var adminBaseUrl = 'bigtableadmin.googleapis.com.';
 
   var customEndpoint = options.apiEndpoint ||
     process.env.BIGTABLE_EMULATOR_HOST;
diff --git a/packages/bigtable/test/index.js b/packages/bigtable/test/index.js
index 2ba0170d433..a1bff9d38b6 100644
--- a/packages/bigtable/test/index.js
+++ b/packages/bigtable/test/index.js
@@ -136,7 +136,7 @@ describe('Bigtable', function() {
 
       var calledWith = bigtable.calledWith_[0];
 
-      assert.strictEqual(calledWith.baseUrl, 'bigtable.googleapis.com');
+      assert.strictEqual(calledWith.baseUrl, 'bigtable.googleapis.com.');
       assert.strictEqual(calledWith.service, 'bigtable');
       assert.strictEqual(calledWith.apiVersion, 'v2');
       assert.strictEqual(calledWith.customEndpoint, false);
@@ -144,20 +144,20 @@ describe('Bigtable', function() {
       assert.deepEqual(calledWith.protoServices, {
         Bigtable: googleProtoFiles('bigtable/v2/bigtable.proto'),
         BigtableTableAdmin: {
-          baseUrl: 'bigtableadmin.googleapis.com',
+          baseUrl: 'bigtableadmin.googleapis.com.',
           path: googleProtoFiles(
             'bigtable/admin/v2/bigtable_table_admin.proto'),
           service: 'bigtable.admin'
         },
         BigtableInstanceAdmin: {
-          baseUrl: 'bigtableadmin.googleapis.com',
+          baseUrl: 'bigtableadmin.googleapis.com.',
           path: googleProtoFiles(
             'bigtable/admin/v2/bigtable_instance_admin.proto'
           ),
           service: 'bigtable.admin'
         },
         Operations: {
-          baseUrl: 'bigtableadmin.googleapis.com',
+          baseUrl: 'bigtableadmin.googleapis.com.',
           path: googleProtoFiles('longrunning/operations.proto'),
           service: 'longrunning',
           apiVersion: 'v1'
diff --git a/packages/common-grpc/test/service.js b/packages/common-grpc/test/service.js
index 8107c92cb02..ccb302cd376 100644
--- a/packages/common-grpc/test/service.js
+++ b/packages/common-grpc/test/service.js
@@ -390,7 +390,7 @@ describe('GrpcService', function() {
     });
 
     it('should store the baseUrl properly', function() {
-      var fakeBaseUrl = 'a.googleapis.com';
+      var fakeBaseUrl = 'a.googleapis.com.';
 
       grpcLoadOverride = function() {
         return MOCK_GRPC_API;
@@ -1914,7 +1914,7 @@ describe('GrpcService', function() {
     });
 
     it('should use the baseUrl override if applicable', function() {
-      var fakeBaseUrl = 'a.googleapis.com';
+      var fakeBaseUrl = 'a.googleapis.com.';
       var fakeService = {};
 
       grpcService.protos = {
diff --git a/packages/compute/src/index.js b/packages/compute/src/index.js
index 3506d476ec4..a3e038e5d77 100644
--- a/packages/compute/src/index.js
+++ b/packages/compute/src/index.js
@@ -95,7 +95,7 @@ function Compute(options) {
   }
 
   var config = {
-    baseUrl: 'https://www.googleapis.com/compute/v1',
+    baseUrl: 'https://www.googleapis.com./compute/v1',
     scopes: ['https://www.googleapis.com/auth/compute'],
     packageJson: require('../package.json')
   };
diff --git a/packages/compute/src/service.js b/packages/compute/src/service.js
index 122bce08128..8d18528f5c4 100644
--- a/packages/compute/src/service.js
+++ b/packages/compute/src/service.js
@@ -263,7 +263,7 @@ Service.prototype.delete = function(callback) {
 Service.prototype.getHealth = function(group, callback) {
   if (!is.string(group)) {
     group = format('{baseUrl}/projects/{p}/zones/{z}/instanceGroups/{n}', {
-      baseUrl: 'https://www.googleapis.com/compute/v1',
+      baseUrl: 'https://www.googleapis.com./compute/v1',
       p: this.parent.projectId,
       z: group.zone.name || group.zone,
       n: group.name
diff --git a/packages/compute/src/vm.js b/packages/compute/src/vm.js
index a0e80650da8..f9d37e513b2 100644
--- a/packages/compute/src/vm.js
+++ b/packages/compute/src/vm.js
@@ -104,7 +104,7 @@ function VM(zone, name) {
   this.waiters = [];
 
   this.url = format('{base}/{project}/zones/{zone}/instances/{name}', {
-    base: 'https://www.googleapis.com/compute/v1/projects',
+    base: 'https://www.googleapis.com./compute/v1/projects',
     project: zone.compute.projectId,
     zone: zone.name,
     name: this.name
diff --git a/packages/compute/src/zone.js b/packages/compute/src/zone.js
index 8e6a9155096..f2bacacc98a 100644
--- a/packages/compute/src/zone.js
+++ b/packages/compute/src/zone.js
@@ -257,7 +257,7 @@ Zone.prototype.createAutoscaler = function(name, config, callback) {
 
   if (!/^https*:/.test(json.target)) {
     json.target = [
-      'https://content.googleapis.com/compute/v1/projects/',
+      'https://content.googleapis.com./compute/v1/projects/',
       this.compute.projectId,
       '/zones/',
       this.name,
@@ -554,7 +554,7 @@ Zone.prototype.createInstanceGroup = function(name, options, callback) {
  *       boot: true,
  *       initializeParams: {
  *         sourceImage:
- *           'https://www.googleapis.com/compute/v1/projects' +
+ *           'https://www.googleapis.com./compute/v1/projects' +
  *           '/debian-cloud/global/images/debian-7-wheezy-v20150710'
  *       }
  *     }
diff --git a/packages/compute/test/index.js b/packages/compute/test/index.js
index 8241cc84cd7..7c1a80f4b86 100644
--- a/packages/compute/test/index.js
+++ b/packages/compute/test/index.js
@@ -205,7 +205,7 @@ describe('Compute', function() {
 
       var calledWith = compute.calledWith_[0];
 
-      var baseUrl = 'https://www.googleapis.com/compute/v1';
+      var baseUrl = 'https://www.googleapis.com./compute/v1';
       assert.strictEqual(calledWith.baseUrl, baseUrl);
       assert.deepEqual(calledWith.scopes, [
         'https://www.googleapis.com/auth/compute'
diff --git a/packages/compute/test/service.js b/packages/compute/test/service.js
index cac6e08ac25..53c218e833b 100644
--- a/packages/compute/test/service.js
+++ b/packages/compute/test/service.js
@@ -205,7 +205,7 @@ describe('Service', function() {
         service.request = function(reqOpts) {
           assert.deepEqual(reqOpts.json, {
             group: [
-              'https://www.googleapis.com/compute/v1/projects/',
+              'https://www.googleapis.com./compute/v1/projects/',
               COMPUTE.projectId,
               '/zones/',
               group.zone,
@@ -232,7 +232,7 @@ describe('Service', function() {
         service.request = function(reqOpts) {
           assert.deepEqual(reqOpts.json, {
             group: [
-              'https://www.googleapis.com/compute/v1/projects/',
+              'https://www.googleapis.com./compute/v1/projects/',
               COMPUTE.projectId,
               '/zones/',
               group.zone.name,
diff --git a/packages/compute/test/vm.js b/packages/compute/test/vm.js
index 9f68155c6be..29b4a4f200b 100644
--- a/packages/compute/test/vm.js
+++ b/packages/compute/test/vm.js
@@ -110,7 +110,7 @@ describe('VM', function() {
 
     it('should localize the URL of the VM', function() {
       assert.strictEqual(vm.url, [
-        'https://www.googleapis.com/compute/v1/projects',
+        'https://www.googleapis.com./compute/v1/projects',
         COMPUTE.projectId,
         'zones',
         ZONE.name,
diff --git a/packages/compute/test/zone.js b/packages/compute/test/zone.js
index e4799598c73..b7972eb26b0 100644
--- a/packages/compute/test/zone.js
+++ b/packages/compute/test/zone.js
@@ -286,7 +286,7 @@ describe('Zone', function() {
 
         zone.request = function(reqOpts) {
           var expectedTarget = [
-            'https://content.googleapis.com/compute/v1/projects/',
+            'https://content.googleapis.com./compute/v1/projects/',
             COMPUTE.projectId,
             '/zones/',
             zone.name,
diff --git a/packages/datastore/src/index.js b/packages/datastore/src/index.js
index 327c5064d17..a1bcb43dd47 100644
--- a/packages/datastore/src/index.js
+++ b/packages/datastore/src/index.js
@@ -300,7 +300,7 @@ function Datastore(options) {
     return new Datastore(options);
   }
 
-  this.defaultBaseUrl_ = 'datastore.googleapis.com';
+  this.defaultBaseUrl_ = 'datastore.googleapis.com.';
   this.determineBaseUrl_(options.apiEndpoint);
 
   this.namespace = options.namespace;
diff --git a/packages/datastore/src/v1/datastore_client.js b/packages/datastore/src/v1/datastore_client.js
index 9d9408ace66..19b021ce970 100644
--- a/packages/datastore/src/v1/datastore_client.js
+++ b/packages/datastore/src/v1/datastore_client.js
@@ -500,4 +500,4 @@ function DatastoreClientBuilder(gaxGrpc) {
 }
 module.exports = DatastoreClientBuilder;
 module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
-module.exports.ALL_SCOPES = ALL_SCOPES;
\ No newline at end of file
+module.exports.ALL_SCOPES = ALL_SCOPES;
diff --git a/packages/datastore/test/index.js b/packages/datastore/test/index.js
index 595022025d8..64e62f2d7dc 100644
--- a/packages/datastore/test/index.js
+++ b/packages/datastore/test/index.js
@@ -116,7 +116,10 @@ describe('Datastore', function() {
     });
 
     it('should set the default base URL', function() {
-      assert.strictEqual(datastore.defaultBaseUrl_, 'datastore.googleapis.com');
+      assert.strictEqual(
+        datastore.defaultBaseUrl_,
+        'datastore.googleapis.com.'
+      );
     });
 
     it('should set default API connection details', function(done) {
diff --git a/packages/dns/src/index.js b/packages/dns/src/index.js
index 3e60ccc13fd..e58a9d4fb47 100644
--- a/packages/dns/src/index.js
+++ b/packages/dns/src/index.js
@@ -53,7 +53,7 @@ function DNS(options) {
   }
 
   var config = {
-    baseUrl: 'https://www.googleapis.com/dns/v1',
+    baseUrl: 'https://www.googleapis.com./dns/v1',
     scopes: [
       'https://www.googleapis.com/auth/ndev.clouddns.readwrite',
       'https://www.googleapis.com/auth/cloud-platform'
diff --git a/packages/dns/test/index.js b/packages/dns/test/index.js
index 938535492b4..1762a046210 100644
--- a/packages/dns/test/index.js
+++ b/packages/dns/test/index.js
@@ -125,7 +125,7 @@ describe('DNS', function() {
 
       var calledWith = dns.calledWith_[0];
 
-      var baseUrl = 'https://www.googleapis.com/dns/v1';
+      var baseUrl = 'https://www.googleapis.com./dns/v1';
       assert.strictEqual(calledWith.baseUrl, baseUrl);
       assert.deepEqual(calledWith.scopes, [
         'https://www.googleapis.com/auth/ndev.clouddns.readwrite',
diff --git a/packages/error-reporting/src/google-apis/auth-client.js b/packages/error-reporting/src/google-apis/auth-client.js
index d5c31fa0b9c..4f6570c9784 100644
--- a/packages/error-reporting/src/google-apis/auth-client.js
+++ b/packages/error-reporting/src/google-apis/auth-client.js
@@ -27,7 +27,7 @@ var isString = is.string;
 var SCOPES = ['https://www.googleapis.com/auth/cloud-platform'];
 
 /* @const {String} Base Error Reporting API */
-var API = 'https://clouderrorreporting.googleapis.com/v1beta1/projects';
+var API = 'https://clouderrorreporting.googleapis.com./v1beta1/projects';
 
 /**
  * The RequestHandler constructor initializes several properties on the
@@ -90,7 +90,7 @@ class RequestHandler extends common.Service {
     var pid = config.getProjectId();
     super({
       packageJson: pkg,
-      baseUrl: 'https://clouderrorreporting.googleapis.com/v1beta1/',
+      baseUrl: 'https://clouderrorreporting.googleapis.com./v1beta1/',
       scopes: SCOPES,
       projectId: pid !== null ? pid : undefined,
       projectIdRequired: true
diff --git a/packages/error-reporting/system-test/testAuthClient.js b/packages/error-reporting/system-test/testAuthClient.js
index ea733123e42..7855a86a9c3 100644
--- a/packages/error-reporting/system-test/testAuthClient.js
+++ b/packages/error-reporting/system-test/testAuthClient.js
@@ -114,8 +114,8 @@ const TEST_RUNNER = (function() {
     beforeEach(function() {
       env.setProjectId().setKeyFilename().setProduction();
       fakeService = nock(
-        'https://clouderrorreporting.googleapis.com/v1beta1/projects/' +
-        env.projectId
+        'https://clouderrorreporting.googleapis.com./v1beta1/projects/' +
+        process.env.GCLOUD_PROJECT
      ).persist().post('/events:report');
       logger = createLogger({logLevel: 5});
       client = new RequestHandler(
diff --git a/packages/language/src/v1/language_service_client.js b/packages/language/src/v1/language_service_client.js
index 3ff283512f9..06c0a5fd2d1 100644
--- a/packages/language/src/v1/language_service_client.js
+++ b/packages/language/src/v1/language_service_client.js
@@ -31,7 +31,7 @@ var configData = require('./language_service_client_config');
 var extend = require('extend');
 var gax = require('google-gax');
 
-var SERVICE_ADDRESS = 'language.googleapis.com';
+var SERVICE_ADDRESS = 'language.googleapis.com.';
 
 var DEFAULT_SERVICE_PORT = 443;
 
@@ -369,4 +369,4 @@ function LanguageServiceClientBuilder(gaxGrpc) {
 }
 module.exports = LanguageServiceClientBuilder;
 module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
-module.exports.ALL_SCOPES = ALL_SCOPES;
\ No newline at end of file
+module.exports.ALL_SCOPES = ALL_SCOPES;
diff --git a/packages/language/src/v1beta2/language_service_client.js b/packages/language/src/v1beta2/language_service_client.js
index 9f44f3af95a..8b7f9c87fe5 100644
--- a/packages/language/src/v1beta2/language_service_client.js
+++ b/packages/language/src/v1beta2/language_service_client.js
@@ -31,7 +31,7 @@ var configData = require('./language_service_client_config');
 var extend = require('extend');
 var gax = require('google-gax');
 
-var SERVICE_ADDRESS = 'language.googleapis.com';
+var SERVICE_ADDRESS = 'language.googleapis.com.';
 
 var DEFAULT_SERVICE_PORT = 443;
 
@@ -426,4 +426,4 @@ function LanguageServiceClientBuilder(gaxGrpc) {
 }
 module.exports = LanguageServiceClientBuilder;
 module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
-module.exports.ALL_SCOPES = ALL_SCOPES;
\ No newline at end of file
+module.exports.ALL_SCOPES = ALL_SCOPES;
diff --git a/packages/logging/src/log.js b/packages/logging/src/log.js
index 9c4855f60ad..5891735b921 100644
--- a/packages/logging/src/log.js
+++ b/packages/logging/src/log.js
@@ -545,7 +545,7 @@ Log.prototype.warning = function(entry, options, callback) {
  * //-
  * // You may also pass multiple log entries to write.
  * //-
- * var secondEntry = log.entry('compute.googleapis.com', {
+ * var secondEntry = log.entry('gce_instance', {
  *   user: 'my_username'
  * });
  *
diff --git a/packages/logging/src/v2/config_service_v2_client.js b/packages/logging/src/v2/config_service_v2_client.js
index 57ab8e23b30..56fbacbb540 100644
--- a/packages/logging/src/v2/config_service_v2_client.js
+++ b/packages/logging/src/v2/config_service_v2_client.js
@@ -602,4 +602,4 @@ function ConfigServiceV2ClientBuilder(gaxGrpc) {
 }
 module.exports = ConfigServiceV2ClientBuilder;
 module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
-module.exports.ALL_SCOPES = ALL_SCOPES;
\ No newline at end of file
+module.exports.ALL_SCOPES = ALL_SCOPES;
diff --git a/packages/logging/src/v2/logging_service_v2_client.js b/packages/logging/src/v2/logging_service_v2_client.js
index 3ed647ab0bb..bfb9ea05308 100644
--- a/packages/logging/src/v2/logging_service_v2_client.js
+++ b/packages/logging/src/v2/logging_service_v2_client.js
@@ -229,7 +229,7 @@ LoggingServiceV2Client.prototype.getProjectId = function(callback) {
  *
  *   `[LOG_ID]` must be URL-encoded. For example,
  *   `"projects/my-project-id/logs/syslog"`,
- *   `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
+ *   `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com.%2Factivity"`.
  *   For more information about log names, see
  *   {@link LogEntry}.
  * @param {Object=} options
@@ -287,7 +287,7 @@ LoggingServiceV2Client.prototype.deleteLog = function(request, options, callback
  *
  *   `[LOG_ID]` must be URL-encoded. For example,
  *   `"projects/my-project-id/logs/syslog"` or
- *   `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com%2Factivity"`.
+ *   `"organizations/1234567890/logs/cloudresourcemanager.googleapis.com.%2Factivity"`.
  *   For more information about log names, see
  *   {@link LogEntry}.
  * @param {Object=} request.resource
@@ -835,4 +835,4 @@ function LoggingServiceV2ClientBuilder(gaxGrpc) {
 }
 module.exports = LoggingServiceV2ClientBuilder;
 module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
-module.exports.ALL_SCOPES = ALL_SCOPES;
\ No newline at end of file
+module.exports.ALL_SCOPES = ALL_SCOPES;
diff --git a/packages/logging/src/v2/metrics_service_v2_client.js b/packages/logging/src/v2/metrics_service_v2_client.js
index 62d5a731e8e..126e3f5513a 100644
--- a/packages/logging/src/v2/metrics_service_v2_client.js
+++ b/packages/logging/src/v2/metrics_service_v2_client.js
@@ -555,4 +555,4 @@ function MetricsServiceV2ClientBuilder(gaxGrpc) {
 }
 module.exports = MetricsServiceV2ClientBuilder;
 module.exports.SERVICE_ADDRESS = SERVICE_ADDRESS;
-module.exports.ALL_SCOPES = ALL_SCOPES;
\ No newline at end of file
+module.exports.ALL_SCOPES = ALL_SCOPES;
diff --git a/packages/prediction/src/index.js b/packages/prediction/src/index.js
index 347fc80bd19..e33fbf26585 100644
--- a/packages/prediction/src/index.js
+++ b/packages/prediction/src/index.js
@@ -63,7 +63,7 @@ function Prediction(options) {
   }
 
   var config = {
-    baseUrl: 'https://www.googleapis.com/prediction/v1.6',
+    baseUrl: 'https://www.googleapis.com./prediction/v1.6',
     scopes: [
       'https://www.googleapis.com/auth/prediction',
       'https://www.googleapis.com/auth/devstorage.read_only'
diff --git a/packages/prediction/test/index.js b/packages/prediction/test/index.js
index acd66739fd8..98c319af532 100644
--- a/packages/prediction/test/index.js
+++ b/packages/prediction/test/index.js
@@ -125,7 +125,7 @@ describe('Prediction', function() {
 
       var calledWith = prediction.calledWith_[0];
 
-      var baseUrl = 'https://www.googleapis.com/prediction/v1.6';
+      var baseUrl = 'https://www.googleapis.com./prediction/v1.6';
       assert.strictEqual(calledWith.baseUrl, baseUrl);
       assert.deepEqual(calledWith.scopes, [
         'https://www.googleapis.com/auth/prediction',
diff --git a/packages/pubsub/src/index.js b/packages/pubsub/src/index.js
index 9c51a7af586..f226d325106 100644
--- a/packages/pubsub/src/index.js
+++ b/packages/pubsub/src/index.js
@@ -66,7 +66,7 @@ function PubSub(options) {
     return new PubSub(options);
   }
 
-  this.defaultBaseUrl_ = 'pubsub.googleapis.com';
+  this.defaultBaseUrl_ = 'pubsub.googleapis.com.';
   this.determineBaseUrl_();
 
   var config = {
diff --git a/packages/pubsub/test/index.js b/packages/pubsub/test/index.js
index c5ad67e6e8e..6eabd31dd1c 100644
--- a/packages/pubsub/test/index.js
+++ b/packages/pubsub/test/index.js
@@ -149,7 +149,7 @@ describe('PubSub', function() {
 
       var calledWith = pubsub.calledWith_[0];
 
-      var baseUrl = 'pubsub.googleapis.com';
+      var baseUrl = 'pubsub.googleapis.com.';
       assert.strictEqual(calledWith.baseUrl, baseUrl);
       assert.strictEqual(calledWith.service, 'pubsub');
       assert.strictEqual(calledWith.apiVersion, 'v1');
@@ -161,7 +161,7 @@ describe('PubSub', function() {
     });
 
     it('should set the defaultBaseUrl_', function() {
-      assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com');
+      assert.strictEqual(pubsub.defaultBaseUrl_, 'pubsub.googleapis.com.');
     });
 
     it('should use the PUBSUB_EMULATOR_HOST env var', function() {
diff --git a/packages/resource/src/index.js b/packages/resource/src/index.js
index de2ddba706f..efd96eb0546 100644
--- a/packages/resource/src/index.js
+++ b/packages/resource/src/index.js
@@ -58,7 +58,7 @@ function Resource(options) {
   }
 
   var config = {
-    baseUrl: 'https://cloudresourcemanager.googleapis.com/v1',
+    baseUrl: 'https://cloudresourcemanager.googleapis.com./v1',
     scopes: ['https://www.googleapis.com/auth/cloud-platform'],
     projectIdRequired: false,
     packageJson: require('../package.json')
diff --git a/packages/resource/test/index.js b/packages/resource/test/index.js
index 79e5c4acfbd..21d790456ce 100644
--- a/packages/resource/test/index.js
+++ b/packages/resource/test/index.js
@@ -134,7 +134,7 @@ describe('Resource', function() {
 
       var calledWith = resource.calledWith_[0];
 
-      var baseUrl = 'https://cloudresourcemanager.googleapis.com/v1';
+      var baseUrl = 'https://cloudresourcemanager.googleapis.com./v1';
       assert.strictEqual(calledWith.baseUrl, baseUrl);
       assert.deepEqual(calledWith.scopes, [
         'https://www.googleapis.com/auth/cloud-platform'
diff --git a/packages/spanner/src/index.js b/packages/spanner/src/index.js
index 62b473933be..c6e8793042f 100644
--- a/packages/spanner/src/index.js
+++ b/packages/spanner/src/index.js
@@ -76,7 +76,7 @@ function Spanner(options) {
   };
 
   var config = {
-    baseUrl: 'spanner.googleapis.com',
+    baseUrl: 'spanner.googleapis.com.',
     protoServices: {
       Operations: {
         path: googleProtoFiles('longrunning/operations.proto'),
diff --git a/packages/spanner/test/index.js b/packages/spanner/test/index.js
index 66ce4ce4e55..97a42343bd9 100644
--- a/packages/spanner/test/index.js
+++ b/packages/spanner/test/index.js
@@ -202,7 +202,7 @@ describe('Spanner', function() {
       var calledWith = spanner.calledWith_[0];
 
       assert.deepEqual(calledWith, {
-        baseUrl: 'spanner.googleapis.com',
+        baseUrl: 'spanner.googleapis.com.',
         protoServices: {
           Operations: {
             path: googleProtoFiles('longrunning', 'operations.proto'),
diff --git a/packages/speech/src/index.js b/packages/speech/src/index.js
index 898a0e8adda..d30267520ab 100644
--- a/packages/speech/src/index.js
+++ b/packages/speech/src/index.js
@@ -71,7 +71,7 @@ function Speech(options) {
   };
 
   var config = {
-    baseUrl: 'speech.googleapis.com',
+    baseUrl: 'speech.googleapis.com.',
     projectIdRequired: false,
     service: 'speech',
     protoServices: {
diff --git a/packages/speech/system-test/speech.js b/packages/speech/system-test/speech.js
index f5856aa602a..b22912534f8 100644
--- a/packages/speech/system-test/speech.js
+++ b/packages/speech/system-test/speech.js
@@ -39,7 +39,7 @@ FILENAMES.forEach(function(filename) {
     name: name,
     path: path.join(__dirname, 'data/' + name),
     gcsUri: 'gs://' + BUCKET_NAME + '/' + name,
-    httpUri: 'https://storage.googleapis.com/' + BUCKET_NAME + '/' + name
+    httpUri: 'https://storage.googleapis.com./' + BUCKET_NAME + '/' + name
   };
 });
 
diff --git a/packages/speech/test/index.js b/packages/speech/test/index.js
index f89c5cd4421..70a299f2d5f 100644
--- a/packages/speech/test/index.js
+++ b/packages/speech/test/index.js
@@ -156,7 +156,7 @@ describe('Speech', function() {
       var calledWith = speech.calledWith_[0];
 
       assert.deepEqual(calledWith, {
-        baseUrl: 'speech.googleapis.com',
+        baseUrl: 'speech.googleapis.com.',
         projectIdRequired: false,
         service: 'speech',
         protoServices: {
diff --git a/packages/storage/src/file.js b/packages/storage/src/file.js
index 55a5a29e69c..ac9aa1bb0ec 100644
--- a/packages/storage/src/file.js
+++ b/packages/storage/src/file.js
@@ -60,13 +60,13 @@ var SigningError = createErrorClass('SigningError', function(message) {
  * @const {string}
  * @private
  */
-var STORAGE_DOWNLOAD_BASE_URL = 'https://storage.googleapis.com';
+var STORAGE_DOWNLOAD_BASE_URL = 'https://storage.googleapis.com.';
 
 /**
  * @const {string}
  * @private
  */
-var STORAGE_UPLOAD_BASE_URL = 'https://www.googleapis.com/upload/storage/v1/b';
+var STORAGE_UPLOAD_BASE_URL = 'https://www.googleapis.com./upload/storage/v1/b';
 
 /**
  * @const {RegExp}
diff --git a/packages/storage/src/index.js b/packages/storage/src/index.js
index 12b4e670906..789a3b0aa16 100644
--- a/packages/storage/src/index.js
+++ b/packages/storage/src/index.js
@@ -76,7 +76,7 @@ function Storage(options) {
   }
 
   var config = {
-    baseUrl: 'https://www.googleapis.com/storage/v1',
+    baseUrl: 'https://www.googleapis.com./storage/v1',
     projectIdRequired: false,
     scopes: [
       'https://www.googleapis.com/auth/devstorage.full_control'
diff --git a/packages/storage/test/file.js b/packages/storage/test/file.js
index bd0dbe7fc84..897c8141bb0 100644
--- a/packages/storage/test/file.js
+++ b/packages/storage/test/file.js
@@ -617,7 +617,7 @@ describe('File', function() {
     describe('authenticating', function() {
       it('should create an authenticated request', function(done) {
         var expectedPath = format('https://{host}/{b}/{o}', {
-          host: 'storage.googleapis.com',
+          host: 'storage.googleapis.com.',
           b: file.bucket.name,
           o: encodeURIComponent(file.name)
         });
@@ -2583,7 +2583,7 @@ describe('File', function() {
             name: file.name,
             predefinedAcl: options.predefinedAcl
           },
-          uri: 'https://www.googleapis.com/upload/storage/v1/b/' +
+          uri: 'https://www.googleapis.com./upload/storage/v1/b/' +
             file.bucket.name + '/o'
         });
         done();
diff --git a/packages/storage/test/index.js b/packages/storage/test/index.js
index b1e020809d6..67d6d8b6dd1 100644
--- a/packages/storage/test/index.js
+++ b/packages/storage/test/index.js
@@ -123,7 +123,7 @@ describe('Storage', function() {
 
       var calledWith = storage.calledWith_[0];
 
-      var baseUrl = 'https://www.googleapis.com/storage/v1';
+      var baseUrl = 'https://www.googleapis.com./storage/v1';
       assert.strictEqual(calledWith.baseUrl, baseUrl);
       assert.strictEqual(calledWith.projectIdRequired, false);
       assert.deepEqual(calledWith.scopes, [
diff --git a/packages/translate/src/index.js b/packages/translate/src/index.js
index f178a01ae04..1b226eae823 100644
--- a/packages/translate/src/index.js
+++ b/packages/translate/src/index.js
@@ -62,7 +62,7 @@ function Translate(options) {
     return new Translate(options);
   }
 
-  var baseUrl = 'https://translation.googleapis.com/language/translate/v2';
+  var baseUrl = 'https://translation.googleapis.com./language/translate/v2';
 
   if (process.env.GOOGLE_CLOUD_TRANSLATE_ENDPOINT) {
     baseUrl = process.env.GOOGLE_CLOUD_TRANSLATE_ENDPOINT
diff --git a/packages/translate/test/index.js b/packages/translate/test/index.js
index 5d4c60bbca1..8a176607f72 100644
--- a/packages/translate/test/index.js
+++ b/packages/translate/test/index.js
@@ -94,7 +94,7 @@ describe('Translate', function() {
       assert(translate instanceof FakeService);
 
       var calledWith = translate.calledWith_[0];
-      var baseUrl = 'https://translation.googleapis.com/language/translate/v2';
+      var baseUrl = 'https://translation.googleapis.com./language/translate/v2';
 
       assert.strictEqual(calledWith.baseUrl, baseUrl);
       assert.deepEqual(calledWith.scopes, [