diff --git a/make/defs-cpp.mk b/make/defs-cpp.mk
index 2e92ad88..72a8957a 100644
--- a/make/defs-cpp.mk
+++ b/make/defs-cpp.mk
@@ -1,5 +1,5 @@
-ifndef JW_BUILD_CPP_DEFS_MK_INCLUDED
-JW_BUILD_CPP_DEFS_MK_INCLUDED := true
+ifndef JW_PKG_CPP_DEFS_MK_INCLUDED
+JW_PKG_CPP_DEFS_MK_INCLUDED := true
 
 # performance optimization for clean targets
 ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
@@ -12,7 +12,7 @@ CPP_STANDARD_VERSION        ?= 17
 C_STANDARD_VERSION          ?= 11
 USE_PROJECT_LIB             ?= true
 EXPORT_PROJECT_LIB          ?= $(USE_PROJECT_LIB)
-USE_JW_BUILD                ?= true
+USE_JW_PKG                  ?= true
 USE_EXCEPTIONS_IN_C         ?= true
 USE_COMPILER_OPTIMIZATION_OPTS ?= false
 USE_COMPILER_DEBUG_OPTS     ?= true
@@ -805,4 +805,4 @@ INSTALLED_LIB               += $(INSTALLED_LIB_SO) $(INSTALLED_SHOBJS) \
         $(INSTALLED_DEF)
 
 endif # ifeq ($(filter clean distclean,$(MAKECMDGOALS)),)
-endif # ifndef JW_BUILD_CPP_DEFS_MK_INCLUDED
+endif # ifndef JW_PKG_CPP_DEFS_MK_INCLUDED
diff --git a/make/defs.mk b/make/defs.mk
index 34a86c86..8f71cd7b 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -2,8 +2,8 @@
 # contact@jannet.de
 # $Id$
 
-ifndef JW_BUILD_DEF_MK_INCLUDED
-JW_BUILD_DEF_MK_INCLUDED     = true
+ifndef JW_PKG_DEF_MK_INCLUDED
+JW_PKG_DEF_MK_INCLUDED     = true
 
 MAKEFLAGS                   += -r
 
@@ -259,7 +259,7 @@ CVS_RSH                     ?= /usr/bin/ssh
 
 # ----- input dirs
 
-JW_BUILD_DIR                 = $(JWBDIR)
+JW_PKG_DIR                 = $(JWBDIR)
 PROJECT_STEM                 = $(PROJECT)-$(DIST_VERSION)
 
 # only works if checked out true to CVS, i.e. below proj
@@ -526,4 +526,4 @@ doc-project:
 echo-targets:
 	@make -pqR | sed '/^[a-zA-Z-]\+:/!d; s/:.*//' | sort
 
-endif # ifndef JW_BUILD_DEF_MK_INCLUDED
+endif # ifndef JW_PKG_DEF_MK_INCLUDED
diff --git a/make/projects-dir-minimal.mk b/make/projects-dir-minimal.mk
index 8f5698a3..36bc4ee2 100644
--- a/make/projects-dir-minimal.mk
+++ b/make/projects-dir-minimal.mk
@@ -63,7 +63,7 @@ include $(PROJECTS_DIR_INCLUDE_MK)
 $(PROJECTS_DIR_INCLUDE_MK): | $(JWBDIR)
 
 $(JWBDIR):
-	git $(GIT_GLOBAL_OPTS) clone $(addprefix -b ,$(JW_BUILD_BRANCH)) $(JWBDIR_GIT_REMOTE) $(JWBDIR)
+	git $(GIT_GLOBAL_OPTS) clone $(addprefix -b ,$(JW_PKG_BRANCH)) $(JWBDIR_GIT_REMOTE) $(JWBDIR)
 ifneq ($(findstring proactiveAuth,$(GIT_GLOBAL_OPTS)),)
 	git -C $(JWBDIR) config set http.proactiveAuth basic
 endif
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index d29481b9..b6e12022 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -25,13 +25,13 @@ JWBDIR_NAME                 ?= jw-pkg
 JWBDIR_SEARCH_PATH          ?= $(DEV_PROJECTS_DIR) $(BUILD_TOOLS_PREFIX)/opt/$(FLAVOUR_PATH_PREFIX)
 JWBDIR                      ?= $(firstword $(wildcard $(addsuffix /$(JWBDIR_NAME),$(JWBDIR_SEARCH_PATH))))
 
-JW_BUILD_BINDIR              = $(JWBDIR)/bin
-JWB_SCRIPT_DIR               = $(firstword $(wildcard ./$(JWBDIR_NAME)/scripts $(JW_BUILD_BINDIR)) jwb-script-dir-not-found)
-JW_BUILD_REMOTE_BINDIR       = /opt/jw-pkg/bin
+JW_PKG_BINDIR              = $(JWBDIR)/bin
+JWB_SCRIPT_DIR               = $(firstword $(wildcard ./$(JWBDIR_NAME)/scripts $(JW_PKG_BINDIR)) jwb-script-dir-not-found)
+JW_PKG_REMOTE_BINDIR       = /opt/jw-pkg/bin
 
 SHELL                        = /bin/bash -o pipefail +H
 PROJECTS_TXT                ?= projects.txt
-JW_BUILD_VERBOSE            ?= false
+JW_PKG_VERBOSE            ?= false
 BASE_PKGS                    = git make sudo time xdg-utils python3
 PREREQ_RELEASE              ?= pull
 ifneq ($(JANWARE_USER),)
@@ -54,16 +54,16 @@ else
   PROJECTS                  ?= $(shell ls -d */GNUmakefile */Makefile 2>/dev/null | sed 's%/[^/]*%%' | sort -u)
 endif
 
