diff --git a/projects/abseil.io/package.yml b/projects/abseil.io/package.yml
index 08187d92..1d85a1dc 100644
--- a/projects/abseil.io/package.yml
+++ b/projects/abseil.io/package.yml
@@ -35,7 +35,7 @@ build:
     - working-directory: '{{prefix}}/lib/cmake/absl'
       run: |
         sed -i.bak \
-          -e "s:{{ tea.prefix }}:\$\{CMAKE_CURRENT_LIST_DIR\}/../../../../..:g" \
+          -e "s:{{ pkgx.prefix }}:\$\{CMAKE_CURRENT_LIST_DIR\}/../../../../..:g" \
           abslTargets{,-release}.cmake
         rm abslTargets{,-release}.cmake.bak
 
diff --git a/projects/apache.org/apr/package.yml b/projects/apache.org/apr/package.yml
index 97afb0f6..e2ad2cd9 100644
--- a/projects/apache.org/apr/package.yml
+++ b/projects/apache.org/apr/package.yml
@@ -23,7 +23,7 @@ build:
     cd ../build-1
     sed -i.bak \
       -e "s_{{prefix}}_\$(subst /bin/apr-{{version.major}}-config,,\$(shell command -v apr-{{version.major}}-config))_g" \
-      -e "s_${TEA_PREFIX}_\$(subst /apache.org/apr/v{{version}}/bin/apr-{{version.major}}-config,,\$(shell command -v apr-{{version.major}}-config))_g" \
+      -e "s_${PKGX_DIR}_\$(subst /apache.org/apr/v{{version}}/bin/apr-{{version.major}}-config,,\$(shell command -v apr-{{version.major}}-config))_g" \
       apr_rules.mk
     rm apr_rules.mk.bak
   env:
diff --git a/projects/apache.org/arrow/package.yml b/projects/apache.org/arrow/package.yml
index 78279733..66c93ab9 100644
--- a/projects/apache.org/arrow/package.yml
+++ b/projects/apache.org/arrow/package.yml
@@ -33,9 +33,9 @@ build:
     - cmake --build build
     - cmake --install build
     - run: |
