diff --git a/sdk/python/kfp/__init__.py b/sdk/python/kfp/__init__.py
index d58174a9b12..3c605b82a94 100644
--- a/sdk/python/kfp/__init__.py
+++ b/sdk/python/kfp/__init__.py
@@ -20,5 +20,6 @@
 
 TYPE_CHECK = True
 
+from kfp import components
 from kfp import dsl
 from kfp.client import Client
diff --git a/sdk/python/kfp/cli/compile_.py b/sdk/python/kfp/cli/compile_.py
index d265ca6194d..2bd3bab18c2 100644
--- a/sdk/python/kfp/cli/compile_.py
+++ b/sdk/python/kfp/cli/compile_.py
@@ -22,8 +22,8 @@
 
 import click
 from kfp import compiler
-from kfp.components import base_component
-from kfp.components import graph_component
+from kfp.dsl import base_component
+from kfp.dsl import graph_component
 
 
 def is_pipeline_func(func: Callable) -> bool:
diff --git a/sdk/python/kfp/cli/component.py b/sdk/python/kfp/cli/component.py
index e4b8d7e321f..e09bd7b7944 100644
--- a/sdk/python/kfp/cli/component.py
+++ b/sdk/python/kfp/cli/component.py
@@ -31,9 +31,9 @@
     _DOCKER_IS_PRESENT = False
 
 import kfp as kfp
-from kfp.components import component_factory
-from kfp.components import kfp_config
-from kfp.components import utils
+from kfp.dsl import component_factory
+from kfp.dsl import kfp_config
+from kfp.dsl import utils
 
 _REQUIREMENTS_TXT = 'runtime-requirements.txt'
 
diff --git a/sdk/python/kfp/client/client.py b/sdk/python/kfp/client/client.py
index 8127b1b2323..57b4c6d1f9f 100644
--- a/sdk/python/kfp/client/client.py
+++ b/sdk/python/kfp/client/client.py
@@ -32,7 +32,7 @@
 from kfp import compiler
 from kfp.client import auth
 from kfp.client import set_volume_credentials
-from kfp.components import base_component
+from kfp.dsl import base_component
 from kfp.pipeline_spec import pipeline_spec_pb2
 import kfp_server_api
 import yaml
diff --git a/sdk/python/kfp/compiler/compiler.py b/sdk/python/kfp/compiler/compiler.py
index af762ea2b6f..a77f606e89c 100644
--- a/sdk/python/kfp/compiler/compiler.py
+++ b/sdk/python/kfp/compiler/compiler.py
@@ -20,8 +20,8 @@
 from typing import Any, Dict, Optional
 
 from kfp.compiler import pipeline_spec_builder as builder
-from kfp.components import base_component
-from kfp.components.types import type_utils
+from kfp.dsl import base_component
+from kfp.dsl.types import type_utils
 
 
 class Compiler:
diff --git a/sdk/python/kfp/compiler/compiler_test.py b/sdk/python/kfp/compiler/compiler_test.py
index 7071ca7688c..92b1f6a1b72 100644
--- a/sdk/python/kfp/compiler/compiler_test.py
+++ b/sdk/python/kfp/compiler/compiler_test.py
@@ -31,17 +31,17 @@
 from kfp.cli import cli
 from kfp.compiler import compiler
 from kfp.compiler import compiler_utils
-from kfp.components import graph_component
-from kfp.components import pipeline_task
-from kfp.components import yaml_component
-from kfp.components.types import type_utils
 from kfp.dsl import Artifact
 from kfp.dsl import ContainerSpec
+from kfp.dsl import graph_component
 from kfp.dsl import Input
 from kfp.dsl import Model
 from kfp.dsl import Output
 from kfp.dsl import OutputPath
+from kfp.dsl import pipeline_task
 from kfp.dsl import PipelineTaskFinalStatus
+from kfp.dsl import yaml_component
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 import yaml
 
@@ -152,18 +152,6 @@ def simple_pipeline():
             with open(target_json_file, 'r') as f:
                 f.read()
 
