diff --git a/performance_tests/requirements_mpl.txt b/performance_tests/requirements_mpl.txt
index 28d7dc356..d9744a723 100644
--- a/performance_tests/requirements_mpl.txt
+++ b/performance_tests/requirements_mpl.txt
@@ -1 +1 @@
-aws-cryptographic-material-providers @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
\ No newline at end of file
+aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
\ No newline at end of file
diff --git a/requirements_mpl.txt b/requirements_mpl.txt
index 28d7dc356..5cbdb37a1 100644
--- a/requirements_mpl.txt
+++ b/requirements_mpl.txt
@@ -1 +1 @@
-aws-cryptographic-material-providers @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
\ No newline at end of file
+aws-cryptographic-materialproviders @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python
diff --git a/setup.py b/setup.py
index c069bade1..3af72f984 100644
--- a/setup.py
+++ b/setup.py
@@ -43,9 +43,9 @@ def get_requirements():
     # TODO-MPL: Point at PyPI once MPL is released.
     # This blocks releasing ESDK-Python MPL integration.
     extras_require={
-        "MPL": ["aws-cryptographic-material-providers @" \
+        "MPL": ["aws-cryptographic-materialproviders @" \
                 "git+https://github.com/aws/aws-cryptographic-material-providers-library.git@" \
-                "lucmcdon/python-mpl-v2#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"],
+                "python-with-dafny-code#subdirectory=AwsCryptographicMaterialProviders/runtimes/python"],
     },
     classifiers=[
         "Development Status :: 5 - Production/Stable",
diff --git a/test_vector_handlers/requirements_mpl.txt b/test_vector_handlers/requirements_mpl.txt
index 1aab5f534..6cffc62e6 100644
--- a/test_vector_handlers/requirements_mpl.txt
+++ b/test_vector_handlers/requirements_mpl.txt
@@ -1 +1 @@
-amazon-cryptographic-material-providers-test-vectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@lucmcdon/python-mpl-v2#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python
\ No newline at end of file
+aws-cryptography-internal-mpl-testvectors @ git+https://github.com/aws/aws-cryptographic-material-providers-library.git@python-with-dafny-code#subdirectory=TestVectorsAwsCryptographicMaterialProviders/runtimes/python
\ No newline at end of file
diff --git a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py
index 305459026..90581182c 100644
--- a/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py
+++ b/test_vector_handlers/src/awses_test_vectors/internal/mpl/keyvectors_provider.py
@@ -1,11 +1,11 @@
 """Singleton provider for the KeyVectors client."""
 # # Ignore missing MPL TestVectors for pylint, but the MPL TestVectors is required for this file
 # pylint: disable=import-error
-from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\
+from aws_cryptography_materialproviders_test_vectors.smithygenerated.\
     aws_cryptography_materialproviderstestvectorkeys.client import (
         KeyVectors,
     )
-from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\
+from aws_cryptography_materialproviders_test_vectors.smithygenerated.\
     aws_cryptography_materialproviderstestvectorkeys.config import (
         KeyVectorsConfig
     )
diff --git a/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py b/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py
index dbabeb3c7..f2ea05559 100644
--- a/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py
+++ b/test_vector_handlers/src/awses_test_vectors/manifests/mpl_keyring.py
@@ -19,7 +19,7 @@
 
 # Ignore missing MPL for pylint, but the MPL is required for this example
 # noqa pylint: disable=import-error
-from aws_cryptography_materialproviderstestvectorkeys.smithygenerated.\
+from aws_cryptography_materialproviders_test_vectors.smithygenerated.\
     aws_cryptography_materialproviderstestvectorkeys.models import (
         GetKeyDescriptionInput,
         GetKeyDescriptionOutput,
@@ -31,7 +31,7 @@
 from aws_cryptographic_materialproviders.mpl.models import CreateMultiKeyringInput
 
 import _dafny
-from standard_library.internaldafny.generated import UTF8
+from smithy_dafny_standard_library.internaldafny.generated import UTF8
 
 # Ignore pylint not being able to read a module that requires the MPL
 # pylint: disable=no-name-in-module