diff --git a/release/Makefile.oci b/release/Makefile.oci
--- a/release/Makefile.oci
+++ b/release/Makefile.oci
@@ -3,7 +3,7 @@
 #
 
 .if defined(WITH_OCIIMAGES) && !empty(WITH_OCIIMAGES)
-OCI_IMAGES= static dynamic runtime notoolchain toolchain
+OCI_IMAGES= static dynamic runtime no-toolchain with-toolchain
 .endif
 
 oci-install:
@@ -18,8 +18,8 @@
 OCI_DEPS_static=
 OCI_DEPS_dynamic=container-image-static.txz
 OCI_DEPS_runtime=container-image-dynamic.txz
-OCI_DEPS_notoolchain=container-image-runtime.txz
-OCI_DEPS_toolchain=container-image-notoolchain.txz
+OCI_DEPS_no-toolchain=container-image-runtime.txz
+OCI_DEPS_with-toolchain=container-image-no-toolchain.txz
 
 .for _IMG in ${OCI_IMAGES}
 OCI_TARGETS+= container-image-${_IMG}.txz
diff --git a/release/tools/oci-image-notoolchain.conf b/release/tools/oci-image-no-toolchain.conf
rename from release/tools/oci-image-notoolchain.conf
rename to release/tools/oci-image-no-toolchain.conf
diff --git a/release/tools/oci-image-toolchain.conf b/release/tools/oci-image-with-toolchain.conf
rename from release/tools/oci-image-toolchain.conf
rename to release/tools/oci-image-with-toolchain.conf
--- a/release/tools/oci-image-toolchain.conf
+++ b/release/tools/oci-image-with-toolchain.conf
@@ -2,7 +2,7 @@
 
 # Build Open Container Initiative (OCI) container image with almost all of FreeBSD base.txz
 
-OCI_BASE_IMAGE=notoolchain
+OCI_BASE_IMAGE=no-toolchain
 
 oci_image_build() {
 	set_cmd ${workdir} /bin/sh