diff --git a/hadoop_job_runner.py b/hadoop_job_runner.py
index 2fb4fb1..790f1f1 100644
--- a/hadoop_job_runner.py
+++ b/hadoop_job_runner.py
@@ -52,8 +52,8 @@ def send(subject, body, to):
 jobid = conne.run_jobflow(name=jobname,
                           log_uri='s3://dphive/debug/',
                           ec2_keyname='dpaws',
-                          master_instance_type='c1.medium',
-                          slave_instance_type='c1.medium',
+                          main_instance_type='c1.medium',
+                          subordinate_instance_type='c1.medium',
                           num_instances=3,
                           steps=[step1, step2])
 
diff --git a/prod/cdo/google/bin/build/pyodbc/setup.py b/prod/cdo/google/bin/build/pyodbc/setup.py
index 9b6f08c..7ae9f9c 100644
--- a/prod/cdo/google/bin/build/pyodbc/setup.py
+++ b/prod/cdo/google/bin/build/pyodbc/setup.py
@@ -253,7 +253,7 @@ def _get_version_git():
 
     n, result = getoutput('git branch')
     branch = re.search(r'\* (\w+)', result).group(1)
-    if branch != 'master' and not re.match('^v\d+$', branch):
+    if branch != 'main' and not re.match('^v\d+$', branch):
         name = branch + '-' + name
 
     return name, numbers