diff --git a/Makefile b/Makefile
index 9bda81e..583e9c9 100644
--- a/Makefile
+++ b/Makefile
@@ -9,37 +9,37 @@ checkout: ## checkout submodules, but not recursively
 	@$(GIT) fetch --all
 	@$(GIT) submodule sync
 	@$(GIT) submodule update --init
-	@$(MAKE) -C $(BP_SIM_RTL_DIR) checkout BP_RTL_DIR=$(BP_SIM_RTL_DIR)
-	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) checkout BP_TOOLS_DIR=$(BP_SIM_TOOLS_DIR)
-	@$(MAKE) -C $(BP_SIM_SDK_DIR) checkout BP_SDK_DIR=$(BP_SIM_SDK_DIR)
+	@$(MAKE) -C $(BP_SIM_RTL_DIR) checkout
+	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) checkout
+	@$(MAKE) -C $(BP_SIM_SDK_DIR) checkout
 
 apply_patches: ## applies patches to submodules
 apply_patches: build.patch
 $(eval $(call bsg_fn_build_if_new,patch,$(CURDIR),$(BP_SIM_TOUCH_DIR)))
 %/.patch_build: checkout
-	@$(MAKE) -C $(BP_SIM_RTL_DIR) apply_patches BP_RTL_DIR=$(BP_SIM_RTL_DIR)
-	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) apply_patches BP_TOOLS_DIR=$(BP_SIM_TOOLS_DIR)
-	@$(MAKE) -C $(BP_SIM_SDK_DIR) apply_patches BP_SDK_DIR=$(BP_SIM_SDK_DIR)
+	@$(MAKE) -C $(BP_SIM_RTL_DIR) apply_patches
+	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) apply_patches
+	@$(MAKE) -C $(BP_SIM_SDK_DIR) apply_patches
 	@echo "Patching successful, ignore errors"
 
 prep_lite: ## Minimal preparation for simulation
 prep_lite: apply_patches
-	@$(MAKE) -C $(BP_SIM_RTL_DIR) libs_lite BP_RTL_DIR=$(BP_SIM_RTL_DIR)
-	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) tools_lite BP_TOOLS_DIR=$(BP_SIM_TOOLS_DIR)
-	@$(MAKE) -C $(BP_SIM_SDK_DIR) sdk_lite BP_SDK_DIR=$(BP_SIM_SDK_DIR)
-	@$(MAKE) -C $(BP_SIM_SDK_DIR) prog_lite BP_SDK_DIR=$(BP_SIM_SDK_DIR)
+	@$(MAKE) -C $(BP_SIM_RTL_DIR) libs_lite
+	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) tools_lite
+	@$(MAKE) -C $(BP_SIM_SDK_DIR) sdk_lite
+	@$(MAKE) -C $(BP_SIM_SDK_DIR) prog_lite
 
 prep: ## Standard preparation for simulation
 prep: prep_lite
-	@$(MAKE) -C $(BP_SIM_RTL_DIR) libs BP_RTL_DIR=$(BP_SIM_RTL_DIR)
-	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) tools BP_TOOLS_DIR=$(BP_SIM_TOOLS_DIR)
-	@$(MAKE) -C $(BP_SIM_SDK_DIR) sdk BP_SDK_DIR=$(BP_SIM_SDK_DIR)
-	@$(MAKE) -C $(BP_SIM_SDK_DIR) prog BP_SDK_DIR=$(BP_SIM_SDK_DIR)
+	@$(MAKE) -C $(BP_SIM_RTL_DIR) libs
+	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) tools
+	@$(MAKE) -C $(BP_SIM_SDK_DIR) sdk
+	@$(MAKE) -C $(BP_SIM_SDK_DIR) prog
 
 prep_bsg: ## Extra preparation for BSG users
 prep_bsg: prep