-    def test_compile_pipeline_with_dsl_graph_component_should_raise_error(self):
-
-        with self.assertRaisesRegex(
-                AttributeError,
-                "module 'kfp.dsl' has no attribute 'graph_component'"):
-
-            @dsl.graph_component
-            def flip_coin_graph_component():
-                flip = flip_coin_op()
-                with dsl.Condition(flip.output == 'heads'):
-                    flip_coin_graph_component()
-
     def test_compile_pipeline_with_misused_inputvalue_should_raise_error(self):
 
         upstream_op = components.load_component_from_text("""
diff --git a/sdk/python/kfp/compiler/compiler_utils.py b/sdk/python/kfp/compiler/compiler_utils.py
index 1ae0c326bfe..79c4418bdff 100644
--- a/sdk/python/kfp/compiler/compiler_utils.py
+++ b/sdk/python/kfp/compiler/compiler_utils.py
@@ -17,11 +17,11 @@
 from copy import deepcopy
 from typing import DefaultDict, Dict, List, Mapping, Set, Tuple, Union
 
-from kfp.components import for_loop
-from kfp.components import pipeline_channel
-from kfp.components import pipeline_context
-from kfp.components import pipeline_task
-from kfp.components import tasks_group
+from kfp.dsl import for_loop
+from kfp.dsl import pipeline_channel
+from kfp.dsl import pipeline_context
+from kfp.dsl import pipeline_task
+from kfp.dsl import tasks_group
 
 GroupOrTaskType = Union[tasks_group.TasksGroup, pipeline_task.PipelineTask]
 
diff --git a/sdk/python/kfp/compiler/compiler_utils_test.py b/sdk/python/kfp/compiler/compiler_utils_test.py
index 61866fb740e..ec20833b30f 100644
--- a/sdk/python/kfp/compiler/compiler_utils_test.py
+++ b/sdk/python/kfp/compiler/compiler_utils_test.py
@@ -16,7 +16,7 @@
 
 from absl.testing import parameterized
 from kfp.compiler import compiler_utils
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
 
 
 class TestAdditionalInputNameForPipelineChannel(parameterized.TestCase):
diff --git a/sdk/python/kfp/compiler/pipeline_spec_builder.py b/sdk/python/kfp/compiler/pipeline_spec_builder.py
index 67f9786dde5..3d63a78c4dd 100644
--- a/sdk/python/kfp/compiler/pipeline_spec_builder.py
+++ b/sdk/python/kfp/compiler/pipeline_spec_builder.py
@@ -24,16 +24,16 @@
 from google.protobuf import struct_pb2
 import kfp
 from kfp.compiler import compiler_utils
-from kfp.components import for_loop
-from kfp.components import pipeline_channel
-from kfp.components import pipeline_context
-from kfp.components import pipeline_task
-from kfp.components import placeholders
-from kfp.components import structures
-from kfp.components import tasks_group
-from kfp.components import utils
-from kfp.components.types import artifact_types
-from kfp.components.types import type_utils
+from kfp.dsl import for_loop
+from kfp.dsl import pipeline_channel
+from kfp.dsl import pipeline_context
+from kfp.dsl import pipeline_task
+from kfp.dsl import placeholders
+from kfp.dsl import structures
+from kfp.dsl import tasks_group
+from kfp.dsl import utils
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 import yaml
 
diff --git a/sdk/python/kfp/compiler/read_write_test.py b/sdk/python/kfp/compiler/read_write_test.py
index 8ecdb30c4f5..29c76db03ec 100644
--- a/sdk/python/kfp/compiler/read_write_test.py
+++ b/sdk/python/kfp/compiler/read_write_test.py
@@ -22,9 +22,9 @@
 from absl.testing import parameterized
 from kfp import compiler
 from kfp import components
-from kfp.components import placeholders
-from kfp.components import python_component
-from kfp.components import structures
+from kfp.dsl import placeholders
+from kfp.dsl import python_component
+from kfp.dsl import structures
 import yaml
 
 _PROJECT_ROOT = os.path.abspath(os.path.join(__file__, *([os.path.pardir] * 5)))
diff --git a/sdk/python/kfp/components/__init__.py b/sdk/python/kfp/components/__init__.py
index 3f183b62675..005c43f3cd2 100644
--- a/sdk/python/kfp/components/__init__.py
+++ b/sdk/python/kfp/components/__init__.py
@@ -24,10 +24,10 @@
     'YamlComponent',
 ]
 
-from kfp.components.base_component import BaseComponent
-from kfp.components.container_component import ContainerComponent
-from kfp.components.python_component import PythonComponent
-from kfp.components.yaml_component import load_component_from_file
-from kfp.components.yaml_component import load_component_from_text
-from kfp.components.yaml_component import load_component_from_url
-from kfp.components.yaml_component import YamlComponent
+from kfp.components.load_yaml_utilities import load_component_from_file
+from kfp.components.load_yaml_utilities import load_component_from_text
+from kfp.components.load_yaml_utilities import load_component_from_url
+from kfp.dsl.base_component import BaseComponent
+from kfp.dsl.container_component_class import ContainerComponent
+from kfp.dsl.python_component import PythonComponent
+from kfp.dsl.yaml_component import YamlComponent
diff --git a/sdk/python/kfp/components/yaml_component.py b/sdk/python/kfp/components/load_yaml_utilities.py
similarity index 59%
rename from sdk/python/kfp/components/yaml_component.py
rename to sdk/python/kfp/components/load_yaml_utilities.py
index e60907c6efb..34342d3b0b0 100644
--- a/sdk/python/kfp/components/yaml_component.py
+++ b/sdk/python/kfp/components/load_yaml_utilities.py
@@ -15,49 +15,12 @@
 
 from typing import Optional, Tuple
 
-from google.protobuf import json_format
-from kfp import components
-from kfp.components import structures
-from kfp.pipeline_spec import pipeline_spec_pb2
+from kfp.dsl import structures
+from kfp.dsl import yaml_component
 import requests
 
 
-class YamlComponent(components.BaseComponent):
-    """A component loaded from a YAML file.
-
-    **Note:** ``YamlComponent`` is not intended to be used to construct components directly. Use ``kfp.components.load_component_from_*()`` instead.
-
-    Attribute:
-        component_spec: Component definition.
-        component_yaml: The yaml string that this component is loaded from.
-    """
-
-    def __init__(
-        self,
-        component_spec: structures.ComponentSpec,
-        component_yaml: str,
-    ):
-        super().__init__(component_spec=component_spec)
-        self.component_yaml = component_yaml
-
-    @property
-    def pipeline_spec(self) -> pipeline_spec_pb2.PipelineSpec:
-        """Returns the pipeline spec of the component."""
-        component_dict = structures.load_documents_from_yaml(
-            self.component_yaml)[0]
-        is_v1 = 'implementation' in set(component_dict.keys())
-        if is_v1:
-            return self.component_spec.to_pipeline_spec()
-        else:
-            return json_format.ParseDict(component_dict,
-                                         pipeline_spec_pb2.PipelineSpec())
-
-    def execute(self, *args, **kwargs):
-        """Not implemented."""
-        raise NotImplementedError
-
-
-def load_component_from_text(text: str) -> YamlComponent:
+def load_component_from_text(text: str) -> yaml_component.YamlComponent:
     """Loads a component from text.
 
     Args:
@@ -66,12 +29,12 @@ def load_component_from_text(text: str) -> YamlComponent:
     Returns:
         Component loaded from YAML.
     """
-    return YamlComponent(
+    return yaml_component.YamlComponent(
         component_spec=structures.ComponentSpec.from_yaml_documents(text),
         component_yaml=text)
 
 
-def load_component_from_file(file_path: str) -> YamlComponent:
+def load_component_from_file(file_path: str) -> yaml_component.YamlComponent:
     """Loads a component from a file.
 
     Args:
@@ -91,9 +54,9 @@ def load_component_from_file(file_path: str) -> YamlComponent:
         return load_component_from_text(component_stream.read())
 
 
-def load_component_from_url(url: str,
-                            auth: Optional[Tuple[str,
-                                                 str]] = None) -> YamlComponent:
+def load_component_from_url(
+        url: str,
+        auth: Optional[Tuple[str, str]] = None) -> yaml_component.YamlComponent:
     """Loads a component from a URL.
 
     Args:
diff --git a/sdk/python/kfp/components/yaml_component_test.py b/sdk/python/kfp/components/load_yaml_utilities_test.py
similarity index 91%
rename from sdk/python/kfp/components/yaml_component_test.py
rename to sdk/python/kfp/components/load_yaml_utilities_test.py
index 3e56e3ce79b..55ba29cf575 100644
--- a/sdk/python/kfp/components/yaml_component_test.py
+++ b/sdk/python/kfp/components/load_yaml_utilities_test.py
@@ -11,15 +11,15 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.yaml_component."""
+"""Tests for kfp.dsl.yaml_component."""
 
 import os
 import tempfile
 import textwrap
 import unittest
 
-from kfp.components import structures
-from kfp.components import yaml_component
+from kfp import components
+from kfp.dsl import structures
 
 SAMPLE_YAML = textwrap.dedent("""\
 components:
@@ -84,10 +84,10 @@
 ]
 
 
-class YamlComponentTest(unittest.TestCase):
+class LoadYamlTests(unittest.TestCase):
 
     def test_load_component_from_text(self):
-        component = yaml_component.load_component_from_text(SAMPLE_YAML)
+        component = components.load_component_from_text(SAMPLE_YAML)
         self.assertEqual(component.component_spec.name, 'component-1')
         self.assertEqual(component.component_spec.outputs,
                          {'output1': structures.OutputSpec(type='String')})
@@ -101,7 +101,7 @@ def test_load_component_from_file(self):
             path = os.path.join(tmpdir, 'sample_yaml.yaml')
             with open(path, 'w') as f:
                 f.write(SAMPLE_YAML)
-            component = yaml_component.load_component_from_file(path)
+            component = components.load_component_from_file(path)
         self.assertEqual(component.component_spec.name, 'component-1')
         self.assertEqual(component.component_spec.outputs,
                          {'output1': structures.OutputSpec(type='String')})
@@ -112,7 +112,7 @@ def test_load_component_from_file(self):
 
     def test_load_component_from_url(self):
         component_url = 'https://raw.githubusercontent.com/kubeflow/pipelines/7b49eadf621a9054e1f1315c86f95fb8cf8c17c3/sdk/python/kfp/compiler/test_data/components/identity.yaml'
-        component = yaml_component.load_component_from_url(component_url)
+        component = components.load_component_from_url(component_url)
 
         self.assertEqual(component.component_spec.name, 'identity')
         self.assertEqual(component.component_spec.outputs,
diff --git a/sdk/python/kfp/components/test_data/simple_yaml.yaml b/sdk/python/kfp/components/test_data/simple_yaml.yaml
deleted file mode 100644
index 8db8477f7b4..00000000000
--- a/sdk/python/kfp/components/test_data/simple_yaml.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: component_1
-inputs:
-  input1: {type: String}
-outputs:
-  output1: {type: String}
-implementation:
-  container:
-    image: alpine
-    command:
-    - sh
-    - -c
-    - 'set -ex
-
-    echo "$0" > "$1"'
-    - {inputValue: input1}
-    - {outputPath: output1}
\ No newline at end of file
diff --git a/sdk/python/kfp/dsl/__init__.py b/sdk/python/kfp/dsl/__init__.py
index a70190ca78c..d3502a72879 100644
--- a/sdk/python/kfp/dsl/__init__.py
+++ b/sdk/python/kfp/dsl/__init__.py
@@ -57,31 +57,31 @@
 
 from typing import TypeVar
 
-from kfp.components.component_decorator import component
-from kfp.components.container_component_decorator import container_component
-from kfp.components.for_loop import Collected
-from kfp.components.importer_node import importer
-from kfp.components.pipeline_context import pipeline
-from kfp.components.pipeline_task import PipelineTask
-from kfp.components.placeholders import ConcatPlaceholder
-from kfp.components.placeholders import IfPresentPlaceholder
-from kfp.components.structures import ContainerSpec
-from kfp.components.task_final_status import PipelineTaskFinalStatus
-from kfp.components.tasks_group import Condition
-from kfp.components.tasks_group import ExitHandler
-from kfp.components.tasks_group import ParallelFor
-from kfp.components.types.artifact_types import Artifact
-from kfp.components.types.artifact_types import ClassificationMetrics
-from kfp.components.types.artifact_types import Dataset
-from kfp.components.types.artifact_types import HTML
-from kfp.components.types.artifact_types import Markdown
-from kfp.components.types.artifact_types import Metrics
-from kfp.components.types.artifact_types import Model
-from kfp.components.types.artifact_types import SlicedClassificationMetrics
-from kfp.components.types.type_annotations import InputAnnotation
-from kfp.components.types.type_annotations import InputPath
-from kfp.components.types.type_annotations import OutputAnnotation
-from kfp.components.types.type_annotations import OutputPath
+from kfp.dsl.component_decorator import component
+from kfp.dsl.container_component_decorator import container_component
+from kfp.dsl.for_loop import Collected
+from kfp.dsl.importer_node import importer
+from kfp.dsl.pipeline_context import pipeline
+from kfp.dsl.pipeline_task import PipelineTask
+from kfp.dsl.placeholders import ConcatPlaceholder
+from kfp.dsl.placeholders import IfPresentPlaceholder
+from kfp.dsl.structures import ContainerSpec
+from kfp.dsl.task_final_status import PipelineTaskFinalStatus
+from kfp.dsl.tasks_group import Condition
+from kfp.dsl.tasks_group import ExitHandler
+from kfp.dsl.tasks_group import ParallelFor
+from kfp.dsl.types.artifact_types import Artifact
+from kfp.dsl.types.artifact_types import ClassificationMetrics
+from kfp.dsl.types.artifact_types import Dataset
+from kfp.dsl.types.artifact_types import HTML
+from kfp.dsl.types.artifact_types import Markdown
+from kfp.dsl.types.artifact_types import Metrics
+from kfp.dsl.types.artifact_types import Model
+from kfp.dsl.types.artifact_types import SlicedClassificationMetrics
+from kfp.dsl.types.type_annotations import InputAnnotation
+from kfp.dsl.types.type_annotations import InputPath
+from kfp.dsl.types.type_annotations import OutputAnnotation
+from kfp.dsl.types.type_annotations import OutputPath
 
 # hack: constants and custom type generics have to be defined here to be captured by autodoc and autodocsumm used in ./docs/conf.py
 
diff --git a/sdk/python/kfp/components/base_component.py b/sdk/python/kfp/dsl/base_component.py
similarity index 97%
rename from sdk/python/kfp/components/base_component.py
rename to sdk/python/kfp/dsl/base_component.py
index 2b62ece34e0..25a10f84df9 100644
--- a/sdk/python/kfp/components/base_component.py
+++ b/sdk/python/kfp/dsl/base_component.py
@@ -16,9 +16,9 @@
 import abc
 from typing import List
 
-from kfp.components import pipeline_task
-from kfp.components import structures
-from kfp.components.types import type_utils
+from kfp.dsl import pipeline_task
+from kfp.dsl import structures
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 
 
diff --git a/sdk/python/kfp/components/base_component_test.py b/sdk/python/kfp/dsl/base_component_test.py
similarity index 95%
rename from sdk/python/kfp/components/base_component_test.py
rename to sdk/python/kfp/dsl/base_component_test.py
index c9e0277564a..48ed1d6065a 100644
--- a/sdk/python/kfp/components/base_component_test.py
+++ b/sdk/python/kfp/dsl/base_component_test.py
@@ -11,18 +11,18 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.base_component."""
+"""Tests for kfp.dsl.base_component."""
 
 import unittest
 from unittest.mock import patch
 
 from kfp import dsl
-from kfp.components import pipeline_task
-from kfp.components import placeholders
-from kfp.components import PythonComponent
-from kfp.components import structures
+from kfp.dsl import pipeline_task
+from kfp.dsl import placeholders
+from kfp.dsl import python_component
+from kfp.dsl import structures
 
-component_op = PythonComponent(
+component_op = python_component.PythonComponent(
     # dummy python_func not used in behavior that is being tested
     python_func=lambda: None,
     component_spec=structures.ComponentSpec(
diff --git a/sdk/python/kfp/components/component_decorator.py b/sdk/python/kfp/dsl/component_decorator.py
similarity index 99%
rename from sdk/python/kfp/components/component_decorator.py
rename to sdk/python/kfp/dsl/component_decorator.py
index 8bc64f17bca..7c6589589dc 100644
--- a/sdk/python/kfp/components/component_decorator.py
+++ b/sdk/python/kfp/dsl/component_decorator.py
@@ -16,7 +16,7 @@
 from typing import Callable, List, Optional
 import warnings
 
-from kfp.components import component_factory
+from kfp.dsl import component_factory
 
 
 def component(func: Optional[Callable] = None,
diff --git a/sdk/python/kfp/components/component_decorator_test.py b/sdk/python/kfp/dsl/component_decorator_test.py
similarity index 97%
rename from sdk/python/kfp/components/component_decorator_test.py
rename to sdk/python/kfp/dsl/component_decorator_test.py
index e55d79af560..4b51de638f4 100644
--- a/sdk/python/kfp/components/component_decorator_test.py
+++ b/sdk/python/kfp/dsl/component_decorator_test.py
@@ -17,9 +17,9 @@
 from typing import Dict, List, NamedTuple
 import unittest
 
-from kfp.components import python_component
-from kfp.components import structures
-from kfp.components.component_decorator import component
+from kfp.dsl import python_component
+from kfp.dsl import structures
+from kfp.dsl.component_decorator import component
 
 
 class TestComponentDecorator(unittest.TestCase):
diff --git a/sdk/python/kfp/components/component_factory.py b/sdk/python/kfp/dsl/component_factory.py
similarity index 95%
rename from sdk/python/kfp/components/component_factory.py
rename to sdk/python/kfp/dsl/component_factory.py
index 6585d0a8136..99d34f78285 100644
--- a/sdk/python/kfp/components/component_factory.py
+++ b/sdk/python/kfp/dsl/component_factory.py
@@ -21,17 +21,17 @@
 import warnings
 
 import docstring_parser
-from kfp.components import container_component
-from kfp.components import container_component_artifact_channel
-from kfp.components import graph_component
-from kfp.components import placeholders
-from kfp.components import python_component
-from kfp.components import structures
-from kfp.components import task_final_status
-from kfp.components.types import artifact_types
-from kfp.components.types import custom_artifact_types
-from kfp.components.types import type_annotations
-from kfp.components.types import type_utils
+from kfp.dsl import container_component_artifact_channel
+from kfp.dsl import container_component_class
+from kfp.dsl import graph_component
+from kfp.dsl import placeholders
+from kfp.dsl import python_component
+from kfp.dsl import structures
+from kfp.dsl import task_final_status
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import custom_artifact_types
+from kfp.dsl.types import type_annotations
+from kfp.dsl.types import type_utils
 
 _DEFAULT_BASE_IMAGE = 'python:3.7'
 
@@ -195,7 +195,7 @@ def extract_component_interface(
             passing_style = type_annotations.get_io_artifact_annotation(
                 parameter_type)
 
-            # parameter_type is a type like typing_extensions.Annotated[kfp.components.types.artifact_types.Artifact, <class 'kfp.components.types.type_annotations.OutputAnnotation'>] OR typing_extensions.Annotated[typing.List[kfp.components.types.artifact_types.Artifact], <class 'kfp.components.types.type_annotations.OutputAnnotation'>]
+            # parameter_type is a type like typing_extensions.Annotated[kfp.dsl.types.artifact_types.Artifact, <class 'kfp.dsl.types.type_annotations.OutputAnnotation'>] OR typing_extensions.Annotated[typing.List[kfp.dsl.types.artifact_types.Artifact], <class 'kfp.dsl.types.type_annotations.OutputAnnotation'>]
 
             is_artifact_list = type_annotations.is_list_of_artifacts(
                 parameter_type.__origin__)
@@ -421,7 +421,7 @@ def _get_command_and_args_for_lightweight_component(
         textwrap.dedent('''\
                     program_path=$(mktemp -d)
                     printf "%s" "$0" > "$program_path/ephemeral_component.py"
-                    python3 -m kfp.components.executor_main \
+                    python3 -m kfp.dsl.executor_main \
                         --component_module_path \
                         "$program_path/ephemeral_component.py" \
                         "$@"
@@ -444,7 +444,7 @@ def _get_command_and_args_for_containerized_component(
     command = [
         'python3',
         '-m',
-        'kfp.components.executor_main',
+        'kfp.dsl.executor_main',
     ]
 
     args = [
@@ -569,7 +569,7 @@ def make_input_for_parameterized_container_component_function(
 
 
 def create_container_component_from_func(
-        func: Callable) -> container_component.ContainerComponent:
+        func: Callable) -> container_component_class.ContainerComponent:
     """Implementation for the @container_component decorator.
 
     The decorator is defined under container_component_decorator.py. See
@@ -593,7 +593,7 @@ def create_container_component_from_func(
     component_spec.implementation = structures.Implementation(
         container_spec_implementation)
     component_spec._validate_placeholders()
-    return container_component.ContainerComponent(component_spec, func)
+    return container_component_class.ContainerComponent(component_spec, func)
 
 
 def create_graph_component_from_func(
diff --git a/sdk/python/kfp/components/component_factory_test.py b/sdk/python/kfp/dsl/component_factory_test.py
similarity index 95%
rename from sdk/python/kfp/components/component_factory_test.py
rename to sdk/python/kfp/dsl/component_factory_test.py
index 6cfd5b5c8d2..8f935ae3f04 100644
--- a/sdk/python/kfp/components/component_factory_test.py
+++ b/sdk/python/kfp/dsl/component_factory_test.py
@@ -16,14 +16,14 @@
 import unittest
 
 from kfp import dsl
-from kfp.components import component_factory
-from kfp.components import structures
-from kfp.components.component_decorator import component
-from kfp.components.types.artifact_types import Artifact
-from kfp.components.types.artifact_types import Model
-from kfp.components.types.type_annotations import OutputPath
+from kfp.dsl import component_factory
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl import structures
+from kfp.dsl.component_decorator import component
+from kfp.dsl.types.artifact_types import Artifact
+from kfp.dsl.types.artifact_types import Model
+from kfp.dsl.types.type_annotations import OutputPath
 
 
 class TestGetPackagesToInstallCommand(unittest.TestCase):
diff --git a/sdk/python/kfp/components/constants.py b/sdk/python/kfp/dsl/constants.py
similarity index 100%
rename from sdk/python/kfp/components/constants.py
rename to sdk/python/kfp/dsl/constants.py
diff --git a/sdk/python/kfp/components/container_component_artifact_channel.py b/sdk/python/kfp/dsl/container_component_artifact_channel.py
similarity index 80%
rename from sdk/python/kfp/components/container_component_artifact_channel.py
rename to sdk/python/kfp/dsl/container_component_artifact_channel.py
index 84e0f984ecc..322752295fd 100644
--- a/sdk/python/kfp/components/container_component_artifact_channel.py
+++ b/sdk/python/kfp/dsl/container_component_artifact_channel.py
@@ -14,8 +14,6 @@
 
 from typing import Union
 
-from kfp.components import placeholders
-
 
 class ContainerComponentArtifactChannel:
     """A class for passing in placeholders into container_component decorated
@@ -25,13 +23,10 @@ def __init__(self, io_type: str, var_name: str):
         self._io_type = io_type
         self._var_name = var_name
 
-    def __getattr__(
-        self, _name: str
-    ) -> Union[placeholders.InputUriPlaceholder, placeholders
-               .InputPathPlaceholder, placeholders.OutputUriPlaceholder,
-               placeholders.OutputPathPlaceholder,
-               placeholders.InputMetadataPlaceholder,
-               placeholders.OutputMetadataPlaceholder]:
+    def __getattr__(self, _name: str) -> Union['placeholders.Placeholder']:
+        # aviod circular imports
+        from kfp.dsl import placeholders
+
         attr_to_placeholder_dict = {
             'uri': {
                 'input': placeholders.InputUriPlaceholder,
diff --git a/sdk/python/kfp/components/container_component_artifact_channel_test.py b/sdk/python/kfp/dsl/container_component_artifact_channel_test.py
similarity index 94%
rename from sdk/python/kfp/components/container_component_artifact_channel_test.py
rename to sdk/python/kfp/dsl/container_component_artifact_channel_test.py
index 35eaeafdd6a..fd04a027f08 100644
--- a/sdk/python/kfp/components/container_component_artifact_channel_test.py
+++ b/sdk/python/kfp/dsl/container_component_artifact_channel_test.py
@@ -14,8 +14,8 @@
 
 import unittest
 
-from kfp.components import container_component_artifact_channel
-from kfp.components import placeholders
+from kfp.dsl import container_component_artifact_channel
+from kfp.dsl import placeholders
 
 
 class TestContainerComponentArtifactChannel(unittest.TestCase):
diff --git a/sdk/python/kfp/components/container_component.py b/sdk/python/kfp/dsl/container_component_class.py
similarity index 94%
rename from sdk/python/kfp/components/container_component.py
rename to sdk/python/kfp/dsl/container_component_class.py
index 6c83ac3d064..7cd928036a4 100644
--- a/sdk/python/kfp/components/container_component.py
+++ b/sdk/python/kfp/dsl/container_component_class.py
@@ -15,8 +15,8 @@
 
 from typing import Callable
 
-from kfp.components import base_component
-from kfp.components import structures
+from kfp.dsl import base_component
+from kfp.dsl import structures
 
 
 class ContainerComponent(base_component.BaseComponent):
diff --git a/sdk/python/kfp/components/container_component_decorator.py b/sdk/python/kfp/dsl/container_component_decorator.py
similarity index 91%
rename from sdk/python/kfp/components/container_component_decorator.py
rename to sdk/python/kfp/dsl/container_component_decorator.py
index 7d8901c97c3..6ce43094ff0 100644
--- a/sdk/python/kfp/components/container_component_decorator.py
+++ b/sdk/python/kfp/dsl/container_component_decorator.py
@@ -14,12 +14,12 @@
 
 from typing import Callable
 
-from kfp.components import component_factory
-from kfp.components import container_component
+from kfp.dsl import component_factory
+from kfp.dsl import container_component_class
 
 
 def container_component(
-        func: Callable) -> container_component.ContainerComponent:
+        func: Callable) -> container_component_class.ContainerComponent:
     """Decorator for container-based components in KFP v2.
 
     Args:
diff --git a/sdk/python/kfp/components/container_component_decorator_test.py b/sdk/python/kfp/dsl/container_component_decorator_test.py
similarity index 94%
rename from sdk/python/kfp/components/container_component_decorator_test.py
rename to sdk/python/kfp/dsl/container_component_decorator_test.py
index a234b16d222..d49253b1e8f 100644
--- a/sdk/python/kfp/components/container_component_decorator_test.py
+++ b/sdk/python/kfp/dsl/container_component_decorator_test.py
@@ -16,8 +16,8 @@
 import unittest
 
 from kfp import dsl
-from kfp.components import container_component
 from kfp.dsl import Artifact
+from kfp.dsl import container_component_class
 from kfp.dsl import Input
 from kfp.dsl import Output
 
@@ -36,7 +36,7 @@ def hello_world() -> dsl.ContainerSpec:
             )
 
         self.assertIsInstance(hello_world,
-                              container_component.ContainerComponent)
+                              container_component_class.ContainerComponent)
         self.assertIsNone(hello_world.component_spec.inputs)
 
     def test_func_with_simple_io(self):
@@ -52,7 +52,7 @@ def hello_world_io(
                 args=['--text', text, '--output_path', text_output_path])
 
         self.assertIsInstance(hello_world_io,
-                              container_component.ContainerComponent)
+                              container_component_class.ContainerComponent)
 
     def test_func_with_artifact_io(self):
 
@@ -78,7 +78,7 @@ def container_comp_with_artifacts(
                 ])
 
         self.assertIsInstance(container_comp_with_artifacts,
-                              container_component.ContainerComponent)
+                              container_component_class.ContainerComponent)
 
 
 class TestInputValuePlaceholderIrTypeHack(unittest.TestCase):
diff --git a/sdk/python/kfp/components/executor.py b/sdk/python/kfp/dsl/executor.py
similarity index 98%
rename from sdk/python/kfp/components/executor.py
rename to sdk/python/kfp/dsl/executor.py
index 0f43790999f..db8a8a89bd4 100644
--- a/sdk/python/kfp/components/executor.py
+++ b/sdk/python/kfp/dsl/executor.py
@@ -16,10 +16,10 @@
 import os
 from typing import Any, Callable, Dict, List, Optional, Union
 
-from kfp.components import python_component
-from kfp.components import task_final_status
-from kfp.components.types import artifact_types
-from kfp.components.types import type_annotations
+from kfp.dsl import python_component
+from kfp.dsl import task_final_status
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_annotations
 
 
 class Executor():
diff --git a/sdk/python/kfp/components/executor_main.py b/sdk/python/kfp/dsl/executor_main.py
similarity index 96%
rename from sdk/python/kfp/components/executor_main.py
rename to sdk/python/kfp/dsl/executor_main.py
index 96943b0ca43..1836ea5889f 100644
--- a/sdk/python/kfp/components/executor_main.py
+++ b/sdk/python/kfp/dsl/executor_main.py
@@ -17,9 +17,9 @@
 import os
 import sys
 
-from kfp.components import executor as component_executor
-from kfp.components import kfp_config
-from kfp.components import utils
+from kfp.dsl import executor as component_executor
+from kfp.dsl import kfp_config
+from kfp.dsl import utils
 
 
 def _setup_logging():
diff --git a/sdk/python/kfp/components/executor_test.py b/sdk/python/kfp/dsl/executor_test.py
similarity index 98%
rename from sdk/python/kfp/components/executor_test.py
rename to sdk/python/kfp/dsl/executor_test.py
index 87625cc3b0d..351e68a17a7 100644
--- a/sdk/python/kfp/components/executor_test.py
+++ b/sdk/python/kfp/dsl/executor_test.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.executor."""
+"""Tests for kfp.dsl.executor."""
 
 import json
 import os
@@ -21,17 +21,17 @@
 from unittest import mock
 
 from absl.testing import parameterized
-from kfp.components import executor
-from kfp.components.task_final_status import PipelineTaskFinalStatus
-from kfp.components.types import artifact_types
-from kfp.components.types.artifact_types import Artifact
-from kfp.components.types.artifact_types import Dataset
-from kfp.components.types.artifact_types import Metrics
-from kfp.components.types.artifact_types import Model
-from kfp.components.types.type_annotations import InputPath
-from kfp.components.types.type_annotations import OutputPath
+from kfp.dsl import executor
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl.task_final_status import PipelineTaskFinalStatus
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types.artifact_types import Artifact
+from kfp.dsl.types.artifact_types import Dataset
+from kfp.dsl.types.artifact_types import Metrics
+from kfp.dsl.types.artifact_types import Model
+from kfp.dsl.types.type_annotations import InputPath
+from kfp.dsl.types.type_annotations import OutputPath
 
 
 class ExecutorTest(parameterized.TestCase):
diff --git a/sdk/python/kfp/components/for_loop.py b/sdk/python/kfp/dsl/for_loop.py
similarity index 99%
rename from sdk/python/kfp/components/for_loop.py
rename to sdk/python/kfp/dsl/for_loop.py
index f838dff257d..53815766315 100644
--- a/sdk/python/kfp/components/for_loop.py
+++ b/sdk/python/kfp/dsl/for_loop.py
@@ -16,7 +16,7 @@
 import re
 from typing import Any, Dict, List, Optional, Union
 
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
 
 ItemList = List[Union[int, float, str, Dict[str, Any]]]
 
diff --git a/sdk/python/kfp/components/for_loop_test.py b/sdk/python/kfp/dsl/for_loop_test.py
similarity index 98%
rename from sdk/python/kfp/components/for_loop_test.py
rename to sdk/python/kfp/dsl/for_loop_test.py
index b1e3549c94a..7d1559c87bb 100644
--- a/sdk/python/kfp/components/for_loop_test.py
+++ b/sdk/python/kfp/dsl/for_loop_test.py
@@ -15,8 +15,8 @@
 import unittest
 
 from absl.testing import parameterized
-from kfp.components import for_loop
-from kfp.components import pipeline_channel
+from kfp.dsl import for_loop
+from kfp.dsl import pipeline_channel
 
 
 class ForLoopTest(parameterized.TestCase):
diff --git a/sdk/python/kfp/components/graph_component.py b/sdk/python/kfp/dsl/graph_component.py
similarity index 95%
rename from sdk/python/kfp/components/graph_component.py
rename to sdk/python/kfp/dsl/graph_component.py
index 181ae809a86..2b09927dfa1 100644
--- a/sdk/python/kfp/components/graph_component.py
+++ b/sdk/python/kfp/dsl/graph_component.py
@@ -18,10 +18,10 @@
 import uuid
 
 from kfp.compiler import pipeline_spec_builder as builder
-from kfp.components import base_component
-from kfp.components import pipeline_channel
-from kfp.components import pipeline_context
-from kfp.components import structures
+from kfp.dsl import base_component
+from kfp.dsl import pipeline_channel
+from kfp.dsl import pipeline_context
+from kfp.dsl import structures
 from kfp.pipeline_spec import pipeline_spec_pb2
 
 
diff --git a/sdk/python/kfp/components/importer_component.py b/sdk/python/kfp/dsl/importer_component.py
similarity index 92%
rename from sdk/python/kfp/components/importer_component.py
rename to sdk/python/kfp/dsl/importer_component.py
index ac6e14614af..168c7c6f739 100644
--- a/sdk/python/kfp/components/importer_component.py
+++ b/sdk/python/kfp/dsl/importer_component.py
@@ -13,8 +13,8 @@
 # limitations under the License.
 """Importer-based component."""
 
-from kfp.components import base_component
-from kfp.components import structures
+from kfp.dsl import base_component
+from kfp.dsl import structures
 
 
 class ImporterComponent(base_component.BaseComponent):
diff --git a/sdk/python/kfp/components/importer_node.py b/sdk/python/kfp/dsl/importer_node.py
similarity index 93%
rename from sdk/python/kfp/components/importer_node.py
rename to sdk/python/kfp/dsl/importer_node.py
index d62edf79173..2a3e676daa7 100644
--- a/sdk/python/kfp/components/importer_node.py
+++ b/sdk/python/kfp/dsl/importer_node.py
@@ -15,14 +15,14 @@
 
 from typing import Any, Dict, Mapping, Optional, Type, Union
 
-from kfp.components import importer_component
-from kfp.components import pipeline_channel
-from kfp.components import pipeline_task
-from kfp.components import placeholders
-from kfp.components import structures
-from kfp.components import utils
-from kfp.components.types import artifact_types
-from kfp.components.types import type_utils
+from kfp.dsl import importer_component
+from kfp.dsl import pipeline_channel
+from kfp.dsl import pipeline_task
+from kfp.dsl import placeholders
+from kfp.dsl import structures
+from kfp.dsl import utils
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_utils
 
 URI_KEY = 'uri'
 OUTPUT_KEY = 'artifact'
diff --git a/sdk/python/kfp/components/importer_node_test.py b/sdk/python/kfp/dsl/importer_node_test.py
similarity index 98%
rename from sdk/python/kfp/components/importer_node_test.py
rename to sdk/python/kfp/dsl/importer_node_test.py
index d6066b5a4da..0351382b108 100644
--- a/sdk/python/kfp/components/importer_node_test.py
+++ b/sdk/python/kfp/dsl/importer_node_test.py
@@ -14,8 +14,8 @@
 import unittest
 
 from kfp import dsl
-from kfp.components import importer_node
-from kfp.components.types.artifact_types import Dataset
+from kfp.dsl import importer_node
+from kfp.dsl.types.artifact_types import Dataset
 
 
 class TestImporterSupportsDynamicMetadata(unittest.TestCase):
diff --git a/sdk/python/kfp/components/kfp_config.py b/sdk/python/kfp/dsl/kfp_config.py
similarity index 100%
rename from sdk/python/kfp/components/kfp_config.py
rename to sdk/python/kfp/dsl/kfp_config.py
diff --git a/sdk/python/kfp/components/pipeline_channel.py b/sdk/python/kfp/dsl/pipeline_channel.py
similarity index 99%
rename from sdk/python/kfp/components/pipeline_channel.py
rename to sdk/python/kfp/dsl/pipeline_channel.py
index 26ad27eae31..66616103fb6 100644
--- a/sdk/python/kfp/components/pipeline_channel.py
+++ b/sdk/python/kfp/dsl/pipeline_channel.py
@@ -20,7 +20,7 @@
 import re
 from typing import Dict, List, Optional, Union
 
-from kfp.components.types import type_utils
+from kfp.dsl.types import type_utils
 
 
 @dataclasses.dataclass
@@ -97,7 +97,7 @@ def __init__(
         # so that serialization and unserialization remain consistent
         # (i.e. None => '' => None)
         self.task_name = task_name or None
-        from kfp.components import pipeline_context
+        from kfp.dsl import pipeline_context
 
         default_pipeline = pipeline_context.Pipeline.get_default_pipeline()
         if self.task_name is not None and default_pipeline is not None and default_pipeline.tasks:
diff --git a/sdk/python/kfp/components/pipeline_channel_test.py b/sdk/python/kfp/dsl/pipeline_channel_test.py
similarity index 98%
rename from sdk/python/kfp/components/pipeline_channel_test.py
rename to sdk/python/kfp/dsl/pipeline_channel_test.py
index 060fe4ad236..4de0e84a254 100644
--- a/sdk/python/kfp/components/pipeline_channel_test.py
+++ b/sdk/python/kfp/dsl/pipeline_channel_test.py
@@ -11,13 +11,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.pipeline_channel."""
+"""Tests for kfp.dsl.pipeline_channel."""
 
 import unittest
 
 from absl.testing import parameterized
 from kfp import dsl
-from kfp.components import pipeline_channel
+from kfp.dsl import pipeline_channel
 
 
 class PipelineChannelTest(parameterized.TestCase):
diff --git a/sdk/python/kfp/components/pipeline_context.py b/sdk/python/kfp/dsl/pipeline_context.py
similarity index 97%
rename from sdk/python/kfp/components/pipeline_context.py
rename to sdk/python/kfp/dsl/pipeline_context.py
index a41e401da60..c1304c39bac 100644
--- a/sdk/python/kfp/components/pipeline_context.py
+++ b/sdk/python/kfp/dsl/pipeline_context.py
@@ -16,10 +16,10 @@
 import functools
 from typing import Callable, Optional
 
-from kfp.components import component_factory
-from kfp.components import pipeline_task
-from kfp.components import tasks_group
-from kfp.components import utils
+from kfp.dsl import component_factory
+from kfp.dsl import pipeline_task
+from kfp.dsl import tasks_group
+from kfp.dsl import utils
 
 
 def pipeline(func: Optional[Callable] = None,
diff --git a/sdk/python/kfp/components/pipeline_task.py b/sdk/python/kfp/dsl/pipeline_task.py
similarity index 97%
rename from sdk/python/kfp/components/pipeline_task.py
rename to sdk/python/kfp/dsl/pipeline_task.py
index f1e47bbaf13..f35cdd752be 100644
--- a/sdk/python/kfp/components/pipeline_task.py
+++ b/sdk/python/kfp/dsl/pipeline_task.py
@@ -20,12 +20,12 @@
 from typing import Any, Dict, List, Mapping, Optional, Union
 import warnings
 
-from kfp.components import constants
-from kfp.components import pipeline_channel
-from kfp.components import placeholders
-from kfp.components import structures
-from kfp.components import utils
-from kfp.components.types import type_utils
+from kfp.dsl import constants
+from kfp.dsl import pipeline_channel
+from kfp.dsl import placeholders
+from kfp.dsl import structures
+from kfp.dsl import utils
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 
 _register_task_handler = lambda task: utils.maybe_rename_for_k8s(
@@ -69,7 +69,7 @@ def __init__(
     ):
         """Initilizes a PipelineTask instance."""
         # import within __init__ to avoid circular import
-        from kfp.components.tasks_group import TasksGroup
+        from kfp.dsl.tasks_group import TasksGroup
 
         self.parent_task_group: Union[None, TasksGroup] = None
         args = args or {}
@@ -617,7 +617,7 @@ def my_pipeline(text: str = 'message'):
         return self
 
 
-# TODO: this function should ideally be in the function kfp.components.structures.check_placeholder_references_valid_io_name, which does something similar, but this causes the exception to be raised at component definition time, rather than compile time. This would break tests that load v1 component YAML, even though that YAML is invalid.
+# TODO: this function should ideally be in the function kfp.dsl.structures.check_placeholder_references_valid_io_name, which does something similar, but this causes the exception to be raised at component definition time, rather than compile time. This would break tests that load v1 component YAML, even though that YAML is invalid.
 def check_primitive_placeholder_is_used_for_correct_io_type(
     inputs_dict: Dict[str, structures.InputSpec],
     outputs_dict: Dict[str, structures.OutputSpec],
diff --git a/sdk/python/kfp/components/pipeline_task_test.py b/sdk/python/kfp/dsl/pipeline_task_test.py
similarity index 98%
rename from sdk/python/kfp/components/pipeline_task_test.py
rename to sdk/python/kfp/dsl/pipeline_task_test.py
index 128a83a3499..6e7443fc1a6 100644
--- a/sdk/python/kfp/components/pipeline_task_test.py
+++ b/sdk/python/kfp/dsl/pipeline_task_test.py
@@ -11,16 +11,16 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.pipeline_task."""
+"""Tests for kfp.dsl.pipeline_task."""
 
 import textwrap
 import unittest
 
 from absl.testing import parameterized
 from kfp import dsl
-from kfp.components import pipeline_task
-from kfp.components import placeholders
-from kfp.components import structures
+from kfp.dsl import pipeline_task
+from kfp.dsl import placeholders
+from kfp.dsl import structures
 
 V2_YAML = textwrap.dedent("""\
 components:
diff --git a/sdk/python/kfp/components/placeholders.py b/sdk/python/kfp/dsl/placeholders.py
similarity index 99%
rename from sdk/python/kfp/components/placeholders.py
rename to sdk/python/kfp/dsl/placeholders.py
index 701f463ada6..39a2617cfff 100644
--- a/sdk/python/kfp/components/placeholders.py
+++ b/sdk/python/kfp/dsl/placeholders.py
@@ -18,8 +18,8 @@
 import json
 from typing import Any, Dict, List, Optional, Union
 
-from kfp.components import utils
-from kfp.components.types import type_utils
+from kfp.dsl import utils
+from kfp.dsl.types import type_utils
 
 
 class Placeholder(abc.ABC):
diff --git a/sdk/python/kfp/components/placeholders_test.py b/sdk/python/kfp/dsl/placeholders_test.py
similarity index 99%
rename from sdk/python/kfp/components/placeholders_test.py
rename to sdk/python/kfp/dsl/placeholders_test.py
index 9c896606219..da89f4cfa8e 100644
--- a/sdk/python/kfp/components/placeholders_test.py
+++ b/sdk/python/kfp/dsl/placeholders_test.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Contains tests for kfp.components.placeholders."""
+"""Contains tests for kfp.dsl.placeholders."""
 import os
 import tempfile
 from typing import Any, List
@@ -19,11 +19,11 @@
 from absl.testing import parameterized
 from kfp import compiler
 from kfp import dsl
-from kfp.components import placeholders
 from kfp.dsl import Artifact
 from kfp.dsl import Dataset
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl import placeholders
 
 
 class TestExecutorInputPlaceholder(parameterized.TestCase):
diff --git a/sdk/python/kfp/components/python_component.py b/sdk/python/kfp/dsl/python_component.py
similarity index 92%
rename from sdk/python/kfp/components/python_component.py
rename to sdk/python/kfp/dsl/python_component.py
index 8106f2e4bf2..faa4c447400 100644
--- a/sdk/python/kfp/components/python_component.py
+++ b/sdk/python/kfp/dsl/python_component.py
@@ -15,11 +15,11 @@
 
 from typing import Callable
 
-from kfp import components
-from kfp.components import structures
+from kfp.dsl import base_component
+from kfp.dsl import structures
 
 
-class PythonComponent(components.BaseComponent):
+class PythonComponent(base_component.BaseComponent):
     """A component defined via Python function.
 
     **Note:** ``PythonComponent`` is not intended to be used to construct components directly. Use ``@kfp.dsl.component`` instead.
diff --git a/sdk/python/kfp/components/structures.py b/sdk/python/kfp/dsl/structures.py
similarity index 98%
rename from sdk/python/kfp/components/structures.py
rename to sdk/python/kfp/dsl/structures.py
index a39cff4fee7..24486e730d2 100644
--- a/sdk/python/kfp/components/structures.py
+++ b/sdk/python/kfp/dsl/structures.py
@@ -23,15 +23,15 @@
 
 from google.protobuf import json_format
 import kfp
-from kfp.components import placeholders
-from kfp.components import utils
-from kfp.components import v1_components
-from kfp.components import v1_structures
-from kfp.components.container_component_artifact_channel import \
+from kfp.dsl import placeholders
+from kfp.dsl import utils
+from kfp.dsl import v1_components
+from kfp.dsl import v1_structures
+from kfp.dsl.container_component_artifact_channel import \
     ContainerComponentArtifactChannel
-from kfp.components.types import artifact_types
-from kfp.components.types import type_annotations
-from kfp.components.types import type_utils
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_annotations
+from kfp.dsl.types import type_utils
 from kfp.pipeline_spec import pipeline_spec_pb2
 import yaml
 
@@ -912,9 +912,9 @@ def to_pipeline_spec(self) -> pipeline_spec_pb2.PipelineSpec:
         # import here to aviod circular module dependency
         from kfp.compiler import compiler_utils
         from kfp.compiler import pipeline_spec_builder as builder
-        from kfp.components import pipeline_channel
-        from kfp.components import pipeline_task
-        from kfp.components import tasks_group
+        from kfp.dsl import pipeline_channel
+        from kfp.dsl import pipeline_task
+        from kfp.dsl import tasks_group
 
         args_dict = {}
         pipeline_inputs = self.inputs or {}
diff --git a/sdk/python/kfp/components/structures_test.py b/sdk/python/kfp/dsl/structures_test.py
similarity index 99%
rename from sdk/python/kfp/components/structures_test.py
rename to sdk/python/kfp/dsl/structures_test.py
index 6bacae4e77b..ad6274d9317 100644
--- a/sdk/python/kfp/components/structures_test.py
+++ b/sdk/python/kfp/dsl/structures_test.py
@@ -11,7 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.structures."""
+"""Tests for kfp.dsl.structures."""
 
 import os
 import tempfile
@@ -22,9 +22,9 @@
 from kfp import compiler
 from kfp import components
 from kfp import dsl
-from kfp.components import component_factory
-from kfp.components import placeholders
-from kfp.components import structures
+from kfp.dsl import component_factory
+from kfp.dsl import placeholders
+from kfp.dsl import structures
 
 V1_YAML_IF_PLACEHOLDER = textwrap.dedent("""\
     implementation:
diff --git a/sdk/python/kfp/components/task_final_status.py b/sdk/python/kfp/dsl/task_final_status.py
similarity index 100%
rename from sdk/python/kfp/components/task_final_status.py
rename to sdk/python/kfp/dsl/task_final_status.py
diff --git a/sdk/python/kfp/components/tasks_group.py b/sdk/python/kfp/dsl/tasks_group.py
similarity index 97%
rename from sdk/python/kfp/components/tasks_group.py
rename to sdk/python/kfp/dsl/tasks_group.py
index c5390c68995..42d1446a9d6 100644
--- a/sdk/python/kfp/components/tasks_group.py
+++ b/sdk/python/kfp/dsl/tasks_group.py
@@ -16,10 +16,10 @@
 import enum
 from typing import Optional, Union
 
-from kfp.components import for_loop
-from kfp.components import pipeline_channel
-from kfp.components import pipeline_context
-from kfp.components import pipeline_task
+from kfp.dsl import for_loop
+from kfp.dsl import pipeline_channel
+from kfp.dsl import pipeline_context
+from kfp.dsl import pipeline_task
 
 
 class TasksGroupType(str, enum.Enum):
diff --git a/sdk/python/kfp/components/tasks_group_test.py b/sdk/python/kfp/dsl/tasks_group_test.py
similarity index 95%
rename from sdk/python/kfp/components/tasks_group_test.py
rename to sdk/python/kfp/dsl/tasks_group_test.py
index c64346b245c..09ba5cdbc34 100644
--- a/sdk/python/kfp/components/tasks_group_test.py
+++ b/sdk/python/kfp/dsl/tasks_group_test.py
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 from absl.testing import parameterized
-from kfp.components import for_loop
-from kfp.components import pipeline_context
-from kfp.components import tasks_group
+from kfp.dsl import for_loop
+from kfp.dsl import pipeline_context
+from kfp.dsl import tasks_group
 
 
 class ParallelForTest(parameterized.TestCase):
diff --git a/sdk/python/kfp/components/types/__init__.py b/sdk/python/kfp/dsl/types/__init__.py
similarity index 100%
rename from sdk/python/kfp/components/types/__init__.py
rename to sdk/python/kfp/dsl/types/__init__.py
diff --git a/sdk/python/kfp/components/types/artifact_types.py b/sdk/python/kfp/dsl/types/artifact_types.py
similarity index 100%
rename from sdk/python/kfp/components/types/artifact_types.py
rename to sdk/python/kfp/dsl/types/artifact_types.py
diff --git a/sdk/python/kfp/components/types/artifact_types_test.py b/sdk/python/kfp/dsl/types/artifact_types_test.py
similarity index 98%
rename from sdk/python/kfp/components/types/artifact_types_test.py
rename to sdk/python/kfp/dsl/types/artifact_types_test.py
index 517d5f9b4ed..917ad95a456 100644
--- a/sdk/python/kfp/components/types/artifact_types_test.py
+++ b/sdk/python/kfp/dsl/types/artifact_types_test.py
@@ -18,7 +18,7 @@
 import unittest
 
 from absl.testing import parameterized
-from kfp.components.types import artifact_types
+from kfp.dsl.types import artifact_types
 
 
 class ArtifactsTest(parameterized.TestCase):
diff --git a/sdk/python/kfp/components/types/custom_artifact_types.py b/sdk/python/kfp/dsl/types/custom_artifact_types.py
similarity index 98%
rename from sdk/python/kfp/components/types/custom_artifact_types.py
rename to sdk/python/kfp/dsl/types/custom_artifact_types.py
index 7174c86aa8c..484dfa65086 100644
--- a/sdk/python/kfp/components/types/custom_artifact_types.py
+++ b/sdk/python/kfp/dsl/types/custom_artifact_types.py
@@ -16,9 +16,9 @@
 import inspect
 from typing import Callable, Dict, List, Union
 
-from kfp.components import component_factory
-from kfp.components.types import type_annotations
-from kfp.components.types import type_utils
+from kfp.dsl import component_factory
+from kfp.dsl.types import type_annotations
+from kfp.dsl.types import type_utils
 
 RETURN_PREFIX = 'return-'
 
diff --git a/sdk/python/kfp/components/types/custom_artifact_types_test.py b/sdk/python/kfp/dsl/types/custom_artifact_types_test.py
similarity index 96%
rename from sdk/python/kfp/components/types/custom_artifact_types_test.py
rename to sdk/python/kfp/dsl/types/custom_artifact_types_test.py
index ed856db23b0..4a9c279df69 100644
--- a/sdk/python/kfp/components/types/custom_artifact_types_test.py
+++ b/sdk/python/kfp/dsl/types/custom_artifact_types_test.py
@@ -24,14 +24,14 @@
 from absl.testing import parameterized
 import kfp
 from kfp import dsl
-from kfp.components.types import artifact_types
-from kfp.components.types import custom_artifact_types
-from kfp.components.types.artifact_types import Artifact
-from kfp.components.types.artifact_types import Dataset
-from kfp.components.types.type_annotations import InputPath
-from kfp.components.types.type_annotations import OutputPath
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import custom_artifact_types
+from kfp.dsl.types.artifact_types import Artifact
+from kfp.dsl.types.artifact_types import Dataset
+from kfp.dsl.types.type_annotations import InputPath
+from kfp.dsl.types.type_annotations import OutputPath
 
 Alias = Artifact
 artifact_types_alias = artifact_types
@@ -219,9 +219,9 @@ def func() -> typing.NamedTuple('Outputs', [
 class TestGetFullQualnameForArtifact(_TestCaseWithThirdPartyPackage):
     # only gets called on artifacts, so don't need to test on all types
     @parameterized.parameters([
-        (Alias, 'kfp.components.types.artifact_types.Artifact'),
-        (Artifact, 'kfp.components.types.artifact_types.Artifact'),
-        (Dataset, 'kfp.components.types.artifact_types.Dataset'),
+        (Alias, 'kfp.dsl.types.artifact_types.Artifact'),
+        (Artifact, 'kfp.dsl.types.artifact_types.Artifact'),
+        (Dataset, 'kfp.dsl.types.artifact_types.Dataset'),
     ])
     def test(self, obj: Any, expected_qualname: str):
         self.assertEqual(
diff --git a/sdk/python/kfp/components/types/test_data/expected_bulk_loaded_confusion_matrix.json b/sdk/python/kfp/dsl/types/test_data/expected_bulk_loaded_confusion_matrix.json
similarity index 100%
rename from sdk/python/kfp/components/types/test_data/expected_bulk_loaded_confusion_matrix.json
rename to sdk/python/kfp/dsl/types/test_data/expected_bulk_loaded_confusion_matrix.json
diff --git a/sdk/python/kfp/components/types/test_data/expected_confusion_matrix.json b/sdk/python/kfp/dsl/types/test_data/expected_confusion_matrix.json
similarity index 100%
rename from sdk/python/kfp/components/types/test_data/expected_confusion_matrix.json
rename to sdk/python/kfp/dsl/types/test_data/expected_confusion_matrix.json
diff --git a/sdk/python/kfp/components/types/test_data/expected_io_types_bulk_load_classification_metrics.json b/sdk/python/kfp/dsl/types/test_data/expected_io_types_bulk_load_classification_metrics.json
similarity index 100%
rename from sdk/python/kfp/components/types/test_data/expected_io_types_bulk_load_classification_metrics.json
rename to sdk/python/kfp/dsl/types/test_data/expected_io_types_bulk_load_classification_metrics.json
diff --git a/sdk/python/kfp/components/types/test_data/expected_io_types_classification_metrics.json b/sdk/python/kfp/dsl/types/test_data/expected_io_types_classification_metrics.json
similarity index 100%
rename from sdk/python/kfp/components/types/test_data/expected_io_types_classification_metrics.json
rename to sdk/python/kfp/dsl/types/test_data/expected_io_types_classification_metrics.json
diff --git a/sdk/python/kfp/components/types/type_annotations.py b/sdk/python/kfp/dsl/types/type_annotations.py
similarity index 98%
rename from sdk/python/kfp/components/types/type_annotations.py
rename to sdk/python/kfp/dsl/types/type_annotations.py
index 138a98198f8..aa39d2002e6 100644
--- a/sdk/python/kfp/components/types/type_annotations.py
+++ b/sdk/python/kfp/dsl/types/type_annotations.py
@@ -19,9 +19,9 @@
 import re
 from typing import List, Type, TypeVar, Union
 
-from kfp.components.types import artifact_types
-from kfp.components.types import type_annotations
-from kfp.components.types import type_utils
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_annotations
+from kfp.dsl.types import type_utils
 
 
 class OutputPath:
diff --git a/sdk/python/kfp/components/types/type_annotations_test.py b/sdk/python/kfp/dsl/types/type_annotations_test.py
similarity index 94%
rename from sdk/python/kfp/components/types/type_annotations_test.py
rename to sdk/python/kfp/dsl/types/type_annotations_test.py
index f514cdd2fa0..099208c1b12 100644
--- a/sdk/python/kfp/components/types/type_annotations_test.py
+++ b/sdk/python/kfp/dsl/types/type_annotations_test.py
@@ -11,21 +11,21 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.types.type_annotations."""
+"""Tests for kfp.dsl.types.type_annotations."""
 
 from typing import Any, Dict, List, Optional
 import unittest
 
 from absl.testing import parameterized
-from kfp.components.types import artifact_types
-from kfp.components.types import type_annotations
-from kfp.components.types.artifact_types import Model
-from kfp.components.types.type_annotations import InputAnnotation
-from kfp.components.types.type_annotations import InputPath
-from kfp.components.types.type_annotations import OutputAnnotation
-from kfp.components.types.type_annotations import OutputPath
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_annotations
+from kfp.dsl.types.artifact_types import Model
+from kfp.dsl.types.type_annotations import InputAnnotation
+from kfp.dsl.types.type_annotations import InputPath
+from kfp.dsl.types.type_annotations import OutputAnnotation
+from kfp.dsl.types.type_annotations import OutputPath
 
 
 class AnnotationsTest(parameterized.TestCase):
diff --git a/sdk/python/kfp/components/types/type_utils.py b/sdk/python/kfp/dsl/types/type_utils.py
similarity index 98%
rename from sdk/python/kfp/components/types/type_utils.py
rename to sdk/python/kfp/dsl/types/type_utils.py
index 92b9328fab5..bd724742c51 100644
--- a/sdk/python/kfp/components/types/type_utils.py
+++ b/sdk/python/kfp/dsl/types/type_utils.py
@@ -20,11 +20,10 @@
 import warnings
 
 import kfp
-from kfp.components import pipeline_channel
-from kfp.components import structures
-from kfp.components import task_final_status
-from kfp.components.types import artifact_types
-from kfp.components.types import type_annotations
+from kfp.dsl import structures
+from kfp.dsl import task_final_status
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_annotations
 from kfp.pipeline_spec import pipeline_spec_pb2
 
 DEFAULT_ARTIFACT_SCHEMA_VERSION = '0.0.1'
@@ -231,9 +230,9 @@ def _get_type_string_from_component_argument(
     argument_value: Union['pipeline_channel.PipelineChannel', str, bool, int,
                           float, dict, list]
 ) -> str:
-    # argument is a PipelineChannel
-    if isinstance(argument_value,
-                  kfp.components.pipeline_channel.PipelineChannel):
+    # avoid circular imports
+    from kfp.dsl import pipeline_channel
+    if isinstance(argument_value, pipeline_channel.PipelineChannel):
         return argument_value.channel_type
 
     # argument is a constant
diff --git a/sdk/python/kfp/components/types/type_utils_test.py b/sdk/python/kfp/dsl/types/type_utils_test.py
similarity index 98%
rename from sdk/python/kfp/components/types/type_utils_test.py
rename to sdk/python/kfp/dsl/types/type_utils_test.py
index 6c36483b116..ee2cf161809 100644
--- a/sdk/python/kfp/components/types/type_utils_test.py
+++ b/sdk/python/kfp/dsl/types/type_utils_test.py
@@ -21,16 +21,16 @@
 from kfp import compiler
 from kfp import components
 from kfp import dsl
-from kfp.components import base_component
-from kfp.components import pipeline_channel
-from kfp.components import structures
-from kfp.components import yaml_component
-from kfp.components.types import artifact_types
-from kfp.components.types import type_utils
-from kfp.components.types.type_utils import InconsistentTypeException
+from kfp.dsl import base_component
 from kfp.dsl import Dataset
 from kfp.dsl import Input
 from kfp.dsl import Output
+from kfp.dsl import pipeline_channel
+from kfp.dsl import structures
+from kfp.dsl import yaml_component
+from kfp.dsl.types import artifact_types
+from kfp.dsl.types import type_utils
+from kfp.dsl.types.type_utils import InconsistentTypeException
 from kfp.pipeline_spec import pipeline_spec_pb2 as pb
 
 _PARAMETER_TYPES = [
diff --git a/sdk/python/kfp/components/utils.py b/sdk/python/kfp/dsl/utils.py
similarity index 100%
rename from sdk/python/kfp/components/utils.py
rename to sdk/python/kfp/dsl/utils.py
diff --git a/sdk/python/kfp/components/utils_test.py b/sdk/python/kfp/dsl/utils_test.py
similarity index 98%
rename from sdk/python/kfp/components/utils_test.py
rename to sdk/python/kfp/dsl/utils_test.py
index 1a3df52f07e..a0be587fc0d 100644
--- a/sdk/python/kfp/components/utils_test.py
+++ b/sdk/python/kfp/dsl/utils_test.py
@@ -11,12 +11,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-"""Tests for kfp.components.utils."""
+"""Tests for kfp.dsl.utils."""
 
 import unittest
 
 from absl.testing import parameterized
-from kfp.components import utils
+from kfp.dsl import utils
 
 
 class UtilsTest(parameterized.TestCase):
diff --git a/sdk/python/kfp/components/v1_components.py b/sdk/python/kfp/dsl/v1_components.py
similarity index 97%
rename from sdk/python/kfp/components/v1_components.py
rename to sdk/python/kfp/dsl/v1_components.py
index f276fa9702c..9714d56eef0 100644
--- a/sdk/python/kfp/components/v1_components.py
+++ b/sdk/python/kfp/dsl/v1_components.py
@@ -15,7 +15,7 @@
 import hashlib
 import warnings
 
-from kfp.components import v1_structures
+from kfp.dsl import v1_structures
 import yaml
 
 
diff --git a/sdk/python/kfp/components/v1_modelbase.py b/sdk/python/kfp/dsl/v1_modelbase.py
similarity index 100%
rename from sdk/python/kfp/components/v1_modelbase.py
rename to sdk/python/kfp/dsl/v1_modelbase.py
diff --git a/sdk/python/kfp/components/v1_structures.py b/sdk/python/kfp/dsl/v1_structures.py
similarity index 99%
rename from sdk/python/kfp/components/v1_structures.py
rename to sdk/python/kfp/dsl/v1_structures.py
index 90818f260ca..661cef196fa 100644
--- a/sdk/python/kfp/components/v1_structures.py
+++ b/sdk/python/kfp/dsl/v1_structures.py
@@ -15,10 +15,9 @@
 from collections import OrderedDict
 from typing import Any, Dict, List, Mapping, Optional, Union
 
+from kfp.dsl.v1_modelbase import ModelBase
 import yaml
 
-from .v1_modelbase import ModelBase
-
 PrimitiveTypes = Union[str, int, float, bool]
 PrimitiveTypesIncludingNone = Optional[PrimitiveTypes]
 
diff --git a/sdk/python/kfp/dsl/yaml_component.py b/sdk/python/kfp/dsl/yaml_component.py
new file mode 100644
index 00000000000..187fa533f26
--- /dev/null
+++ b/sdk/python/kfp/dsl/yaml_component.py
@@ -0,0 +1,54 @@
+# Copyright 2021-2022 The Kubeflow Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""Component loaded from YAML."""
+
+from google.protobuf import json_format
+from kfp.dsl import base_component
+from kfp.dsl import structures
+from kfp.pipeline_spec import pipeline_spec_pb2
+
+
+class YamlComponent(base_component.BaseComponent):
+    """A component loaded from a YAML file.
+
+    **Note:** ``YamlComponent`` is not intended to be used to construct components directly. Use ``kfp.components.load_component_from_*()`` instead.
+
+    Attribute:
+        component_spec: Component definition.
+        component_yaml: The yaml string that this component is loaded from.
+    """
+
+    def __init__(
+        self,
+        component_spec: structures.ComponentSpec,
+        component_yaml: str,
+    ):
+        super().__init__(component_spec=component_spec)
+        self.component_yaml = component_yaml
+
+    @property
+    def pipeline_spec(self) -> pipeline_spec_pb2.PipelineSpec:
+        """Returns the pipeline spec of the component."""
+        component_dict = structures.load_documents_from_yaml(
+            self.component_yaml)[0]
+        is_v1 = 'implementation' in set(component_dict.keys())
+        if is_v1:
+            return self.component_spec.to_pipeline_spec()
+        else:
+            return json_format.ParseDict(component_dict,
+                                         pipeline_spec_pb2.PipelineSpec())
+
+    def execute(self, *args, **kwargs):
+        """Not implemented."""
+        raise NotImplementedError
diff --git a/sdk/python/test_data/components/add_numbers.yaml b/sdk/python/test_data/components/add_numbers.yaml
index 33654302b68..5b5486da367 100644
--- a/sdk/python/test_data/components/add_numbers.yaml
+++ b/sdk/python/test_data/components/add_numbers.yaml
@@ -32,7 +32,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -40,7 +40,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -81,4 +81,4 @@ root:
       Output:
         parameterType: NUMBER_INTEGER
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/component_with_metadata_fields.yaml b/sdk/python/test_data/components/component_with_metadata_fields.yaml
index 16bdc539b1e..61a41867cf3 100644
--- a/sdk/python/test_data/components/component_with_metadata_fields.yaml
+++ b/sdk/python/test_data/components/component_with_metadata_fields.yaml
@@ -48,7 +48,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -56,7 +56,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -124,4 +124,4 @@ root:
         description: The concatenated string.
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/component_with_pip_install.yaml b/sdk/python/test_data/components/component_with_pip_install.yaml
index d9b8cf7a130..4e4335a2043 100644
--- a/sdk/python/test_data/components/component_with_pip_install.yaml
+++ b/sdk/python/test_data/components/component_with_pip_install.yaml
@@ -19,14 +19,14 @@ deploymentSpec:
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
           \ python3 -m pip install --quiet     --no-warn-script-location --index-url\
           \ https://pypi.org/simple --trusted-host https://pypi.org/simple 'yapf'\
-          \ 'kfp==2.0.0-beta.16' && \"$0\" \"$@\"\n"
+          \ 'kfp==2.0.1' && \"$0\" \"$@\"\n"
         - sh
         - -ec
         - 'program_path=$(mktemp -d)
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -46,4 +46,4 @@ root:
         taskInfo:
           name: component-with-pip-install
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/component_with_task_final_status.yaml b/sdk/python/test_data/components/component_with_task_final_status.yaml
index e0a4bda25db..ac138f70554 100644
--- a/sdk/python/test_data/components/component_with_task_final_status.yaml
+++ b/sdk/python/test_data/components/component_with_task_final_status.yaml
@@ -24,7 +24,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.17'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -32,7 +32,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -61,4 +61,4 @@ root:
         isOptional: true
         parameterType: TASK_FINAL_STATUS
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.17
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/concat_message.yaml b/sdk/python/test_data/components/concat_message.yaml
index 4f0e97a25dd..5dc62f96204 100644
--- a/sdk/python/test_data/components/concat_message.yaml
+++ b/sdk/python/test_data/components/concat_message.yaml
@@ -32,7 +32,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -40,7 +40,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -82,4 +82,4 @@ root:
       Output:
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/dict_input.yaml b/sdk/python/test_data/components/dict_input.yaml
index 1eeac295b0c..977103a338a 100644
--- a/sdk/python/test_data/components/dict_input.yaml
+++ b/sdk/python/test_data/components/dict_input.yaml
@@ -23,7 +23,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -31,7 +31,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -58,4 +58,4 @@ root:
       struct:
         parameterType: STRUCT
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/identity.yaml b/sdk/python/test_data/components/identity.yaml
index 17b6b9afef1..b8a4551a9fd 100644
--- a/sdk/python/test_data/components/identity.yaml
+++ b/sdk/python/test_data/components/identity.yaml
@@ -29,7 +29,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -37,7 +37,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -74,4 +74,4 @@ root:
       Output:
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/input_artifact.yaml b/sdk/python/test_data/components/input_artifact.yaml
index 813ecc83e94..e029dd81617 100644
--- a/sdk/python/test_data/components/input_artifact.yaml
+++ b/sdk/python/test_data/components/input_artifact.yaml
@@ -25,7 +25,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -33,7 +33,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -63,4 +63,4 @@ root:
           schemaTitle: system.Dataset
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/nested_return.yaml b/sdk/python/test_data/components/nested_return.yaml
index e8224c18daf..810215dcf30 100644
--- a/sdk/python/test_data/components/nested_return.yaml
+++ b/sdk/python/test_data/components/nested_return.yaml
@@ -23,7 +23,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -31,7 +31,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -61,4 +61,4 @@ root:
       Output:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/output_metrics.yaml b/sdk/python/test_data/components/output_metrics.yaml
index 3b67e606fc5..6a18a32d0b9 100644
--- a/sdk/python/test_data/components/output_metrics.yaml
+++ b/sdk/python/test_data/components/output_metrics.yaml
@@ -27,7 +27,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -35,7 +35,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -77,4 +77,4 @@ root:
           schemaTitle: system.Metrics
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/components/preprocess.yaml b/sdk/python/test_data/components/preprocess.yaml
index 05fff3f4cfb..03c46dbdacc 100644
--- a/sdk/python/test_data/components/preprocess.yaml
+++ b/sdk/python/test_data/components/preprocess.yaml
@@ -56,7 +56,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.16'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -64,7 +64,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -171,4 +171,4 @@ root:
       output_parameter_path:
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.16
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/component_with_optional_inputs.yaml b/sdk/python/test_data/pipelines/component_with_optional_inputs.yaml
index aa8dd25973b..f53f6ae05dd 100644
--- a/sdk/python/test_data/pipelines/component_with_optional_inputs.yaml
+++ b/sdk/python/test_data/pipelines/component_with_optional_inputs.yaml
@@ -29,7 +29,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -37,7 +37,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -68,4 +68,4 @@ root:
         taskInfo:
           name: component-op
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/component_with_pip_index_urls.yaml b/sdk/python/test_data/pipelines/component_with_pip_index_urls.yaml
index e8611f47123..59ebc83433e 100644
--- a/sdk/python/test_data/pipelines/component_with_pip_index_urls.yaml
+++ b/sdk/python/test_data/pipelines/component_with_pip_index_urls.yaml
@@ -19,14 +19,14 @@ deploymentSpec:
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
           \ python3 -m pip install --quiet     --no-warn-script-location --index-url\
           \ https://pypi.org/simple --trusted-host https://pypi.org/simple 'yapf'\
-          \ 'kfp==2.0.0-rc.2' && \"$0\" \"$@\"\n"
+          \ 'kfp==2.0.1' && \"$0\" \"$@\"\n"
         - sh
         - -ec
         - 'program_path=$(mktemp -d)
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -45,4 +45,4 @@ root:
         taskInfo:
           name: component-op
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/components_with_optional_artifacts.yaml b/sdk/python/test_data/pipelines/components_with_optional_artifacts.yaml
index 6294901944c..5bcf95a08e0 100644
--- a/sdk/python/test_data/pipelines/components_with_optional_artifacts.yaml
+++ b/sdk/python/test_data/pipelines/components_with_optional_artifacts.yaml
@@ -126,7 +126,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -134,7 +134,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -155,7 +155,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -163,7 +163,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -237,4 +237,4 @@ root:
           schemaVersion: 0.0.1
         isOptional: true
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/lightweight_python_functions_pipeline.yaml b/sdk/python/test_data/pipelines/lightweight_python_functions_pipeline.yaml
index a57f218574d..abc9a2995d2 100644
--- a/sdk/python/test_data/pipelines/lightweight_python_functions_pipeline.yaml
+++ b/sdk/python/test_data/pipelines/lightweight_python_functions_pipeline.yaml
@@ -78,7 +78,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -86,7 +86,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -130,7 +130,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -138,7 +138,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -238,4 +238,4 @@ root:
       message:
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/lightweight_python_functions_with_outputs.yaml b/sdk/python/test_data/pipelines/lightweight_python_functions_with_outputs.yaml
index f933eb76b24..b7525f874ce 100644
--- a/sdk/python/test_data/pipelines/lightweight_python_functions_with_outputs.yaml
+++ b/sdk/python/test_data/pipelines/lightweight_python_functions_with_outputs.yaml
@@ -81,7 +81,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -89,7 +89,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -108,7 +108,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -116,7 +116,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -135,7 +135,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -143,7 +143,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -162,7 +162,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -170,7 +170,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -273,4 +273,4 @@ root:
           schemaTitle: system.Metrics
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_complex.yaml b/sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_complex.yaml
index ede6a1e7dd5..ad5e32ce026 100644
--- a/sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_complex.yaml
+++ b/sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_complex.yaml
@@ -285,7 +285,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -293,7 +293,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -315,7 +315,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -323,7 +323,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -345,7 +345,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -353,7 +353,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -375,7 +375,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -383,7 +383,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -403,7 +403,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -411,7 +411,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -484,4 +484,4 @@ root:
           schemaTitle: system.Dataset
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_simple.yaml b/sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_simple.yaml
index 3526dcfd732..55f5c8ae240 100644
--- a/sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_simple.yaml
+++ b/sdk/python/test_data/pipelines/parallelfor_fan_in/artifacts_simple.yaml
@@ -90,7 +90,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -98,7 +98,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -136,7 +136,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -144,7 +144,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -209,4 +209,4 @@ root:
           schemaVersion: 0.0.1
         isArtifactList: true
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/parallelfor_fan_in/conditional_producer_and_consumers.yaml b/sdk/python/test_data/pipelines/parallelfor_fan_in/conditional_producer_and_consumers.yaml
index 7a3cbbf6de6..c2d8aae6204 100644
--- a/sdk/python/test_data/pipelines/parallelfor_fan_in/conditional_producer_and_consumers.yaml
+++ b/sdk/python/test_data/pipelines/parallelfor_fan_in/conditional_producer_and_consumers.yaml
@@ -132,7 +132,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -140,7 +140,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -158,7 +158,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -166,7 +166,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -225,4 +225,4 @@ root:
       Output:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/parallelfor_fan_in/nested_with_parameters.yaml b/sdk/python/test_data/pipelines/parallelfor_fan_in/nested_with_parameters.yaml
index a318183a26e..af4379d5571 100644
--- a/sdk/python/test_data/pipelines/parallelfor_fan_in/nested_with_parameters.yaml
+++ b/sdk/python/test_data/pipelines/parallelfor_fan_in/nested_with_parameters.yaml
@@ -150,7 +150,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -158,12 +158,12 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
-          \ *\n\ndef add(nums: List[int]) -> int:\n    import itertools\n    return\
-          \ sum(itertools.chain(*nums))\n\n"
+          \ *\n\ndef add(nums: List[List[int]]) -> int:\n    import itertools\n  \
+          \  return sum(itertools.chain(*nums))\n\n"
         image: python:3.7
     exec-add-two-nums:
       container:
@@ -177,7 +177,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -185,7 +185,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -203,7 +203,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -211,7 +211,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -229,7 +229,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -237,7 +237,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -283,4 +283,4 @@ root:
       Output:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_complex.yaml b/sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_complex.yaml
index c056ae02bad..b76f1ad5b63 100644
--- a/sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_complex.yaml
+++ b/sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_complex.yaml
@@ -224,7 +224,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -232,7 +232,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -251,7 +251,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -259,7 +259,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -277,7 +277,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -285,7 +285,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -303,7 +303,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -311,7 +311,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -330,7 +330,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -338,7 +338,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -357,7 +357,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -365,7 +365,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -383,7 +383,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -391,7 +391,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -477,4 +477,4 @@ root:
       Output:
         parameterType: NUMBER_INTEGER
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_simple.yaml b/sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_simple.yaml
index f6c8694c0bd..9bc16ff5b2e 100644
--- a/sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_simple.yaml
+++ b/sdk/python/test_data/pipelines/parallelfor_fan_in/parameters_simple.yaml
@@ -75,7 +75,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -83,7 +83,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -111,7 +111,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -119,7 +119,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -180,4 +180,4 @@ root:
       Output:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/parallelfor_fan_in/pipeline_producer_consumer.yaml b/sdk/python/test_data/pipelines/parallelfor_fan_in/pipeline_producer_consumer.yaml
index 1afb9904a02..18fc3aa052c 100644
--- a/sdk/python/test_data/pipelines/parallelfor_fan_in/pipeline_producer_consumer.yaml
+++ b/sdk/python/test_data/pipelines/parallelfor_fan_in/pipeline_producer_consumer.yaml
@@ -206,7 +206,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -214,7 +214,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -233,7 +233,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -241,7 +241,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -259,7 +259,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -267,7 +267,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -286,7 +286,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-beta.14'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -294,7 +294,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -356,4 +356,4 @@ root:
       Output:
         parameterType: NUMBER_INTEGER
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-beta.14
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_as_exit_task.yaml b/sdk/python/test_data/pipelines/pipeline_as_exit_task.yaml
index 15e7fa8601b..42c88e3a683 100644
--- a/sdk/python/test_data/pipelines/pipeline_as_exit_task.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_as_exit_task.yaml
@@ -129,7 +129,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -137,7 +137,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -156,7 +156,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -164,7 +164,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -183,7 +183,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -191,7 +191,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -210,7 +210,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -218,7 +218,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -262,4 +262,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_in_pipeline.yaml b/sdk/python/test_data/pipelines/pipeline_in_pipeline.yaml
index c899cb25c1e..9c8f5e09933 100644
--- a/sdk/python/test_data/pipelines/pipeline_in_pipeline.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_in_pipeline.yaml
@@ -74,7 +74,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -82,7 +82,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -101,7 +101,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -109,7 +109,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -152,4 +152,4 @@ root:
         taskInfo:
           name: print-op1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_in_pipeline_complex.yaml b/sdk/python/test_data/pipelines/pipeline_in_pipeline_complex.yaml
index b52048b78d7..63ce9aceb0c 100644
--- a/sdk/python/test_data/pipelines/pipeline_in_pipeline_complex.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_in_pipeline_complex.yaml
@@ -161,7 +161,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -169,7 +169,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -188,7 +188,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -196,7 +196,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -241,4 +241,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_in_pipeline_loaded_from_yaml.yaml b/sdk/python/test_data/pipelines/pipeline_in_pipeline_loaded_from_yaml.yaml
index b90af91c221..ab7d67cac77 100644
--- a/sdk/python/test_data/pipelines/pipeline_in_pipeline_loaded_from_yaml.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_in_pipeline_loaded_from_yaml.yaml
@@ -152,7 +152,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.1'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -160,7 +160,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -179,7 +179,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.1'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -187,7 +187,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -206,7 +206,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -214,7 +214,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -264,4 +264,4 @@ root:
         taskInfo:
           name: print-op1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_condition.yaml b/sdk/python/test_data/pipelines/pipeline_with_condition.yaml
index 436a60bf0dc..5eed3984a52 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_condition.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_condition.yaml
@@ -88,7 +88,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -96,7 +96,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -116,7 +116,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -124,7 +124,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -144,7 +144,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -152,7 +152,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -171,7 +171,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -179,7 +179,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -198,7 +198,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -206,7 +206,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -264,4 +264,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_dynamic_importer_metadata.yaml b/sdk/python/test_data/pipelines/pipeline_with_dynamic_importer_metadata.yaml
index 29753c24ec2..6443b139099 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_dynamic_importer_metadata.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_dynamic_importer_metadata.yaml
@@ -94,7 +94,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -102,7 +102,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -181,4 +181,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_env.yaml b/sdk/python/test_data/pipelines/pipeline_with_env.yaml
index 8e9f5d74e9c..789a1e975d4 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_env.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_env.yaml
@@ -41,7 +41,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -49,7 +49,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -79,4 +79,4 @@ root:
         taskInfo:
           name: print-env-op
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_exit_handler.yaml b/sdk/python/test_data/pipelines/pipeline_with_exit_handler.yaml
index 60f7602c31c..b1c6091fe2d 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_exit_handler.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_exit_handler.yaml
@@ -65,7 +65,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -73,7 +73,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -92,7 +92,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -100,7 +100,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -119,7 +119,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -127,7 +127,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -171,4 +171,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_google_artifact_type.yaml b/sdk/python/test_data/pipelines/pipeline_with_google_artifact_type.yaml
index 646b956e21d..6753ae29a02 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_google_artifact_type.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_google_artifact_type.yaml
@@ -57,14 +57,14 @@ deploymentSpec:
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
           \ python3 -m pip install --quiet     --no-warn-script-location 'aiplatform'\
-          \ 'kfp==2.0.0-rc.2' 'kfp==2.0.0-rc.2' && \"$0\" \"$@\"\n"
+          \ 'kfp==2.0.1' 'kfp==2.0.1' && \"$0\" \"$@\"\n"
         - sh
         - -ec
         - 'program_path=$(mktemp -d)
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -90,14 +90,14 @@ deploymentSpec:
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
           \ python3 -m pip install --quiet     --no-warn-script-location 'aiplatform'\
-          \ 'kfp==2.0.0-rc.2' && \"$0\" \"$@\"\n"
+          \ 'kfp==2.0.1' && \"$0\" \"$@\"\n"
         - sh
         - -ec
         - 'program_path=$(mktemp -d)
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -150,4 +150,4 @@ root:
         taskInfo:
           name: model-producer
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_importer.yaml b/sdk/python/test_data/pipelines/pipeline_with_importer.yaml
index b9ff81a39d8..a7678237f61 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_importer.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_importer.yaml
@@ -127,7 +127,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -135,7 +135,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -159,7 +159,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -167,7 +167,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -235,4 +235,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_loops.yaml b/sdk/python/test_data/pipelines/pipeline_with_loops.yaml
index 37bf1b95474..13999d852c6 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_loops.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_loops.yaml
@@ -171,7 +171,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -179,7 +179,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -198,7 +198,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -206,7 +206,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -224,7 +224,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -232,7 +232,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -250,7 +250,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -258,7 +258,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -276,7 +276,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -284,7 +284,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -302,7 +302,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -310,7 +310,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -328,7 +328,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -336,7 +336,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -354,7 +354,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -362,7 +362,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -424,4 +424,4 @@ root:
       loop_parameter:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_loops_and_conditions.yaml b/sdk/python/test_data/pipelines/pipeline_with_loops_and_conditions.yaml
index fc214ebafe7..fbf6dd967bc 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_loops_and_conditions.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_loops_and_conditions.yaml
@@ -602,7 +602,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -610,7 +610,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -631,7 +631,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -639,7 +639,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -660,7 +660,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -668,7 +668,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -688,7 +688,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -696,7 +696,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -714,7 +714,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -722,7 +722,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -741,7 +741,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -749,7 +749,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -768,7 +768,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -776,7 +776,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -795,7 +795,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -803,7 +803,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -822,7 +822,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -830,7 +830,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -849,7 +849,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -857,7 +857,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -876,7 +876,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -884,7 +884,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -903,7 +903,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -911,7 +911,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -930,7 +930,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -938,7 +938,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -1022,4 +1022,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_metadata_fields.yaml b/sdk/python/test_data/pipelines/pipeline_with_metadata_fields.yaml
index 5f0da89e466..1aa009e3445 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_metadata_fields.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_metadata_fields.yaml
@@ -60,7 +60,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -68,7 +68,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -95,7 +95,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -103,7 +103,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -172,4 +172,4 @@ root:
           schemaVersion: 0.0.1
         description: The final concatenated dataset.
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_metrics_outputs.yaml b/sdk/python/test_data/pipelines/pipeline_with_metrics_outputs.yaml
index 355a257b525..d2091815bf8 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_metrics_outputs.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_metrics_outputs.yaml
@@ -60,7 +60,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -68,7 +68,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -89,7 +89,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -97,7 +97,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -148,4 +148,4 @@ root:
           schemaTitle: system.Metrics
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_multiple_exit_handlers.yaml b/sdk/python/test_data/pipelines/pipeline_with_multiple_exit_handlers.yaml
index db39ef1192f..3bbec7526c0 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_multiple_exit_handlers.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_multiple_exit_handlers.yaml
@@ -125,7 +125,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -133,7 +133,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -152,7 +152,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -160,7 +160,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -179,7 +179,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -187,7 +187,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -206,7 +206,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -214,7 +214,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -233,7 +233,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -241,7 +241,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -260,7 +260,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -268,7 +268,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -287,7 +287,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -295,7 +295,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -389,4 +389,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_nested_conditions.yaml b/sdk/python/test_data/pipelines/pipeline_with_nested_conditions.yaml
index 2ffa5012bbf..e81a3035317 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_nested_conditions.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_nested_conditions.yaml
@@ -147,7 +147,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -155,7 +155,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -175,7 +175,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -183,7 +183,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -203,7 +203,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -211,7 +211,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -231,7 +231,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -239,7 +239,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -259,7 +259,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -267,7 +267,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -286,7 +286,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -294,7 +294,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -313,7 +313,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -321,7 +321,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -340,7 +340,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -348,7 +348,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -426,4 +426,4 @@ root:
         taskInfo:
           name: print-op-2
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_nested_loops.yaml b/sdk/python/test_data/pipelines/pipeline_with_nested_loops.yaml
index f062c20860b..9b601893edb 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_nested_loops.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_nested_loops.yaml
@@ -145,7 +145,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -153,7 +153,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -172,7 +172,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -180,7 +180,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -199,7 +199,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -207,7 +207,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -256,4 +256,4 @@ root:
         isOptional: true
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_outputs.yaml b/sdk/python/test_data/pipelines/pipeline_with_outputs.yaml
index b5f0cbb1c94..1cba4dd0a2f 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_outputs.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_outputs.yaml
@@ -104,7 +104,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -112,7 +112,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -131,7 +131,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -139,7 +139,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -203,4 +203,4 @@ root:
           schemaTitle: system.Artifact
           schemaVersion: 0.0.1
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_parallelfor_parallelism.yaml b/sdk/python/test_data/pipelines/pipeline_with_parallelfor_parallelism.yaml
index 48acb3b4ef0..f1f3a5fa230 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_parallelfor_parallelism.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_parallelfor_parallelism.yaml
@@ -179,7 +179,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -187,7 +187,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -205,7 +205,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -213,7 +213,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -231,7 +231,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -239,7 +239,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -257,7 +257,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -265,7 +265,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -283,7 +283,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -291,7 +291,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -309,7 +309,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -317,7 +317,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -357,4 +357,4 @@ root:
       loop_parameter:
         parameterType: LIST
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_params_containing_format.yaml b/sdk/python/test_data/pipelines/pipeline_with_params_containing_format.yaml
index 3445124b9c1..6f31bc7deb2 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_params_containing_format.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_params_containing_format.yaml
@@ -74,7 +74,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -82,7 +82,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -101,7 +101,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -109,7 +109,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -128,7 +128,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -136,7 +136,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -201,4 +201,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_placeholders.yaml b/sdk/python/test_data/pipelines/pipeline_with_placeholders.yaml
index 95418243129..5a313c4ed47 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_placeholders.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_placeholders.yaml
@@ -55,7 +55,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -63,7 +63,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -81,7 +81,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -89,7 +89,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -107,7 +107,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -115,7 +115,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -133,7 +133,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -141,7 +141,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -159,7 +159,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -167,7 +167,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -254,4 +254,4 @@ root:
         taskInfo:
           name: print-op-5
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_retry.yaml b/sdk/python/test_data/pipelines/pipeline_with_retry.yaml
index bfff3d14c65..34c474435bc 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_retry.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_retry.yaml
@@ -30,7 +30,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -38,7 +38,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -78,4 +78,4 @@ root:
         isOptional: true
         parameterType: NUMBER_DOUBLE
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_task_final_status.yaml b/sdk/python/test_data/pipelines/pipeline_with_task_final_status.yaml
index 729de262d83..e53e19ac604 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_task_final_status.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_task_final_status.yaml
@@ -68,7 +68,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -76,7 +76,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -99,7 +99,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -107,7 +107,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -126,7 +126,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -134,7 +134,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -180,4 +180,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1
diff --git a/sdk/python/test_data/pipelines/pipeline_with_task_using_ignore_upstream_failure.yaml b/sdk/python/test_data/pipelines/pipeline_with_task_using_ignore_upstream_failure.yaml
index cba9c92beb4..385cb4a1d45 100644
--- a/sdk/python/test_data/pipelines/pipeline_with_task_using_ignore_upstream_failure.yaml
+++ b/sdk/python/test_data/pipelines/pipeline_with_task_using_ignore_upstream_failure.yaml
@@ -35,7 +35,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -43,7 +43,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -62,7 +62,7 @@ deploymentSpec:
         - -c
         - "\nif ! [ -x \"$(command -v pip)\" ]; then\n    python3 -m ensurepip ||\
           \ python3 -m ensurepip --user || apt-get install python3-pip\nfi\n\nPIP_DISABLE_PIP_VERSION_CHECK=1\
-          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.0-rc.2'\
+          \ python3 -m pip install --quiet     --no-warn-script-location 'kfp==2.0.1'\
           \ && \"$0\" \"$@\"\n"
         - sh
         - -ec
@@ -70,7 +70,7 @@ deploymentSpec:
 
           printf "%s" "$0" > "$program_path/ephemeral_component.py"
 
-          python3 -m kfp.components.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
+          python3 -m kfp.dsl.executor_main                         --component_module_path                         "$program_path/ephemeral_component.py"                         "$@"
 
           '
         - "\nimport kfp\nfrom kfp import dsl\nfrom kfp.dsl import *\nfrom typing import\
@@ -117,4 +117,4 @@ root:
         isOptional: true
         parameterType: STRING
 schemaVersion: 2.1.0
-sdkVersion: kfp-2.0.0-rc.2
+sdkVersion: kfp-2.0.1