diff --git a/.zuul.yaml b/.zuul.yaml
index 7504b48815..6bd4122c57 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -157,10 +157,10 @@
         sysinv-cond: true
         tls-proxy: false
       devstack_plugins:
-        stx-config: https://git.starlingx.io/stx-config
-        stx-fault: https://git.starlingx.io/stx-fault
-        stx-integ: https://git.starlingx.io/stx-integ
-        stx-update: https://git.starlingx.io/stx-update
+        config: https://opendev.org/starlingx/config
+        fault: https://opendev.org/starlingx/fault
+        integ: https://opendev.org/starlingx/integ
+        update: https://opendev.org/starlingx/update
 
 - job:
     name: cgtsclient-tox-py27
diff --git a/devstack/lib/stx-config b/devstack/lib/config
similarity index 99%
rename from devstack/lib/stx-config
rename to devstack/lib/config
index 317056a488..b0b33281d8 100644
--- a/devstack/lib/stx-config
+++ b/devstack/lib/config
@@ -6,7 +6,7 @@
 #
 # Copyright (c) 2019 Wind River Systems, Inc.
 #
-# lib/stx-config
+# lib/config
 # Functions to control the configuration and operation of stx-config
 
 # Dependencies:
@@ -14,7 +14,7 @@
 # - ``functions`` file
 # - ``DEST``, ``DATA_DIR``, ``STACK_USER`` must be defined
 
-# - The stx-update and stx-fault plugins must be enabled
+# - The update and fault plugins must be enabled
 
 # ``stack.sh`` calls the entry points in this order:
 #
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index bd0ceceb08..91b26b5c33 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -10,7 +10,7 @@
 echo_summary "sysinv devstack plugin.sh called: $1/$2"
 
 # check for service enabled
-if is_service_enabled stx-config; then
+if is_service_enabled config; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         # Perform installation of source
         echo_summary "Installing stx-config"
diff --git a/devstack/settings b/devstack/settings
index f49fef6ef0..099383bbfb 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -16,16 +16,16 @@
 # Defaults
 # --------
 
-STX_CONFIG_NAME=stx-config
+STX_CONFIG_NAME=config
 
 ######### Plugin Specific ##########
 enable_service $STX_CONFIG_NAME
 
 # This must not use any variables to work properly in OpenStack's DevStack playbook
-define_plugin stx-config
+define_plugin config
 # This works for Zuul jobs using OpenStack's DevStack roles
-plugin_requires stx-config stx-integ
-plugin_requires stx-config stx-update
+plugin_requires config integ
+plugin_requires config update
 
 # Handle STX pre-reqs
 # stx-integ
@@ -47,4 +47,4 @@ if is_service_enabled sysinv-agent; then
 fi
 
 # Initial source of lib script
-source $DEST/stx-config/devstack/lib/stx-config
+source $DEST/config/devstack/lib/config
diff --git a/tox.ini b/tox.ini
index be7f2a57c3..0503b75b41 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,7 @@ minversion = 2.3
 skipsdist = True
 
 [testenv]
-install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/pike} {opts} {packages}
+install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/upper-constraints.txt} {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          OS_STDOUT_CAPTURE=1
          OS_STDERR_CAPTURE=1