-	@$(MAKE) -C $(BP_SIM_RTL_DIR) libs_bsg BP_RTL_DIR=$(BP_SIM_RTL_DIR)
-	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) tools_bsg BP_TOOLS_DIR=$(BP_SIM_TOOLS_DIR)
-	@$(MAKE) -C $(BP_SIM_SDK_DIR) sdk_bsg BP_SDK_DIR=$(BP_SIM_SDK_DIR)
-	@$(MAKE) -C $(BP_SIM_SDK_DIR) prog_bsg BP_SDK_DIR=$(BP_SIM_SDK_DIR)
+	@$(MAKE) -C $(BP_SIM_RTL_DIR) libs_bsg
+	@$(MAKE) -C $(BP_SIM_TOOLS_DIR) tools_bsg
+	@$(MAKE) -C $(BP_SIM_SDK_DIR) sdk_bsg
+	@$(MAKE) -C $(BP_SIM_SDK_DIR) prog_bsg
 
diff --git a/Makefile.common b/Makefile.common
index 7b46fdb..48c31a8 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -111,7 +111,7 @@ help: ## prints this message
 # Global reset
 .PHONY: bleach_all
 bleach_all: ## wipes the whole repo clean. Use with caution
-	@cd $(TOP); git clean -ffdx; git submodule deinit -f .
+	@cd $(BP_SIM_DIR); git clean -ffdx; git submodule deinit -f .
 
 #############################
 # Paths
@@ -127,3 +127,6 @@ BP_SIM_TOUCH_DIR   ?= $(BP_SIM_INSTALL_DIR)/touchfiles
 
 BSG_CADENV_DIR ?= $(BP_SIM_DIR)/install/bsg_cadenv
 
+# Exported for historical reasons, remove later
+export BP_SDK_DIR := $(BP_SIM_SDK_DIR)
+
diff --git a/Makefile.env b/Makefile.env
index a8046cb..b6f7d63 100644
--- a/Makefile.env
+++ b/Makefile.env
@@ -5,6 +5,11 @@
 # Available platforms: ubuntu20.04
 DOCKER_PLATFORM ?= ubuntu20.04
 
+#############################
+# Environment detection
+#############################
+CENTOS7 := $(if $(findstring CentOS Linux release 7,$(shell cat /etc/centos-release 2>/dev/null)),1,0)
+
 ##########################################################
 ## Cad environment
 ##########################################################
@@ -33,11 +38,6 @@ endif
 # Cad settings
 #############################
 
-#############################
-# Environment detection
-#############################
-CENTOS7 := $(if $(findstring CentOS Linux release 7,$(shell cat /etc/centos-release 2>/dev/null)),1,0)
-
 ##############################
 # Executables
 ##############################
@@ -45,4 +45,5 @@ DOCKER ?= docker
 GIT ?= git
 CD ?= cd
 MKDIR ?= mkdir
+ECHO ?= echo
 
diff --git a/black-parrot b/black-parrot
index 551f455..d28efc7 160000
--- a/black-parrot
+++ b/black-parrot
@@ -1 +1 @@
-Subproject commit 551f4556ee39330a14c33d300e633ae76462925b
+Subproject commit d28efc7f0a757bc7913135b15d953b1a386dc93a
diff --git a/black-parrot-sdk b/black-parrot-sdk
index 7da2382..f71d11d 160000
--- a/black-parrot-sdk
+++ b/black-parrot-sdk
@@ -1 +1 @@
-Subproject commit 7da2382912ff0bb53efa8a657ae8960807d69a7e
+Subproject commit f71d11de4a595131d8ca0483743273058b9e5a32
diff --git a/black-parrot-tools b/black-parrot-tools
index 1bf612d..efd2476 160000
--- a/black-parrot-tools
+++ b/black-parrot-tools
@@ -1 +1 @@
-Subproject commit 1bf612d065f5fb2a382a33b54a65fcf31798ef9d
+Subproject commit efd2476fcf22080735b7d933bb6a3cd110fccbfe