diff --git a/.zuul.yaml b/.zuul.yaml
index f8a5763f..0edafbad 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -47,5 +47,5 @@
         sw-patch: true
         tsconfig: true
       devstack_plugins:
-        stx-integ: https://git.starlingx.io/stx-integ
-        stx-update: https://git.starlingx.io/stx-update
+        # integ: https://opendev.org/starlingx/integ
+        update: https://opendev.org/starlingx/update
diff --git a/devstack/lib/stx-update b/devstack/lib/update
similarity index 96%
rename from devstack/lib/stx-update
rename to devstack/lib/update
index 2088f7c2..6d3d66cb 100644
--- a/devstack/lib/stx-update
+++ b/devstack/lib/update
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# lib/stx-update
+# lib/update
 
 # ``stack.sh`` calls the entry points in this order:
 #
@@ -18,7 +18,7 @@ set -o xtrace
 # Defaults
 # --------
 
-STXUPDATE_REPO=${STXUPDATE_REPO:-${GIT_BASE}/openstack/stx-update.git}
+STXUPDATE_REPO=${STXUPDATE_REPO:-${GIT_BASE}/starlingx/update.git}
 STXUPDATE_DIR=${GITDIR[$STX_UPDATE_NAME]}
 
 STX_PATCH_DIR=$STXUPDATE_DIR/cgcs-patch/
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index cce913c7..37a8dc23 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -6,7 +6,7 @@
 echo_summary "stx-update devstack plugin.sh called: $1/$2"
 
 # check for service enabled
-if is_service_enabled stx-update; then
+if is_service_enabled update; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         # Perform installation of source
         echo_summary "Install stx-update"
diff --git a/devstack/settings b/devstack/settings
index 4142b9fc..48ccbe76 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -12,15 +12,15 @@
 # Defaults
 # --------
 
-STX_UPDATE_NAME=stx-update
+STX_UPDATE_NAME=update
 
 ######### Plugin Specific ##########
 enable_service $STX_UPDATE_NAME
 
 # This must not use any variables to work properly in OpenStack's DevStack playbook
-define_plugin stx-update
+define_plugin update
 # This works for Zuul jobs using OpenStack's DevStack roles
-#plugin_requires stx-update stx-xxxx
+#plugin_requires update xxxx
 
 # Initial source of lib script
-source $DEST/stx-update/devstack/lib/stx-update
+source $DEST/update/devstack/lib/update
diff --git a/tox.ini b/tox.ini
index 00931d34..01d521b1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -116,8 +116,8 @@ commands = {[testenv]commands}
 [testenv:pylint]
 deps = {[testenv]deps}
        pylint
-       -e{toxinidir}/../stx-config/sysinv/sysinv/sysinv
-       -e{toxinidir}/../stx-fault/fm-api
+       -e{toxinidir}/../config/sysinv/sysinv/sysinv
+       -e{toxinidir}/../fault/fm-api
        pyCrypto
        daemon
        keystoneauth1
diff --git a/tsconfig/tsconfig/tox.ini b/tsconfig/tsconfig/tox.ini
index 0bd5ec6d..97466c1a 100644
--- a/tsconfig/tsconfig/tox.ini
+++ b/tsconfig/tsconfig/tox.ini
@@ -12,7 +12,7 @@ setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
 install_command = pip install {opts} {packages}
 
-deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt}
+deps = -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt}
        -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt