diff --git a/tools/rebaseline.py b/tools/rebaseline.py
index 3da7e7c..bf412b3 100755
--- a/tools/rebaseline.py
+++ b/tools/rebaseline.py
@@ -38,8 +38,9 @@
 import buildbot_globals
 import gm_json
 
-MASTER_HOST_URL = 'http://%s:%s' % (buildbot_globals.Get('master_host'),
-                                    buildbot_globals.Get('external_port'))
+MASTER_HOST_URL = 'http://%s:%s' % (
+    buildbot_globals.Get('public_master_host'),
+    buildbot_globals.Get('public_external_port'))
 ALL_BUILDERS = list(json.load(urllib2.urlopen(
     MASTER_HOST_URL + '/json/builders')))
 TEST_BUILDERS = filter(lambda x: 'Trybot' not in x and 'Test' in x,
diff --git a/tools/submit_try b/tools/submit_try
index bad1c77..e09e304 100755
--- a/tools/submit_try
+++ b/tools/submit_try
@@ -36,8 +36,8 @@
 ALL_ALIASES = [ALL_BUILDERS, COMPILE_BUILDERS, CQ_BUILDERS, REGEX]
 
 # Contact information for the build master.
-SKIA_BUILD_MASTER_HOST = str(buildbot_globals.Get('master_host'))
-SKIA_BUILD_MASTER_PORT = str(buildbot_globals.Get('external_port'))
+SKIA_BUILD_MASTER_HOST = str(buildbot_globals.Get('public_master_host'))
+SKIA_BUILD_MASTER_PORT = str(buildbot_globals.Get('public_external_port'))
 
 # All try builders have this suffix.
 TRYBOT_SUFFIX = '-Trybot'