-ifeq ($(JW_BUILD_VERBOSE),true)
+ifeq ($(JW_PKG_VERBOSE),true)
   SSH_WRAPPER_TRACE         ?= -x
 endif
 
-export JW_BUILD_VERBOSE
+export JW_PKG_VERBOSE
 
 # ------------ external programs I
 
 CWD                         := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-GET_OS_SH                    = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/get-os.sh $(JW_BUILD_BINDIR)/get-os.sh) get-os-sh-not-found)
+GET_OS_SH                    = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/get-os.sh $(JW_PKG_BINDIR)/get-os.sh) get-os-sh-not-found)
 SSH_WRAPPER_SH              := $(CWD)/ssh-wrapper.sh
 
 EXCLUDES_FILE               ?= exclude.txt
@@ -82,18 +82,18 @@ else
   UNAVAILABLE_TARGETS       ?=
 endif
 
-ifneq ($(origin JW_BUILD_SSH),undefined)
-  export GIT_SSH            := $(JW_BUILD_SSH)
+ifneq ($(origin JW_PKG_SSH),undefined)
+  export GIT_SSH            := $(JW_PKG_SSH)
 else
   export GIT_SSH            := $(SSH_WRAPPER_SH)
 endif
 
 ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
-  JW_BUILD_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-pkg:%h:%p -o ControlPersist=3m
+  JW_PKG_SSH_EXTRA_OPTS += -o StrictHostKeyChecking=no -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-pkg:%h:%p -o ControlPersist=3m
   ifneq ($(JANWARE_USER),)
-    JW_BUILD_SSH_EXTRA_OPTS += -l $(JANWARE_USER)
+    JW_PKG_SSH_EXTRA_OPTS += -l $(JANWARE_USER)
   endif
-  export JW_BUILD_SSH_EXTRA_OPTS
+  export JW_PKG_SSH_EXTRA_OPTS
 endif
 
 ifneq ($(EXCLUDE_FROM_BUILD),)
@@ -135,11 +135,11 @@ ifneq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
   PGIT_SH                   += --remote-base $(PROJECTS_DIR_REMOTE_BASE)
 endif
 
-PURGE_SH                     = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_BUILD_BINDIR)/purge-stale-projects.sh) purge-not-found)
-PKG_MANAGER_SH              ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh $(JW_BUILD_BINDIR)/pkg-manager.sh) pkg-manager-not-found)
-CREATE_PROJECT_SH           ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg-create-project.sh $(JW_BUILD_BINDIR)/jw-pkg-create-project.sh) jw-pkg-create-project-not-found)
-LIST_VCS_FILES_SH            = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh $(JW_BUILD_BINDIR)/scm.sh) scm-sh-not-found) ls-files
-GIT_SRV_ADMIN_SH             = JW_BUILD_SSH_EXTRA_OPTS="$(JW_BUILD_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com $(JW_BUILD_REMOTE_BINDIR)/git-srv-admin.sh
+PURGE_SH                     = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_PKG_BINDIR)/purge-stale-projects.sh) purge-not-found)
+PKG_MANAGER_SH              ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/pkg-manager.sh $(JW_PKG_BINDIR)/pkg-manager.sh) pkg-manager-not-found)
+CREATE_PROJECT_SH           ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg-create-project.sh $(JW_PKG_BINDIR)/jw-pkg-create-project.sh) jw-pkg-create-project-not-found)
+LIST_VCS_FILES_SH            = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/scm.sh $(JW_PKG_BINDIR)/scm.sh) scm-sh-not-found) ls-files
+GIT_SRV_ADMIN_SH             = JW_PKG_SSH_EXTRA_OPTS="$(JW_PKG_SSH_EXTRA_OPTS)" $(GIT_SSH) $(JANWARE_USER)@git.janware.com $(JW_PKG_REMOTE_BINDIR)/git-srv-admin.sh
 
 # ------------ projects to be built
 
@@ -357,7 +357,7 @@ git-commit:
 # --- rules
 
 $(SSH_WRAPPER_SH): $(PROJECTS_MAKEFILE_NAME)
-	/bin/echo -e '#!/bin/bash $(SSH_WRAPPER_TRACE)\n\nexec /usr/bin/ssh $$JW_BUILD_SSH_EXTRA_OPTS "$$@"' > $@.tmp
+	/bin/echo -e '#!/bin/bash $(SSH_WRAPPER_TRACE)\n\nexec /usr/bin/ssh $$JW_PKG_SSH_EXTRA_OPTS "$$@"' > $@.tmp
 	chmod 700 $@.tmp
 	mv $@.tmp $@
 ssh-wrapper: $(SSH_WRAPPER_SH)
diff --git a/make/rules.mk b/make/rules.mk
index 9fa56ce3..09f1ca0e 100644
--- a/make/rules.mk
+++ b/make/rules.mk
@@ -3,8 +3,8 @@
 # contact@jannet.de
 # $Id$
 
-ifndef JW_BUILD_RULES_MK_INCLUDED
-JW_BUILD_RULES_MK_INCLUDED = true
+ifndef JW_PKG_RULES_MK_INCLUDED
+JW_PKG_RULES_MK_INCLUDED = true
 
 # -- standard targets
 all:
@@ -432,4 +432,4 @@ find:
 collect:
 	bash $(JWB_SCRIPT_DIR)/collect-installed-pkg-changes.sh -t $(TOPDIR)
 
-endif # ifndef JW_BUILD_RULES_MK_INCLUDED
+endif # ifndef JW_PKG_RULES_MK_INCLUDED