diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index fff4816..2dcaa2d 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -61,7 +61,7 @@ representative at an online or offline event.
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
 reported to the community leaders responsible for enforcement at
-[`conduct@componentized.dev`](mailto:conduct@componentized.dev?static-config%20conduct).
+[`conduct@componentized.dev`](mailto:conduct@componentized.dev?constants%20conduct).
 All complaints will be reviewed and investigated promptly and fairly.
 
 All community leaders are obligated to respect the privacy and security of the
diff --git a/Makefile b/Makefile
index 2c1487b..e789bd5 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ RUST_TOOLCHAIN := $(shell sed -n 's/^channel *= *"\(.*\)"/\1/p' rust-toolchain.t
 CARGO_INSTALL := $(if $(shell command -v cargo-binstall 2> /dev/null),cargo binstall --no-confirm --disable-telemetry,cargo install)
 
 COMPONENTS = $(sort $(foreach file,$(wildcard $(addprefix components/*/,wit/*.constants.wit *.properties *.wac *.wkg Cargo.toml)),$(word 2,$(subst /, ,$(file)))))
-TOOLS := static-config wac-cli wasm-opt wasm-tools wkg
+TOOLS := componentized-static-config-cli wac-cli wasm-opt wasm-tools wkg
 
 # the tools are run by path, make runs simple commands itself rather than with a shell, finding them
 # on the PATH make was started with, not the PATH exported above
@@ -111,10 +111,10 @@ components/$1/wit/deps: wit/deps components/$1/wkg.toml $(shell find components/
 
 else ifneq ($(wildcard components/$1/$1.properties),)
 
-${COMPONENTS_DIR}/$1/$1.wasm: components/$1/$1.properties ${COMPONENTS_DIR}/$1/README.md | $(call tool,static-config)
+${COMPONENTS_DIR}/$1/$1.wasm: components/$1/$1.properties ${COMPONENTS_DIR}/$1/README.md | $(call tool,componentized-static-config-cli)
 	$(STATIC_CONFIG) -f components/$1/$1.properties -o ${COMPONENTS_DIR}/$1/$1.wasm
 
-${COMPONENTS_DIR}/$1/$1.debug.wasm: components/$1/$1.properties ${COMPONENTS_DIR}/$1/README.md | $(call tool,static-config)
+${COMPONENTS_DIR}/$1/$1.debug.wasm: components/$1/$1.properties ${COMPONENTS_DIR}/$1/README.md | $(call tool,componentized-static-config-cli)
 	$(STATIC_CONFIG) -f components/$1/$1.properties -o ${COMPONENTS_DIR}/$1/$1.debug.wasm
 
 else ifneq ($(wildcard components/$1/$1.wac),)
diff --git a/tools/Cargo.toml b/tools/Cargo.toml
index 0fb6214..0218406 100644
--- a/tools/Cargo.toml
+++ b/tools/Cargo.toml
@@ -13,7 +13,7 @@ publish = false
 path = "lib.rs"
 
 [dependencies]
-static-config = "=0.2.0"
+componentized-static-config-cli = "=0.3.0"
 wac-cli = "=0.12.0"
 wasm-opt = "=0.116.1"
 wasm-tools = "=1.261.0"