diff --git a/Dockerfile b/Dockerfile
index 394385c6e..17a910ad0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,9 +47,9 @@ RUN apt-get install -y -q \
 RUN apt-get install -y -q \
     python3-sawtooth-signing
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
 
-WORKDIR /project/sawtooth-core
+WORKDIR /project/sawtooth-sdk-python
 
 CMD echo "\033[0;32m--- Building python sdk ---\n\033[0m" \
  && bin/protogen \
diff --git a/Jenkinsfile b/Jenkinsfile
index e6e6b2ad8..0b3c48698 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -82,7 +82,7 @@ node ('master') {
             }
 
             stage("Run Bandit") {
-                sh 'docker run --rm -v $(pwd):/project/sawtooth-core bandit:$ISOLATION_ID run_bandit'
+                sh 'docker run --rm -v $(pwd):/project/sawtooth-sdk-python bandit:$ISOLATION_ID run_bandit'
             }
 
             // Run the tests
@@ -91,7 +91,7 @@ node ('master') {
             }
 
             stage("Compile coverage report") {
-                sh 'docker run --rm -v $(pwd):/project/sawtooth-core integration-tests:$ISOLATION_ID /bin/bash -c "cd coverage && coverage combine && coverage html -d html"'
+                sh 'docker run --rm -v $(pwd):/project/sawtooth-sdk-python integration-tests:$ISOLATION_ID /bin/bash -c "cd coverage && coverage combine && coverage html -d html"'
             }
 
             stage("Create git archive") {
@@ -105,7 +105,7 @@ node ('master') {
 
             stage ("Build documentation") {
                 sh 'docker build . -f ci/sawtooth-build-docs -t sawtooth-build-docs:$ISOLATION_ID'
-                sh 'docker run --rm -v $(pwd):/project/sawtooth-core sawtooth-build-docs:$ISOLATION_ID'
+                sh 'docker run --rm -v $(pwd):/project/sawtooth-sdk-python sawtooth-build-docs:$ISOLATION_ID'
             }
 
             stage("Archive Build artifacts") {
diff --git a/bin/run_bandit b/bin/run_bandit
index d3079cf0c..eb9586b77 100755
--- a/bin/run_bandit
+++ b/bin/run_bandit
@@ -41,4 +41,4 @@ done
 bandit -ll -r --ignore-nosec $top_dir \
     --exclude $ignore \
     -f html \
-    -o /project/sawtooth-core/build/bandit.html
+    -o /project/sawtooth-sdk-python/build/bandit.html
diff --git a/bin/run_docker_test b/bin/run_docker_test
index 9aeaf6cdb..285cec2d6 100755
--- a/bin/run_docker_test
+++ b/bin/run_docker_test
@@ -438,12 +438,12 @@ def _get_isolation_id():
 
 def _setup_environ(isolation_id):
     os.environ['ISOLATION_ID'] = isolation_id
-    os.environ['SAWTOOTH_CORE'] = os.path.dirname(
+    os.environ['SAWTOOTH_SDK_PYTHON'] = os.path.dirname(
         os.path.dirname(
             os.path.realpath(__file__)
         )
     )
-    print(os.environ['SAWTOOTH_CORE'])
+    print(os.environ['SAWTOOTH_SDK_PYTHON'])
 
 
 def _get_compose_dir():
diff --git a/bin/run_tests b/bin/run_tests
index e7e84d435..31a9d7270 100755
--- a/bin/run_tests
+++ b/bin/run_tests
@@ -38,7 +38,7 @@ usage() {
 
 # Exit on non-zero exit code from subcommand
 set -e
-# Set sawtooth-core project directory relative to this file
+# Set sawtooth-sdk-python project directory relative to this file
 PROJECT_DIR=$(cd $(dirname $(dirname $0)) && pwd)
 
 # Make sawtooth scripts accessible
diff --git a/ci/nightly/sawtooth-intkey-tp-python b/ci/nightly/sawtooth-intkey-tp-python
index b0ed7cb96..13e68859f 100644
--- a/ci/nightly/sawtooth-intkey-tp-python
+++ b/ci/nightly/sawtooth-intkey-tp-python
@@ -18,11 +18,11 @@
 #   the nightly Sawtooth Package Repository.
 #
 # Build:
-#   $ cd sawtooth-core/ci/nightly
+#   $ cd sawtooth-sdk-python/ci/nightly
 #   $ docker build . -f sawtooth-intkey-tp-python -t sawtooth-intkey-tp-python
 #
 # Run:
-#   $ cd sawtooth-core
+#   $ cd sawtooth-sdk-python
 #   $ docker run sawtooth-intkey-tp-python
 
 FROM ubuntu:bionic
diff --git a/ci/nightly/sawtooth-xo-tp-python b/ci/nightly/sawtooth-xo-tp-python
index fa11f0371..0c973d03d 100644
--- a/ci/nightly/sawtooth-xo-tp-python
+++ b/ci/nightly/sawtooth-xo-tp-python
@@ -18,11 +18,11 @@
 #   the nightly Sawtooth Package Repository.
 #
 # Build:
-#   $ cd sawtooth-core/ci/nightly
+#   $ cd sawtooth-sdk-python/ci/nightly
 #   $ docker build . -f sawtooth-xo-tp-python -t sawtooth-xo-tp-python
 #
 # Run:
-#   $ cd sawtooth-core
+#   $ cd sawtooth-sdk-python
 #   $ docker run sawtooth-xo-tp-python
 
 FROM ubuntu:bionic
diff --git a/ci/sawtooth-build-docs b/ci/sawtooth-build-docs
index 4440d75b6..b0475dc22 100644
--- a/ci/sawtooth-build-docs
+++ b/ci/sawtooth-build-docs
@@ -16,15 +16,15 @@
 # Description:
 #   Builds the environment needed to build the Sawtooth docs
 #   Running the image will put the Sawtooth docs in
-#   sawtooth-core/docs/build on your local machine.
+#   sawtooth-sdk-python/docs/build on your local machine.
 #
 # Build:
-#   $ cd sawtooth-core
+#   $ cd sawtooth-sdk-python
 #   $ docker build . -f ci/sawtooth-build-docs -t sawtooth-build-docs
 #
 # Run:
-#   $ cd sawtooth-core
-#   $ docker run -v $(pwd):/project/sawtooth-core sawtooth-build-docs
+#   $ cd sawtooth-sdk-python
+#   $ docker run -v $(pwd):/project/sawtooth-sdk-python sawtooth-build-docs
 
 FROM ubuntu:bionic
 
@@ -102,5 +102,5 @@ RUN apt-get update && apt-get install -y -q \
     sphinxcontrib-openapi \
     sphinx_rtd_theme
 
-WORKDIR /project/sawtooth-core/docs
+WORKDIR /project/sawtooth-sdk-python/docs
 CMD make python
diff --git a/ci/sawtooth-intkey-tp-python b/ci/sawtooth-intkey-tp-python
index 9718cba36..6a8452321 100644
--- a/ci/sawtooth-intkey-tp-python
+++ b/ci/sawtooth-intkey-tp-python
@@ -18,11 +18,11 @@
 #   the Sawtooth Package Repository.
 #
 # Build:
-#   $ cd sawtooth-core/docker
+#   $ cd sawtooth-sdk-python/docker
 #   $ docker build . -f sawtooth-intkey-tp-python -t sawtooth-intkey-tp-python
 #
 # Run:
-#   $ cd sawtooth-core
+#   $ cd sawtooth-sdk-python
 #   $ docker run sawtooth-intkey-tp-python
 
 FROM ubuntu:bionic
diff --git a/ci/sawtooth-publish-python-sdk b/ci/sawtooth-publish-python-sdk
index 4066ac9bb..3e6a95893 100644
--- a/ci/sawtooth-publish-python-sdk
+++ b/ci/sawtooth-publish-python-sdk
@@ -42,7 +42,7 @@ password=@PASS@\n\
 
 CMD sed -i'' -e "s/@USER@/$PYPI_USER/g" /root/.pypirc \
  && sed -i'' -e "s/@PASS@/$PYPI_PASS/g" /root/.pypirc \
- && cd /project/sawtooth-core/ \
+ && cd /project/sawtooth-sdk-python/ \
  && python3 setup.py sdist upload -r pypi \
- && cd /project/sawtooth-core/signing \
+ && cd /project/sawtooth-sdk-python/signing \
  && python3 setup.py sdist upload -r pypi
diff --git a/ci/sawtooth-xo-tp-python b/ci/sawtooth-xo-tp-python
index c7784ad6b..49acd362f 100644
--- a/ci/sawtooth-xo-tp-python
+++ b/ci/sawtooth-xo-tp-python
@@ -18,11 +18,11 @@
 #   the Sawtooth Package Repository.
 #
 # Build:
-#   $ cd sawtooth-core/docker
+#   $ cd sawtooth-sdk-python/docker
 #   $ docker build . -f sawtooth-xo-tp-python -t sawtooth-xo-tp-python
 #
 # Run:
-#   $ cd sawtooth-core
+#   $ cd sawtooth-sdk-python
 #   $ docker run sawtooth-xo-tp-python
 
 FROM ubuntu:bionic
diff --git a/docker-compose.yaml b/docker-compose.yaml
index a389522c2..d0478e93c 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -37,7 +37,7 @@ services:
         - no_proxy
     image: intkey-tp-python-local:${ISOLATION_ID}
     volumes:
-      - ./:/project/sawtooth-core
+      - ./:/project/sawtooth-sdk-python
     container_name: intkey-tp-python-local
     depends_on:
       - validator
@@ -62,7 +62,7 @@ services:
         - no_proxy
     image: xo-tp-python-local:${ISOLATION_ID}
     volumes:
-      - ./:/project/sawtooth-core
+      - ./:/project/sawtooth-sdk-python
     container_name: xo-tp-python-local
     depends_on:
       - validator
diff --git a/docker/bandit b/docker/bandit
index 8f2422caf..7ecdd078e 100644
--- a/docker/bandit
+++ b/docker/bandit
@@ -29,4 +29,4 @@ RUN apt-get install -y -q \
     bandit \
     coverage --upgrade
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
diff --git a/docker/compose/run-lint.yaml b/docker/compose/run-lint.yaml
index d3f943979..6b9c22325 100644
--- a/docker/compose/run-lint.yaml
+++ b/docker/compose/run-lint.yaml
@@ -27,5 +27,5 @@ services:
         - no_proxy
     image: lint:${ISOLATION_ID}
     volumes:
-      - ../../:/project/sawtooth-core
+      - ../../:/project/sawtooth-sdk-python
     command: run_lint
diff --git a/docker/compose/sawtooth-build.yaml b/docker/compose/sawtooth-build.yaml
index 157a49d54..133c48861 100644
--- a/docker/compose/sawtooth-build.yaml
+++ b/docker/compose/sawtooth-build.yaml
@@ -26,7 +26,7 @@ services:
         - no_proxy
     image: sawtooth-signing-local:${ISOLATION_ID}
     volumes:
-      - ../../:/project/sawtooth-core
+      - ../../:/project/sawtooth-sdk-python
 
   python-sdk:
     build:
@@ -38,4 +38,4 @@ services:
         - no_proxy
     image: sawtooth-python-sdk-local:${ISOLATION_ID}
     volumes:
-      - ../../:/project/sawtooth-core
+      - ../../:/project/sawtooth-sdk-python
diff --git a/docker/lint b/docker/lint
index 8c119046e..27cd254d3 100644
--- a/docker/lint
+++ b/docker/lint
@@ -56,7 +56,7 @@ RUN apt-get install -y -q \
     openssl \
     python3-grpcio-tools
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
 
 RUN apt-get install -y -q \
     build-essential \
@@ -69,4 +69,4 @@ RUN apt-get install -y -q \
     python3-grpcio-tools \
     unzip
 
-WORKDIR /project/sawtooth-core
+WORKDIR /project/sawtooth-sdk-python
diff --git a/examples/intkey_python/Dockerfile b/examples/intkey_python/Dockerfile
index 61b4269e6..c5e318e46 100644
--- a/examples/intkey_python/Dockerfile
+++ b/examples/intkey_python/Dockerfile
@@ -48,9 +48,9 @@ RUN apt-get install -y -q \
 
 RUN mkdir -p /var/log/sawtooth
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
 
-WORKDIR /project/sawtooth-core
+WORKDIR /project/sawtooth-sdk-python
 
 CMD echo "\033[0;32m--- Building intkey-tp-python ---\n\033[0m" \
  && bin/protogen \
diff --git a/examples/intkey_python/setup.py b/examples/intkey_python/setup.py
index 6d3df6650..4c3869dbb 100644
--- a/examples/intkey_python/setup.py
+++ b/examples/intkey_python/setup.py
@@ -38,7 +38,7 @@
         ['../../bin/get_version']).decode('utf-8').strip(),
     description='Sawtooth Intkey Python Example',
     author='Hyperledger Sawtooth',
-    url='https://github.com/hyperledger/sawtooth-core',
+    url='https://github.com/hyperledger/sawtooth-sdk-python',
     packages=find_packages(),
     install_requires=[
         "cbor",
diff --git a/examples/intkey_python/setup_tests.py b/examples/intkey_python/setup_tests.py
index 4acf7b1db..9484ac906 100644
--- a/examples/intkey_python/setup_tests.py
+++ b/examples/intkey_python/setup_tests.py
@@ -32,7 +32,7 @@
         ['../../bin/get_version']).decode('utf-8').strip(),
     description='Sawtooth Intkey Python Test',
     author='Hyperledger Sawtooth',
-    url='https://github.com/hyperledger/sawtooth-core',
+    url='https://github.com/hyperledger/sawtooth-sdk-python',
     packages=find_packages(),
     install_requires=[
         "cbor",
diff --git a/examples/intkey_python/tests/test_tp_intkey_python.yaml b/examples/intkey_python/tests/test_tp_intkey_python.yaml
index 78f2ff863..42b0df9ce 100644
--- a/examples/intkey_python/tests/test_tp_intkey_python.yaml
+++ b/examples/intkey_python/tests/test_tp_intkey_python.yaml
@@ -27,7 +27,7 @@ services:
         - no_proxy
     image: sawtooth-intkey-tp-python$INSTALL_TYPE:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     command: intkey-tp-python -vv -C tcp://test-tp-intkey-python:4004
@@ -43,18 +43,18 @@ services:
         - no_proxy
     image: python-sdk-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     command: nose2-3
-        -c /project/sawtooth-core/examples/intkey_python/nose2.cfg
+        -c /project/sawtooth-sdk-python/examples/intkey_python/nose2.cfg
         -v
-        -s /project/sawtooth-core/examples/intkey_python/tests
+        -s /project/sawtooth-sdk-python/examples/intkey_python/tests
         test_tp_intkey
     stop_signal: SIGKILL
     environment:
       TEST_BIND: "tcp://eth0:4004"
-      PYTHONPATH: "/project/sawtooth-core/:\
-        /project/sawtooth-core/examples/intkey_python:\
-        /project/sawtooth-core/tests
-        /project/sawtooth-core/signing"
+      PYTHONPATH: "/project/sawtooth-sdk-python/:\
+        /project/sawtooth-sdk-python/examples/intkey_python:\
+        /project/sawtooth-sdk-python/tests:\
+        /project/sawtooth-sdk-python/signing"
diff --git a/examples/xo_python/Dockerfile b/examples/xo_python/Dockerfile
index ebed9af42..151333c75 100644
--- a/examples/xo_python/Dockerfile
+++ b/examples/xo_python/Dockerfile
@@ -48,9 +48,9 @@ RUN apt-get install -y -q \
 
 RUN mkdir -p /var/log/sawtooth
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
 
-WORKDIR /project/sawtooth-core
+WORKDIR /project/sawtooth-sdk-python
 
 CMD echo "\033[0;32m--- Building xo-tp-python ---\n\033[0m" \
  && bin/protogen \
diff --git a/examples/xo_python/setup.py b/examples/xo_python/setup.py
index 1b69ff990..66c30cd64 100644
--- a/examples/xo_python/setup.py
+++ b/examples/xo_python/setup.py
@@ -40,7 +40,7 @@
         ['../../bin/get_version']).decode('utf-8').strip(),
     description='Sawtooth XO Example',
     author='Hyperledger Sawtooth',
-    url='https://github.com/hyperledger/sawtooth-core',
+    url='https://github.com/hyperledger/sawtooth-sdk-python',
     packages=find_packages(),
     install_requires=[
         'aiohttp',
diff --git a/examples/xo_python/setup_tests.py b/examples/xo_python/setup_tests.py
index d711a9119..2ff79a1da 100644
--- a/examples/xo_python/setup_tests.py
+++ b/examples/xo_python/setup_tests.py
@@ -32,7 +32,7 @@
         ['../../bin/get_version']).decode('utf-8').strip(),
     description='Sawtooth XO Python Test',
     author='Hyperledger Sawtooth',
-    url='https://github.com/hyperledger/sawtooth-core',
+    url='https://github.com/hyperledger/sawtooth-sdk-python',
     packages=find_packages(),
     install_requires=[
         'aiohttp',
diff --git a/examples/xo_python/tests/test_tp_xo_python.yaml b/examples/xo_python/tests/test_tp_xo_python.yaml
index b8ac875fb..7c5b538f2 100644
--- a/examples/xo_python/tests/test_tp_xo_python.yaml
+++ b/examples/xo_python/tests/test_tp_xo_python.yaml
@@ -27,7 +27,7 @@ services:
         - no_proxy
     image: sawtooth-xo-tp-python$INSTALL_TYPE:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     command: xo-tp-python -vv -C tcp://test-tp-xo-python:4004
@@ -43,17 +43,17 @@ services:
         - no_proxy
     image: python-sdk-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     command: nose2-3
-        -c /project/sawtooth-core/examples/xo_python/nose2.cfg
+        -c /project/sawtooth-sdk-python/examples/xo_python/nose2.cfg
         -v
-        -s /project/sawtooth-core/examples/xo_python/tests
+        -s /project/sawtooth-sdk-python/examples/xo_python/tests
         test_tp_xo
     stop_signal: SIGKILL
     environment:
       TEST_BIND: "tcp://eth0:4004"
       PYTHONPATH: "\
-        /project/sawtooth-core/:\
-        /project/sawtooth-core/examples/xo_python"
+        /project/sawtooth-sdk-python/:\
+        /project/sawtooth-sdk-python/examples/xo_python"
diff --git a/setup.py b/setup.py
index d06ac6a80..31b70b60d 100644
--- a/setup.py
+++ b/setup.py
@@ -43,7 +43,7 @@
         ['./bin/get_version']).decode('utf-8').strip(),
     description='Sawtooth Python SDK',
     author='Hyperledger Sawtooth',
-    url='https://github.com/hyperledger/sawtooth-core',
+    url='https://github.com/hyperledger/sawtooth-sdk-python',
     packages=find_packages(),
     data_files=data_files,
     install_requires=[
diff --git a/signing/Dockerfile b/signing/Dockerfile
index 541aa4afe..fe47099e5 100644
--- a/signing/Dockerfile
+++ b/signing/Dockerfile
@@ -39,9 +39,9 @@ RUN apt-get install -y -q \
 RUN apt-get install -y -q \
     python3-secp256k1
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
 
-WORKDIR /project/sawtooth-core
+WORKDIR /project/sawtooth-sdk-python
 
 CMD echo "\033[0;32m--- Building signing ---\n\033[0m" \
  && bin/protogen \
diff --git a/signing/setup.py b/signing/setup.py
index b7cd5f971..1d3ef23cb 100644
--- a/signing/setup.py
+++ b/signing/setup.py
@@ -24,7 +24,7 @@
         ['../bin/get_version']).decode('utf-8').strip(),
     description='Sawtooth Signing Library',
     author='Hyperledger Sawtooth',
-    url='https://github.com/hyperledger/sawtooth-core',
+    url='https://github.com/hyperledger/sawtooth-sdk-python',
     packages=find_packages(),
     install_requires=[
         "secp256k1",
diff --git a/signing/tests/signing-tests.dockerfile b/signing/tests/signing-tests.dockerfile
index 6caa89447..c7202789e 100644
--- a/signing/tests/signing-tests.dockerfile
+++ b/signing/tests/signing-tests.dockerfile
@@ -42,6 +42,6 @@ RUN apt-get install -y -q \
 RUN pip3 install \
     coverage --upgrade
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
 
-WORKDIR /project/sawtooth-core
+WORKDIR /project/sawtooth-sdk-python
diff --git a/signing/tests/unit_signing.yaml b/signing/tests/unit_signing.yaml
index af4112ba3..ed8046822 100644
--- a/signing/tests/unit_signing.yaml
+++ b/signing/tests/unit_signing.yaml
@@ -27,12 +27,10 @@ services:
         - no_proxy
     image: signing-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     command: nose2-3
-        -c /project/sawtooth-core/signing/nose2.cfg
+        -c /project/sawtooth-sdk-python/signing/nose2.cfg
         -v
-        -s /project/sawtooth-core/signing
+        -s /project/sawtooth-sdk-python/signing
     environment:
-        PYTHONPATH: "\
-          /project/sawtooth-core/signing:\
-          "
+        PYTHONPATH: "/project/sawtooth-sdk-python/signing"
diff --git a/tests/python-sdk-tests.dockerfile b/tests/python-sdk-tests.dockerfile
index d3e5dccdd..b4a2fe22e 100644
--- a/tests/python-sdk-tests.dockerfile
+++ b/tests/python-sdk-tests.dockerfile
@@ -54,6 +54,6 @@ RUN pip3 install \
 
 RUN mkdir -p /var/log/sawtooth
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
 
-WORKDIR /project/sawtooth-core
+WORKDIR /project/sawtooth-sdk-python
diff --git a/tests/sawtooth_integration/docker/integration-tests.dockerfile b/tests/sawtooth_integration/docker/integration-tests.dockerfile
index eb0255baf..88735e7bb 100644
--- a/tests/sawtooth_integration/docker/integration-tests.dockerfile
+++ b/tests/sawtooth_integration/docker/integration-tests.dockerfile
@@ -58,6 +58,6 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
 RUN apt-get update && apt-get install -y -q \
     docker-ce
 
-ENV PATH=$PATH:/project/sawtooth-core/bin
+ENV PATH=$PATH:/project/sawtooth-sdk-python/bin
 
-WORKDIR /project/sawtooth-core
+WORKDIR /project/sawtooth-sdk-python
diff --git a/tests/sawtooth_integration/docker/test_intkey_cli.yaml b/tests/sawtooth_integration/docker/test_intkey_cli.yaml
index 274021042..01c1186c3 100644
--- a/tests/sawtooth_integration/docker/test_intkey_cli.yaml
+++ b/tests/sawtooth_integration/docker/test_intkey_cli.yaml
@@ -36,7 +36,7 @@ services:
         - no_proxy
     image: sawtooth-intkey-tp-python$INSTALL_TYPE:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     depends_on:
@@ -94,17 +94,17 @@ services:
         - no_proxy
     image: integration-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 8008
     depends_on:
       - validator
       - rest-api
     command: nose2-3
-        -c /project/sawtooth-core/tests/sawtooth_integration/nose2.cfg
+        -c /project/sawtooth-sdk-python/tests/sawtooth_integration/nose2.cfg
         -v
-        -s /project/sawtooth-core/tests/sawtooth_integration/tests
+        -s /project/sawtooth-sdk-python/tests/sawtooth_integration/tests
         test_intkey_cli.TestInkeyCli
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: /project/sawtooth-core/tests:\
+      PYTHONPATH: /project/sawtooth-sdk-python/tests:\
diff --git a/tests/sawtooth_integration/docker/test_intkey_smoke_python.yaml b/tests/sawtooth_integration/docker/test_intkey_smoke_python.yaml
index c450c9e13..9cc5a4eff 100644
--- a/tests/sawtooth_integration/docker/test_intkey_smoke_python.yaml
+++ b/tests/sawtooth_integration/docker/test_intkey_smoke_python.yaml
@@ -36,7 +36,7 @@ services:
         - no_proxy
     image: sawtooth-intkey-tp-python$INSTALL_TYPE:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     depends_on:
@@ -94,19 +94,19 @@ services:
         - no_proxy
     image: integration-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 8008
     depends_on:
       - validator
       - rest-api
     command: nose2-3
-        -c /project/sawtooth-core/tests/sawtooth_integration/nose2.cfg
+        -c /project/sawtooth-sdk-python/tests/sawtooth_integration/nose2.cfg
         -v
-        -s /project/sawtooth-core/tests/sawtooth_integration/tests
+        -s /project/sawtooth-sdk-python/tests/sawtooth_integration/tests
         test_intkey_smoke.TestIntkeySmoke
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core:\
-        /project/sawtooth-core/examples/intkey_python:\
-        /project/sawtooth-core/tests"
+      PYTHONPATH: "/project/sawtooth-sdk-python:\
+        /project/sawtooth-sdk-python/examples/intkey_python:\
+        /project/sawtooth-sdk-python/tests"
diff --git a/tests/sawtooth_integration/docker/test_systemd_services.yaml b/tests/sawtooth_integration/docker/test_systemd_services.yaml
index 56f32dcc0..0cfe10d9a 100644
--- a/tests/sawtooth_integration/docker/test_systemd_services.yaml
+++ b/tests/sawtooth_integration/docker/test_systemd_services.yaml
@@ -26,8 +26,8 @@ services:
         - no_proxy
     image: integration-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
       - /var/run/docker.sock:/var/run/docker.sock
-    command: /project/sawtooth-core/tests/sawtooth_integration/tests/test_systemd.sh
+    command: /project/sawtooth-sdk-python/tests/sawtooth_integration/tests/test_systemd.sh
     environment:
       ISOLATION_ID: ${ISOLATION_ID}
diff --git a/tests/sawtooth_integration/docker/test_two_families.yaml b/tests/sawtooth_integration/docker/test_two_families.yaml
index 6d57d9595..4478c3915 100644
--- a/tests/sawtooth_integration/docker/test_two_families.yaml
+++ b/tests/sawtooth_integration/docker/test_two_families.yaml
@@ -36,7 +36,7 @@ services:
         - no_proxy
     image: sawtooth-intkey-tp-python$INSTALL_TYPE:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     depends_on:
@@ -54,7 +54,7 @@ services:
         - no_proxy
     image: sawtooth-xo-tp-python$INSTALL_TYPE:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     depends_on:
@@ -110,7 +110,7 @@ services:
         - no_proxy
     image: integration-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 8008
     depends_on:
@@ -118,12 +118,12 @@ services:
       - rest-api
     # Wait for rest_api and genesis
     command: nose2-3
-        -c /project/sawtooth-core/tests/sawtooth_integration/nose2.cfg
+        -c /project/sawtooth-sdk-python/tests/sawtooth_integration/nose2.cfg
         -v
-        -s /project/sawtooth-core/tests/sawtooth_integration/tests
+        -s /project/sawtooth-sdk-python/tests/sawtooth_integration/tests
         test_two_families.TestTwoFamilies
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core:\
-        /project/sawtooth-core/examples/intkey_python:\
-        /project/sawtooth-core/tests"
+      PYTHONPATH: "/project/sawtooth-sdk-python:\
+        /project/sawtooth-sdk-python/examples/intkey_python:\
+        /project/sawtooth-sdk-python/tests"
diff --git a/tests/sawtooth_integration/docker/test_workload.yaml b/tests/sawtooth_integration/docker/test_workload.yaml
index 53b17132f..f8bc628e9 100644
--- a/tests/sawtooth_integration/docker/test_workload.yaml
+++ b/tests/sawtooth_integration/docker/test_workload.yaml
@@ -36,7 +36,7 @@ services:
         - no_proxy
     image: sawtooth-intkey-tp-python$INSTALL_TYPE:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     depends_on:
@@ -94,19 +94,19 @@ services:
         - no_proxy
     image: integration-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 8008
     depends_on:
       - validator
       - rest-api
     command: nose2-3
-        -c /project/sawtooth-core/tests/sawtooth_integration/nose2.cfg
+        -c /project/sawtooth-sdk-python/tests/sawtooth_integration/nose2.cfg
         -v
-        -s /project/sawtooth-core/tests/sawtooth_integration/tests
+        -s /project/sawtooth-sdk-python/tests/sawtooth_integration/tests
         test_workload
     stop_signal: SIGKILL
     environment:
-      PYTHONPATH: "/project/sawtooth-core:\
-        /project/sawtooth-core/examples/intkey_python:\
-        /project/sawtooth-core/tests"
+      PYTHONPATH: "/project/sawtooth-sdk-python:\
+        /project/sawtooth-sdk-python/examples/intkey_python:\
+        /project/sawtooth-sdk-python/tests"
diff --git a/tests/sawtooth_integration/docker/test_xo_smoke_python.yaml b/tests/sawtooth_integration/docker/test_xo_smoke_python.yaml
index e96995d1e..28b07d13d 100644
--- a/tests/sawtooth_integration/docker/test_xo_smoke_python.yaml
+++ b/tests/sawtooth_integration/docker/test_xo_smoke_python.yaml
@@ -36,7 +36,7 @@ services:
         - no_proxy
     image: sawtooth-xo-tp-python$INSTALL_TYPE:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 4004
     depends_on:
@@ -93,7 +93,7 @@ services:
         - no_proxy
     image: python-sdk-integration-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     expose:
       - 8008
     depends_on:
@@ -101,13 +101,13 @@ services:
       - rest-api
     # Wait for rest_api
     command: nose2-3
-        -c /project/sawtooth-core/tests/sawtooth_integration/nose2.cfg
+        -c /project/sawtooth-sdk-python/tests/sawtooth_integration/nose2.cfg
         -v
-        -s /project/sawtooth-core/tests/sawtooth_integration/tests
+        -s /project/sawtooth-sdk-python/tests/sawtooth_integration/tests
         test_xo_smoke.TestXoSmoke
     stop_signal: SIGKILL
     environment:
       TP_LANG: "python"
-      PYTHONPATH: "/project/sawtooth-core:\
-        /project/sawtooth-core/tests:\
-        /project/sawtooth-core/signing"
+      PYTHONPATH: "/project/sawtooth-sdk-python:\
+        /project/sawtooth-sdk-python/tests:\
+        /project/sawtooth-sdk-python/signing"
diff --git a/tests/unit_python_sdk.yaml b/tests/unit_python_sdk.yaml
index 59b6d3630..35fda92fe 100644
--- a/tests/unit_python_sdk.yaml
+++ b/tests/unit_python_sdk.yaml
@@ -27,10 +27,10 @@ services:
         - no_proxy
     image: python-sdk-tests:$ISOLATION_ID
     volumes:
-      - $SAWTOOTH_CORE:/project/sawtooth-core
+      - $SAWTOOTH_SDK_PYTHON:/project/sawtooth-sdk-python
     command: nose2-3
-        -c /project/sawtooth-core/nose2.cfg
+        -c /project/sawtooth-sdk-python/nose2.cfg
         -v
-        -s /project/sawtooth-core/tests
+        -s /project/sawtooth-sdk-python/tests
     environment:
-        PYTHONPATH: "/project/sawtooth-core"
+        PYTHONPATH: "/project/sawtooth-sdk-python"