diff --git a/.cloudbuild.yaml b/.cloudbuild.yaml
index e1575f12279e..85bcefda08e0 100644
--- a/.cloudbuild.yaml
+++ b/.cloudbuild.yaml
@@ -83,8 +83,12 @@ steps:
   id: 'buildDeployer'
 - name: 'gcr.io/cloud-builders/docker'
   entrypoint: '/bin/bash'
-  args: ['-c', 'cd /workspace/components/kubeflow/launcher && ./build_image.sh -p $PROJECT_ID -t $COMMIT_SHA']
+  args: ['-c', 'cd /workspace/components/kubeflow/tf-launcher && ./build_image.sh -p $PROJECT_ID -t $COMMIT_SHA']
   id: 'buildLauncher'
+- name: 'gcr.io/cloud-builders/docker'
+  entrypoint: '/bin/bash'
+  args: ['-c', 'cd /workspace/components/kubeflow/katib-launcher && ./build_image.sh -p $PROJECT_ID -t $COMMIT_SHA']
+  id: 'buildKatibLauncher'
 - name: 'gcr.io/cloud-builders/docker'
   entrypoint: '/bin/bash'
   args: ['-c', 'cd /workspace/components/kubeflow/dnntrainer && ./build_image.sh -p $PROJECT_ID -t $COMMIT_SHA -l ml-pipeline-kubeflow-tf-trainer-gpu -b 1.6.0-gpu']
diff --git a/components/kubeflow/katib-launcher/kubeflow_katib_launcher_op.py b/components/kubeflow/katib-launcher/kubeflow_katib_launcher_op.py
index e2868ad14349..0364b36b7bda 100644
--- a/components/kubeflow/katib-launcher/kubeflow_katib_launcher_op.py
+++ b/components/kubeflow/katib-launcher/kubeflow_katib_launcher_op.py
@@ -35,5 +35,5 @@ def kubeflow_studyjob_launcher_op(name, namespace, optimizationtype, objectiveva
             "--suggestionspec", suggestionspec,
             '--studyjobtimeoutminutes', studyjob_timeout_minutes,
         ],
-        file_outputs = {'hp': '/output.txt'}
+        file_outputs = {'hyperparameter': '/output.txt'}
     )
diff --git a/components/kubeflow/tf-launcher/test/test_launcher.py b/components/kubeflow/tf-launcher/test/test_launcher.py
index c9447f980a85..597e7508b691 100644
--- a/components/kubeflow/tf-launcher/test/test_launcher.py
+++ b/components/kubeflow/tf-launcher/test/test_launcher.py
@@ -14,7 +14,6 @@
 
 
 import launcher
-from launcher import train
 import os
 import shutil
 import subprocess
@@ -36,7 +35,7 @@ def test_yaml_generation_basic(self):
     pss = 1
     args_list = []
     args_list.append('--learning-rate=0.1')
-    generated_yaml = train._generate_train_yaml(train_template_file, tfjob_ns, worker, pss, args_list)
+    generated_yaml = _generate_train_yaml(train_template_file, tfjob_ns, worker, pss, args_list)
     with open(os.path.join(test_data_dir, 'train_basic.yaml'), 'r') as f:
       golden = yaml.load(f)
     self.assertEqual(golden, generated_yaml)
@@ -51,7 +50,7 @@ def test_yaml_generation_advanced(self):
     args_list = []
     tfjob_ns = 'kubeflow'
     args_list.append('--learning-rate=0.1')
-    generated_yaml = train._generate_train_yaml(train_template_file, tfjob_ns, worker, pss, args_list)
+    generated_yaml = _generate_train_yaml(train_template_file, tfjob_ns, worker, pss, args_list)
     with open(os.path.join(test_data_dir, 'train_zero_worker.yaml'), 'r') as f:
       golden = yaml.load(f)
     self.assertEqual(golden, generated_yaml)
diff --git a/samples/kubeflow-tf/README.md b/samples/kubeflow-tf/README.md
index a551605772eb..278af9cfd1e4 100644
--- a/samples/kubeflow-tf/README.md
+++ b/samples/kubeflow-tf/README.md
@@ -35,8 +35,8 @@ Preprocessing:
   [container](https://github.com/kubeflow/pipelines/tree/master/components/dataflow/tft)
 
 Training:
-  [source code](https://github.com/kubeflow/pipelines/tree/master/components/kubeflow/launcher/src), 
-  [container](https://github.com/kubeflow/pipelines/tree/master/components/kubeflow/launcher)
+  [source code](https://github.com/kubeflow/pipelines/tree/master/components/kubeflow/tf-launcher/src),
+  [container](https://github.com/kubeflow/pipelines/tree/master/components/kubeflow/tf-launcher)
 
 Prediction:
   [source code](https://github.com/kubeflow/pipelines/tree/master/components/dataflow/predict/src), 
diff --git a/samples/tfx/README.md b/samples/tfx/README.md
index 5ec149476cc9..a26efb756553 100644
--- a/samples/tfx/README.md
+++ b/samples/tfx/README.md
@@ -51,8 +51,8 @@ Preprocessing:
   [container](https://github.com/kubeflow/pipelines/tree/master/components/dataflow/tft)
 
 Training:
-  [source code](https://github.com/kubeflow/pipelines/tree/master/components/kubeflow/launcher/src) 
-  [container](https://github.com/kubeflow/pipelines/tree/master/components/kubeflow/launcher)
+  [source code](https://github.com/kubeflow/pipelines/tree/master/components/kubeflow/tf-launcher/src)
+  [container](https://github.com/kubeflow/pipelines/tree/master/components/kubeflow/tf-launcher)
 
 Analysis:
   [source code](https://github.com/kubeflow/pipelines/tree/master/components/dataflow/tfma/src)