-        sed -i.bak "s|$TEA_PREFIX|\${pcfiledir}/../../../..|g" ./*.pc
+        sed -i.bak "s|$PKGX_DIR|\${pcfiledir}/../../../..|g" ./*.pc
         rm ./*.bak
-      working-directory: "{{prefix}}/lib/pkgconfig"
+      working-directory: '{{prefix}}/lib/pkgconfig'
   env:
     CMAKE_ARGS:
       - -DCMAKE_INSTALL_PREFIX="{{prefix}}
diff --git a/projects/facebook.com/folly/package.yml b/projects/facebook.com/folly/package.yml
index d1e2922c..a9ed39fb 100644
--- a/projects/facebook.com/folly/package.yml
+++ b/projects/facebook.com/folly/package.yml
@@ -47,7 +47,7 @@ build:
 
     - run: |
         sed -E -i.bak \
-          -e "s:{{tea.prefix}}:\$\{_IMPORT_PREFIX\}/../../..:g" \
+          -e "s:{{pkgx.prefix}}:\$\{_IMPORT_PREFIX\}/../../..:g" \
           -e '/^  INTERFACE_INCLUDE_DIRECTORIES/ s|/v([0-9]+)(\.[0-9]+)*[a-z]?/include|/v\1/include|g' \
           -e '/^  INTERFACE_LINK_LIBRARIES/ s|/v([0-9]+)(\.[0-9]+)*[a-z]?/lib|/v\1/lib|g' \
           folly-targets.cmake
diff --git a/projects/fishshell.com/package.yml b/projects/fishshell.com/package.yml
index a9fbeefe..ebbb1cda 100644
--- a/projects/fishshell.com/package.yml
+++ b/projects/fishshell.com/package.yml
@@ -29,7 +29,7 @@ build:
       working-directory: build
 
     - run: |
-        sed -i.bak -e "s| $TEA_PREFIX/| \$TEA_PREFIX/|g" __fish_build_paths.fish
+        sed -i.bak -e "s| $PKGX_DIR/| \$PKGX_DIR/|g" __fish_build_paths.fish
         rm __fish_build_paths.fish.bak
       working-directory: ${{prefix}}/share/fish
   env:
diff --git a/projects/gnu.org/groff/package.yml b/projects/gnu.org/groff/package.yml
index 40c2deb6..ab94e626 100644
--- a/projects/gnu.org/groff/package.yml
+++ b/projects/gnu.org/groff/package.yml
@@ -33,8 +33,8 @@ build:
     - make --jobs {{hw.concurrency}} install
     - run: |
         sed -i.bak "1s|.*|#!/usr/bin/env perl|g" afmtodit grog gropdf mmroff pdfmom
-        sed -i.bak "s|$TEA_PREFIX|\$ENV{'TEA_PREFIX'}|g" afmtodit chem glilypond gperl gropdf
-        sed -i.bak "s|$TEA_PREFIX|\$TEA_PREFIX|g" neqn nroff
+        sed -i.bak "s|$PKGX_DIR|\$ENV{'PKGX_DIR'}|g" afmtodit chem glilypond gperl gropdf
+        sed -i.bak "s|$PKGX_DIR|\$PKGX_DIR|g" neqn nroff
         rm ./*.bak
       working-directory: '{{prefix}}/bin'
   env:
diff --git a/projects/haskell.org/package.yml b/projects/haskell.org/package.yml
index 3df6dc15..4b17ae9f 100644
--- a/projects/haskell.org/package.yml
+++ b/projects/haskell.org/package.yml
@@ -36,7 +36,6 @@ provides:
   - bin/runhaskell-{{version.marketing}}
   - bin/runhaskell-{{version}}
 
-
 dependencies:
   gnu.org/gmp: 6
   invisible-island.net/ncurses: 6
@@ -58,16 +57,16 @@ build:
     - run: ln -s .ghcup/* .
       working-directory: ${{prefix}}
     - run: |
-       find . -type f -print0 | xargs -0 sed -i.bak -e "s|$TEA_PREFIX|\$TEA_PREFIX|g"
-       rm *.bak
+        find . -type f -print0 | xargs -0 sed -i.bak -e "s|$PKGX_DIR|\$PKGX_DIR|g"
+        rm *.bak
       working-directory: ${{prefix}}/ghc/{{version}}/bin
     - run: |
-       sed -i.bak -e "s|$TEA_PREFIX|\$TEA_PREFIX|g" env
-       rm env.bak
+        sed -i.bak -e "s|$PKGX_DIR|\$PKGX_DIR|g" env
+        rm env.bak
       working-directory: ${{prefix}}/.ghcup
     - run: |
-       find . -type f -name \*.conf -print0 | xargs -0 sed -i.bak -e 's|{{prefix}}|${pkgroot}/../../../../..|g'
-       find . -type f -name \*.conf.bak -delete
+        find . -type f -name \*.conf -print0 | xargs -0 sed -i.bak -e 's|{{prefix}}|${pkgroot}/../../../../..|g'
+        find . -type f -name \*.conf.bak -delete
       working-directory: ${{prefix}}/ghc/{{version}}/lib/ghc-{{version}}/package.conf.d
       if: <9.4
   env:
@@ -82,5 +81,4 @@ test:
     - ghc-pkg recache
     - ghc-pkg check
     - test "$(runghc $FIXTURE)" = "Hello World"
-  fixture:
-    main = putStrLn "Hello World"
+  fixture: main = putStrLn "Hello World"
diff --git a/projects/haskell.org/package.yml-from-source b/projects/haskell.org/package.yml-from-source
index b60e0456..097c29cf 100644
--- a/projects/haskell.org/package.yml-from-source
+++ b/projects/haskell.org/package.yml-from-source
@@ -81,7 +81,7 @@ build:
       rm $shim.bak
     done
 
-    sed -i.bak 's|{{tea.prefix}}|$TEA_PREFIX|g' "{{prefix}}/bin/hsc2hs-ghc-{{version}}"
+    sed -i.bak "s|$PKGX_DIR|\$PKGX_DIR|g" "{{prefix}}/bin/hsc2hs-ghc-{{version}}"
     rm "{{prefix}}/bin/hsc2hs-ghc-{{version}}.bak"
   env:
     BOOTSTRAP_HASKELL_NONINTERACTIVE: 1
diff --git a/projects/llvm.org/package.yml b/projects/llvm.org/package.yml
index 56b37f6f..a9cf9b3f 100644
--- a/projects/llvm.org/package.yml
+++ b/projects/llvm.org/package.yml
@@ -45,35 +45,35 @@ build:
       - -DLLVM_ENABLE_RTTI=ON
     linux:
       ARGS:
-      # the default is `ld` however clang when handling linking itself
-      # internally passes flags that, in fact, expect `lld`
-      #NOTE only wanted on linux because on macOS we actually *need* the Apple
-      # provided `ld` or things *also* break 😆
-      - -DCLANG_DEFAULT_LINKER=lld
-      # Needed with the CMAKE_C_COMPILER_TARGET to compile compiler-rt on linux
-      # https://reviews.llvm.org/D147598
-      - -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
+        # the default is `ld` however clang when handling linking itself
+        # internally passes flags that, in fact, expect `lld`
+        #NOTE only wanted on linux because on macOS we actually *need* the Apple
+        # provided `ld` or things *also* break 😆
+        - -DCLANG_DEFAULT_LINKER=lld
+        # Needed with the CMAKE_C_COMPILER_TARGET to compile compiler-rt on linux
+        # https://reviews.llvm.org/D147598
+        - -DCOMPILER_RT_DEFAULT_TARGET_ONLY=ON
     darwin:
       ARGS:
-      #FIXME shouldn’t *have to* require the command line tools package
-      #FIXME this is no good for systems with only Xcode installed
-      #NOTE how do Apple make their LLVM find both? we want the same trick
-      - -DDEFAULT_SYSROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
+        #FIXME shouldn’t *have to* require the command line tools package
+        #FIXME this is no good for systems with only Xcode installed
+        #NOTE how do Apple make their LLVM find both? we want the same trick
+        - -DDEFAULT_SYSROOT=/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk
     linux/x86-64:
       ARGS:
-      # required to build something that works on linux/x86-64
-      - -DCLANG_DEFAULT_CXX_STDLIB=libstdc++
-      - -DCLANG_DEFAULT_RTLIB=libgcc
-      - -DCOMPILER_RT_INCLUDE_TESTS=OFF
-      - -DCOMPILER_RT_USE_LIBCXX=OFF
-      # otherwise compiler-rt fails to build
-      # https://reviews.llvm.org/D147598
-      - -DCMAKE_C_COMPILER_TARGET="x86_64-unknown-linux-gnu"
+        # required to build something that works on linux/x86-64
+        - -DCLANG_DEFAULT_CXX_STDLIB=libstdc++
+        - -DCLANG_DEFAULT_RTLIB=libgcc
+        - -DCOMPILER_RT_INCLUDE_TESTS=OFF
+        - -DCOMPILER_RT_USE_LIBCXX=OFF
+        # otherwise compiler-rt fails to build
+        # https://reviews.llvm.org/D147598
+        - -DCMAKE_C_COMPILER_TARGET="x86_64-unknown-linux-gnu"
     linux/aarch64:
       ARGS:
-      # otherwise compiler-rt fails to build
-      # https://reviews.llvm.org/D147598
-      - -DCMAKE_C_COMPILER_TARGET="aarch64-unknown-linux-gnu"
+        # otherwise compiler-rt fails to build
+        # https://reviews.llvm.org/D147598
+        - -DCMAKE_C_COMPILER_TARGET="aarch64-unknown-linux-gnu"
 
 test:
   fixture: |
@@ -98,4 +98,4 @@ test:
     - ./a.out
   env:
     ARGS:
-      - -Wl,-rpath,$TEA_PREFIX
+      - -Wl,-rpath,$PKGX_DIR
diff --git a/projects/man-db.gitlab.io/man-db/package.yml b/projects/man-db.gitlab.io/man-db/package.yml
index 9f790b0e..fc6c739c 100644
--- a/projects/man-db.gitlab.io/man-db/package.yml
+++ b/projects/man-db.gitlab.io/man-db/package.yml
@@ -16,7 +16,7 @@ build:
   script:
     - ./configure $CONFIGURE_ARGS
     - make --jobs {{hw.concurrency}} install
-    - sed -i.bak "s|$TEA_PREFIX|\$TEA_PREFIX|g" {{prefix}}/etc/systemd/system/man-db.service
+    - sed -i.bak "s|$PKGX_DIR|\$PKGX_DIR|g" {{prefix}}/etc/systemd/system/man-db.service
     - rm {{prefix}}/etc/systemd/system/man-db.service.bak
     - run: |
         # Creating stubs
@@ -24,9 +24,9 @@ build:
         do
         cat <<EOF >$name
         #!/bin/bash
-        
+
         config_file="\$(dirname \$0)/../../etc/man_db.conf"
-        
+
         \$(dirname \$0)/../libexec/bin/$name --config-file="\$config_file" "\$@"
         EOF
         chmod +x $name
@@ -36,7 +36,7 @@ build:
         rm lexgrog man-recode
         ln -s ../libexec/bin/lexgrog lexgrog
         ln -s ../libexec/bin/man-recode man-recode
-      working-directory: "{{prefix}}/bin"
+      working-directory: '{{prefix}}/bin'
   env:
     CONFIGURE_ARGS:
       - --disable-debug
@@ -69,4 +69,4 @@ test:
     - run: man --version | grep {{version}}
       if: linux
     - which man | grep {{prefix}}
-    - man man
\ No newline at end of file
+    - man man
diff --git a/projects/midnight-commander.org/package.yml b/projects/midnight-commander.org/package.yml
index e8a95718..66277790 100644
--- a/projects/midnight-commander.org/package.yml
+++ b/projects/midnight-commander.org/package.yml
@@ -38,11 +38,11 @@ build:
     fix-shebangs.ts libexec/mc/extfs.d/*
 
     for x in $(find libexec/mc -name \*sh -type f -depth 1) libexec/mc/ext.d/misc.sh; do
-      sed -i.bak 's|{{tea.prefix}}|$TEA_PREFIX|g' $x
+      sed -i.bak "s|$PKGX_DIR|\$PKGX_DIR|g" $x
       rm $x.bak
     done
 
-    sed -i.bak 's|{{tea.prefix}}|%p/../|g' etc/mc/mc.ext*
+    sed -i.bak "s|$PKGX_DIR|%p/../|g" etc/mc/mc.ext*
     rm etc/mc/mc.ext*.bak
 
   env:
@@ -51,6 +51,5 @@ build:
       - --with-screen=ncurses
 
 # FIXME: hard to test interactive tools
-test:
-  test "$(mc --datadir | cut -d ' ' -f1 | cut -d':' -f1)" = "{{prefix}}/etc/mc/"
+test: test "$(mc --datadir | cut -d ' ' -f1 | cut -d':' -f1)" = "{{prefix}}/etc/mc/"
 # ^^ tests relocatability
diff --git a/projects/open-mpi.org/package.yml b/projects/open-mpi.org/package.yml
index d66dc18c..fdd1d5ae 100644
--- a/projects/open-mpi.org/package.yml
+++ b/projects/open-mpi.org/package.yml
@@ -38,7 +38,7 @@ build:
     - make --jobs {{ hw.concurrency }} all
     - make --jobs {{ hw.concurrency }} install
     - run: |
-        sed -i.bak "s|$TEA_PREFIX|\${pcfiledir}/../../../..|g" ompi-c.pc ompi-cxx.pc ompi-fort.pc ompi.pc orte.pc pmix.pc
+        sed -i.bak "s|$PKGX_DIR|\${pcfiledir}/../../../..|g" ompi-c.pc ompi-cxx.pc ompi-fort.pc ompi.pc orte.pc pmix.pc
         rm ./*.bak
       working-directory: '{{prefix}}/lib/pkgconfig'
     - run: |
diff --git a/projects/opendap.org/package.yml b/projects/opendap.org/package.yml
index 6f54cc0d..36649b54 100644
--- a/projects/opendap.org/package.yml
+++ b/projects/opendap.org/package.yml
@@ -32,7 +32,7 @@ build:
     - make --jobs {{ hw.concurrency }}
     - make --jobs {{ hw.concurrency }} check
     - make --jobs {{ hw.concurrency }} install
-    - sed -i.bak "s|$TEA_PREFIX|\$TEA_PREFIX|g" {{prefix}}/bin/dap-config
+    - sed -i.bak "s|$PKGX_DIR|\$PKGX_DIR|g" {{prefix}}/bin/dap-config
   env:
     darwin:
       PATCH: https://raw.githubusercontent.com/Homebrew/formula-patches/03cf8088210822aa2c1ab544ed58ea04c897d9c4/libtool/configure-big_sur.diff
diff --git a/projects/podman.io/package.yml b/projects/podman.io/package.yml
index 5e726e36..c176fd4f 100644
--- a/projects/podman.io/package.yml
+++ b/projects/podman.io/package.yml
@@ -41,7 +41,7 @@ build:
     GVISOR_MAJOR: |-
       $(cd "{{deps.github.com/containers/gvisor-tap-vsock.prefix}}/../\
       /v{{deps.github.com/containers/gvisor-tap-vsock.version.major}}" \
-      && pwd | sed -e "s_$TEA_PREFIX/__")
+      && pwd | sed -e "s_$PKGX_DIR/__")
     CGO_ENABLED: 1
 
 test:
@@ -49,4 +49,3 @@ test:
     podman-remote -v | grep "podman-remote version {{ version }}"
     (podman info 2>&1 || true) | grep "Cannot connect to Podman."
     (podman machine init --image-path fake-testimage fake-testvm 2>&1 || true) | grep "Error: open fake-testimage: no such file or directory"
-
diff --git a/projects/python.org/package.yml b/projects/python.org/package.yml
index c2be8cfc..c7beb0ec 100644
--- a/projects/python.org/package.yml
+++ b/projects/python.org/package.yml
@@ -167,10 +167,10 @@ build:
         import os
         import re
 
-        tea_prefix = os.path.normpath(os.path.join(os.path.dirname(__file__), '../../../../'))
+        pkgx_prefix = os.path.normpath(os.path.join(os.path.dirname(__file__), '../../../../'))
         for key in build_time_vars:
           if isinstance(build_time_vars[key], str):
-            build_time_vars[key] = re.sub(r'(\s|^)/opt/', r'\g<1>{}/'.format(tea_prefix), build_time_vars[key])
+            build_time_vars[key] = re.sub(r'(\s|^)/opt/', r'\g<1>{}/'.format(pkgx_prefix), build_time_vars[key])
 
     # force pip to user-install mode without sudo
     - ln -s /dev {{prefix}}/lib/python{{version.marketing}}/site-packages
diff --git a/projects/tea.xyz/gx/cc/cc.rb b/projects/tea.xyz/gx/cc/cc.rb
index 4f312bb5..1fe31e95 100755
--- a/projects/tea.xyz/gx/cc/cc.rb
+++ b/projects/tea.xyz/gx/cc/cc.rb
@@ -7,13 +7,13 @@
 # - for tea-envs the user probably won’t use tea.xyz/gx/cc even though they *should*
 #   and thus we set LDFLAGS in the hope that they will be picked up and the rpath set
 
-$tea_prefix = ENV['TEA_PREFIX'] || `tea --prefix`.chomp
+$pkgx_prefix = ENV['PKGX_DIR'] || `tea --prefix`.chomp
 exe = File.basename($0)
 
 # remove duplicates since this in fact embeds the rpath multiple times
 # and omit -nodefaultrpaths since it is not a valid flag for clang
 args = ARGV.map do |arg|
-  arg unless arg == "-Wl,-rpath,#$tea_prefix" or arg == "-nodefaultrpaths"
+  arg unless arg == "-Wl,-rpath,#$pkgx_prefix" or arg == "-nodefaultrpaths"
 end.compact
 
 def is_tea? path
@@ -26,7 +26,7 @@ end
 exe_path = ENV['PATH'].split(":").filter { |path|
   if path == File.dirname(__FILE__)
     false
-  elsif path == File.join($tea_prefix, ".local/bin")
+  elsif path == File.join($pkgx_prefix, ".local/bin")
     false
   elsif is_tea?(path)
     false
@@ -52,7 +52,7 @@ for arg in args do
   # we aren't sure what the rules are TBH, possibly it is as simple as if the output (`-o`)
   # is a .o then we don’t add the rpath
   if arg.start_with? '-l' or arg.end_with? '.dylib'
-    exec exe_path, *args, "-Wl,-rpath,#$tea_prefix"
+    exec exe_path, *args, "-Wl,-rpath,#$pkgx_prefix"
   end
 end
 
diff --git a/projects/tea.xyz/gx/cc/ld b/projects/tea.xyz/gx/cc/ld
index f26ff991..55905946 100755
--- a/projects/tea.xyz/gx/cc/ld
+++ b/projects/tea.xyz/gx/cc/ld
@@ -2,9 +2,9 @@
 
 set -e
 
-if test -z "$TEA_PREFIX"
+if test -z "$PKGX_DIR"
 then
-  echo 'TEA_PREFIX mysteriously unset' >&2
+  echo 'PKGX_DIR mysteriously unset' >&2
   exit 1
 fi
 
@@ -37,7 +37,7 @@ __which() {
 # Otherwise, fallback to `ld`
 # NB: this might not have the right invocations, sometimes;
 # (invoking `ld` as `lld64.ld`) watch for those potential cases
-if __which $(basename "$0") || __which ld; then
+if __which "$(basename "$0")" || __which ld; then
   :
 else
   echo 'ld not found in PATH' >&2
@@ -53,4 +53,4 @@ for word in "$@"; do
   fi
 done
 
-exec "$exe" "$@" -rpath "$TEA_PREFIX"
+exec "$exe" "$@" -rpath "$PKGX_DIR"
diff --git a/projects/unbound.net/package.yml b/projects/unbound.net/package.yml
index 34084e79..63acc3ff 100644
--- a/projects/unbound.net/package.yml
+++ b/projects/unbound.net/package.yml
@@ -14,13 +14,13 @@ build:
     libexpat.github.io: '*'
     github.com/westes/flex: '*'
     gnu.org/bison: ^3
-    
+
   script: |
     ./configure $ARGS
     make -j {{ hw.concurrency }} install
 
     cd {{prefix}}/bin
-    sed -i.bak -e "s|$TEA_PREFIX/|$(tea --prefix)/|g" unbound-control-setup
+    sed -i.bak -e "s|$PKGX_DIR/|$(tea --prefix)/|g" unbound-control-setup
     rm unbound-control-setup.bak
   env:
     ARGS:
@@ -40,8 +40,8 @@ test:
     - grep "$TEST1" <<< "$OUT"
     - grep "$TEST2" <<< "$OUT"
   env:
-    TEST1: "tea.xyz has address"
-    TEST2: "tea.xyz mail is handled by"
+    TEST1: 'tea.xyz has address'
+    TEST2: 'tea.xyz mail is handled by'
 
 provides:
   - bin/unbound
diff --git a/projects/unidata.ucar.edu/netcdf/package.yml b/projects/unidata.ucar.edu/netcdf/package.yml
index 736c321c..1ae141c8 100644
--- a/projects/unidata.ucar.edu/netcdf/package.yml
+++ b/projects/unidata.ucar.edu/netcdf/package.yml
@@ -28,14 +28,14 @@ build:
     - install build_static/liblib/libnetcdf.a {{prefix}}/lib/
     - run: |
         sed -i.bak \
-            -e "s|$TEA_PREFIX|\${TEA_PREFIX}|g" \
+            -e "s|$PKGX_DIR|\${PKGX_DIR}|g" \
             bin/nc-config \
             lib/cmake/netCDF/netCDFConfig.cmake \
             lib/libnetcdf.settings
         rm bin/nc-config.bak lib/cmake/netCDF/netCDFConfig.cmake.bak lib/libnetcdf.settings.bak
       working-directory: ${{prefix}}
     - run: |
-        sed -i.bak "s|$TEA_PREFIX|\${pcfiledir}/../../..|g" netcdf.pc
+        sed -i.bak "s|$PKGX_DIR|\${pcfiledir}/../../..|g" netcdf.pc
         rm netcdf.pc.bak
       working-directory: ${{prefix}}/lib/pkgconfig
   env:
diff --git a/projects/x.org/exts/package.yml b/projects/x.org/exts/package.yml
index 7749256f..362126a2 100644
--- a/projects/x.org/exts/package.yml
+++ b/projects/x.org/exts/package.yml
@@ -24,7 +24,7 @@ build:
       --enable-spec=no
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/ice/package.yml b/projects/x.org/ice/package.yml
index 643eabe8..cbdbcc15 100644
--- a/projects/x.org/ice/package.yml
+++ b/projects/x.org/ice/package.yml
@@ -20,7 +20,7 @@ build:
     ./configure $ARGS
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
     ARGS:
       - --prefix="{{prefix}}"
       - --sysconfdir="$SHELF"/etc
diff --git a/projects/x.org/protocol/package.yml b/projects/x.org/protocol/package.yml
index f36c57cf..f980168f 100644
--- a/projects/x.org/protocol/package.yml
+++ b/projects/x.org/protocol/package.yml
@@ -20,7 +20,7 @@ build:
       --localstatedir="$SHELF"/var
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   dependencies:
diff --git a/projects/x.org/protocol/xcb/package.yml b/projects/x.org/protocol/xcb/package.yml
index 14816562..e4b928d5 100644
--- a/projects/x.org/protocol/xcb/package.yml
+++ b/projects/x.org/protocol/xcb/package.yml
@@ -20,7 +20,7 @@ build:
       --localstatedir="$SHELF"/var
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 runtime:
   env:
diff --git a/projects/x.org/sm/package.yml b/projects/x.org/sm/package.yml
index 2dee00c5..b6223e66 100644
--- a/projects/x.org/sm/package.yml
+++ b/projects/x.org/sm/package.yml
@@ -23,7 +23,7 @@ build:
       --localstatedir="$SHELF"/var
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   dependencies:
diff --git a/projects/x.org/x11/package.yml b/projects/x.org/x11/package.yml
index 7838d2e8..c6eebcb6 100644
--- a/projects/x.org/x11/package.yml
+++ b/projects/x.org/x11/package.yml
@@ -23,7 +23,7 @@ build:
     ./configure $ARGS
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
     ARGS:
       - --prefix="{{prefix}}"
       - --sysconfdir="$SHELF"/etc
diff --git a/projects/x.org/xau/package.yml b/projects/x.org/xau/package.yml
index 917436df..a3054131 100644
--- a/projects/x.org/xau/package.yml
+++ b/projects/x.org/xau/package.yml
@@ -23,7 +23,7 @@ build:
       --localstatedir="$SHELF"/var
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/xaw/package.yml b/projects/x.org/xaw/package.yml
index c109851e..a2b1c038 100644
--- a/projects/x.org/xaw/package.yml
+++ b/projects/x.org/xaw/package.yml
@@ -26,7 +26,7 @@ build:
       --localstatedir="$SHELF"/var
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/xcb/package.yml b/projects/x.org/xcb/package.yml
index 45c76d8d..fe86eb14 100644
--- a/projects/x.org/xcb/package.yml
+++ b/projects/x.org/xcb/package.yml
@@ -25,7 +25,7 @@ build:
     - ./configure $ARGS
     - make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
     ARGS:
       - --prefix="{{prefix}}"
       - --sysconfdir="$SHELF"/etc
diff --git a/projects/x.org/xcursor/package.yml b/projects/x.org/xcursor/package.yml
index fb7c8d04..ea60d51e 100644
--- a/projects/x.org/xcursor/package.yml
+++ b/projects/x.org/xcursor/package.yml
@@ -22,8 +22,8 @@ build:
   env:
     ARGS:
       - --prefix={{prefix}}
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
       - --disable-dependency-tracking
       - --disable-silent-rules
 test:
diff --git a/projects/x.org/xdamage/package.yml b/projects/x.org/xdamage/package.yml
index 6d98a336..9644a125 100644
--- a/projects/x.org/xdamage/package.yml
+++ b/projects/x.org/xdamage/package.yml
@@ -27,10 +27,10 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
 
 test:
   dependencies:
     freedesktop.org/pkg-config: '*'
-  script: pkg-config --modversion xdamage | grep {{version}}
\ No newline at end of file
+  script: pkg-config --modversion xdamage | grep {{version}}
diff --git a/projects/x.org/xdmcp/package.yml b/projects/x.org/xdmcp/package.yml
index 3ab9d188..b5ddde33 100644
--- a/projects/x.org/xdmcp/package.yml
+++ b/projects/x.org/xdmcp/package.yml
@@ -22,7 +22,7 @@ build:
       --localstatedir="$SHELF"/var
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/xfixes/package.yml b/projects/x.org/xfixes/package.yml
index b06011c2..cba9c5bc 100644
--- a/projects/x.org/xfixes/package.yml
+++ b/projects/x.org/xfixes/package.yml
@@ -26,10 +26,10 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
 
 test:
   dependencies:
     freedesktop.org/pkg-config: '*'
-  script: pkg-config --modversion xfixes | grep {{version}}
\ No newline at end of file
+  script: pkg-config --modversion xfixes | grep {{version}}
diff --git a/projects/x.org/xi/package.yml b/projects/x.org/xi/package.yml
index 520cf89d..7ca01a32 100644
--- a/projects/x.org/xi/package.yml
+++ b/projects/x.org/xi/package.yml
@@ -28,12 +28,12 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
       - --enable-docs=no
       - --enable-specs=no
 
 test:
   dependencies:
     freedesktop.org/pkg-config: '*'
-  script: pkg-config --modversion xi | grep {{version}}
\ No newline at end of file
+  script: pkg-config --modversion xi | grep {{version}}
diff --git a/projects/x.org/xinerama/package.yml b/projects/x.org/xinerama/package.yml
index d18e667a..4e550d1c 100644
--- a/projects/x.org/xinerama/package.yml
+++ b/projects/x.org/xinerama/package.yml
@@ -27,12 +27,12 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
 
 test:
   dependencies:
     freedesktop.org/pkg-config: '*'
-  script: 
-  - cc test.c
-  - pkg-config --modversion xinerama | grep {{version}}
\ No newline at end of file
+  script:
+    - cc test.c
+    - pkg-config --modversion xinerama | grep {{version}}
diff --git a/projects/x.org/xinput/package.yml b/projects/x.org/xinput/package.yml
index 59a8d37a..172e9bb7 100644
--- a/projects/x.org/xinput/package.yml
+++ b/projects/x.org/xinput/package.yml
@@ -30,12 +30,12 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
 
 provides:
   - bin/xinput
 
 test:
   - test -x {{prefix}}/bin/xinput
-  - head -n 1 {{prefix}}/share/man/man1/xinput.1 | grep {{version}}
\ No newline at end of file
+  - head -n 1 {{prefix}}/share/man/man1/xinput.1 | grep {{version}}
diff --git a/projects/x.org/xmu/package.yml b/projects/x.org/xmu/package.yml
index fbe472d8..40c166a0 100644
--- a/projects/x.org/xmu/package.yml
+++ b/projects/x.org/xmu/package.yml
@@ -23,7 +23,7 @@ build:
       --localstatedir="$SHELF"/var
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/xpm/package.yml b/projects/x.org/xpm/package.yml
index b95c874b..12242f6a 100644
--- a/projects/x.org/xpm/package.yml
+++ b/projects/x.org/xpm/package.yml
@@ -25,7 +25,7 @@ build:
       --disable-open-zfile
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/xrandr/package.yml b/projects/x.org/xrandr/package.yml
index 913338d8..92f14258 100644
--- a/projects/x.org/xrandr/package.yml
+++ b/projects/x.org/xrandr/package.yml
@@ -28,10 +28,10 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
 
 test:
   dependencies:
     freedesktop.org/pkg-config: '*'
-  script: pkg-config --modversion xrandr | grep {{version}}
\ No newline at end of file
+  script: pkg-config --modversion xrandr | grep {{version}}
diff --git a/projects/x.org/xrender/package.yml b/projects/x.org/xrender/package.yml
index cd066343..adc01d82 100644
--- a/projects/x.org/xrender/package.yml
+++ b/projects/x.org/xrender/package.yml
@@ -23,7 +23,7 @@ build:
       --localstatedir="$SHELF"/var
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/xshmfence/package.yml b/projects/x.org/xshmfence/package.yml
index 8cdf86ae..b35c785f 100644
--- a/projects/x.org/xshmfence/package.yml
+++ b/projects/x.org/xshmfence/package.yml
@@ -25,10 +25,10 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
 
 test:
   dependencies:
     freedesktop.org/pkg-config: '*'
-  script: pkg-config --modversion xshmfence | grep {{version}}
\ No newline at end of file
+  script: pkg-config --modversion xshmfence | grep {{version}}
diff --git a/projects/x.org/xt/package.yml b/projects/x.org/xt/package.yml
index 96f1a48a..875aa8b4 100644
--- a/projects/x.org/xt/package.yml
+++ b/projects/x.org/xt/package.yml
@@ -25,7 +25,7 @@ build:
       --with-appdefaultdir="$SHELF"/etc/X11/app-defaults
     make --jobs {{ hw.concurrency }} install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/xtrans/package.yml b/projects/x.org/xtrans/package.yml
index a028b153..59ddcbd4 100644
--- a/projects/x.org/xtrans/package.yml
+++ b/projects/x.org/xtrans/package.yml
@@ -29,7 +29,7 @@ build:
     make
     make install
   env:
-    SHELF: ${{tea.prefix}}/x.org
+    SHELF: ${{pkgx.prefix}}/x.org
 
 test:
   script: |
diff --git a/projects/x.org/xtst/package.yml b/projects/x.org/xtst/package.yml
index fde415bd..a130afa0 100644
--- a/projects/x.org/xtst/package.yml
+++ b/projects/x.org/xtst/package.yml
@@ -22,8 +22,8 @@ build:
   env:
     ARGS:
       - --prefix={{prefix}}
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
       - --disable-dependency-tracking
       - --disable-silent-rules
       - --enable-specs=no
diff --git a/projects/x.org/xv/package.yml b/projects/x.org/xv/package.yml
index 368b7910..fc528d44 100644
--- a/projects/x.org/xv/package.yml
+++ b/projects/x.org/xv/package.yml
@@ -28,10 +28,10 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
 
 test:
   dependencies:
     freedesktop.org/pkg-config: '*'
-  script: pkg-config --modversion xv | grep {{version}}
\ No newline at end of file
+  script: pkg-config --modversion xv | grep {{version}}
diff --git a/projects/x.org/xxf86vm/package.yml b/projects/x.org/xxf86vm/package.yml
index 4b362943..b0a2cdd2 100644
--- a/projects/x.org/xxf86vm/package.yml
+++ b/projects/x.org/xxf86vm/package.yml
@@ -27,10 +27,10 @@ build:
       - --prefix="{{prefix}}"
       - --disable-dependency-tracking
       - --disable-silent-rules
-      - --sysconfdir={{tea.prefix}}/x.org/etc
-      - --localstatedir={{tea.prefix}}/x.org/var
+      - --sysconfdir={{pkgx.prefix}}/x.org/etc
+      - --localstatedir={{pkgx.prefix}}/x.org/var
 
 test:
   dependencies:
     freedesktop.org/pkg-config: '*'
-  script: pkg-config --modversion xxf86vm | grep {{version}}
\ No newline at end of file
+  script: pkg-config --modversion xxf86vm | grep {{version}}