diff --git a/.gitmodules b/.gitmodules
index 7cbfc1df199b80e2e9d2fdd79a3e62131cad3c64..5fe102e171539984e8dd6e64ac85d85a4c3cd42d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,5 +1,5 @@
 [submodule "security_transforms"]
-	path = security_transforms
+	path = irdb-libs
 	url = git@git.zephyr-software.com:allnp/security_transforms.git
 [submodule "idaproCur"]
 	shallow = true
@@ -19,7 +19,7 @@
 	path = zipr
 	url = git@git.zephyr-software.com:allzp/zipr.git
 [submodule "zipr_sdk"]
-	path = zipr_sdk
+	path = zipr-sdk
 	url = git@git.zephyr-software.com:allnp/zipr_sdk.git
 [submodule "daffy"]
 	path = daffy
diff --git a/irdb-libs b/irdb-libs
new file mode 160000
index 0000000000000000000000000000000000000000..d1cf03ff37a850d7fb98b16458747411ac083638
--- /dev/null
+++ b/irdb-libs
@@ -0,0 +1 @@
+Subproject commit d1cf03ff37a850d7fb98b16458747411ac083638
diff --git a/irdb-sdk b/irdb-sdk
index fc774810ba72217fd32a34b27fdbde61db2e4e7b..85a2d55a38c8880b1233e1068a8a878498cbf624 160000
--- a/irdb-sdk
+++ b/irdb-sdk
@@ -1 +1 @@
-Subproject commit fc774810ba72217fd32a34b27fdbde61db2e4e7b
+Subproject commit 85a2d55a38c8880b1233e1068a8a878498cbf624
diff --git a/manifest.txt b/manifest.txt
index aa5642b2a1947bee7f09773ce6e0e195f5969c6e..b163378a013ccc2e52f2ba35be4426451e499675 100644
--- a/manifest.txt
+++ b/manifest.txt
@@ -1,5 +1,5 @@
 
-submanifest security_transforms/manifest.txt
+submanifest irdb-libs/manifest.txt
 submanifest peasoup_examples/manifest.txt
 submanifest idaproCur/manifest.txt
 submanifest SMPStaticAnalyzer/manifest.txt
diff --git a/security_transforms b/security_transforms
deleted file mode 160000
index 72178881af10bbacb1a057984cc662a3c92b2f99..0000000000000000000000000000000000000000
--- a/security_transforms
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 72178881af10bbacb1a057984cc662a3c92b2f99
diff --git a/set_env_vars b/set_env_vars
index 8d6892bf5264e4dc933abff8801569e5a70acc11..53efe949c623b695b41429df4f7cb0bc83a7ec5b 100644
--- a/set_env_vars
+++ b/set_env_vars
@@ -15,10 +15,10 @@ export STRATA_HOME32=$STRATA32
 export ZIPR_HOME=$PEASOUP_UMBRELLA_DIR/zipr
 export ZIPR_INSTALL=$PEASOUP_UMBRELLA_DIR/zipr_install
 export ZIPR_CALLBACKS=$PEASOUP_UMBRELLA_DIR/zipr_callbacks
-export ZIPR_SDK=$PEASOUP_UMBRELLA_DIR/zipr_sdk
+export ZIPR_SDK=$PEASOUP_UMBRELLA_DIR/zipr-sdk
 export ZIPR_SCFI_PLUGIN=$PEASOUP_UMBRELLA_DIR/zipr_scfi_plugin
 export ZIPR_XEON_PLUGIN=$PEASOUP_UMBRELLA_DIR/zipr_xeon_plugin
-export SECURITY_TRANSFORMS_HOME=$PEASOUP_UMBRELLA_DIR/security_transforms
+export SECURITY_TRANSFORMS_HOME=$PEASOUP_UMBRELLA_DIR/irdb-libs
 export IRDB_SDK=$PEASOUP_UMBRELLA_DIR/irdb-sdk
 export IRDB_TRANSFORMS=$PEASOUP_UMBRELLA_DIR/irdb_transforms
 export ZEST_RUNTIME=$PEASOUP_UMBRELLA_DIR/zest_runtime
diff --git a/zipr-sdk b/zipr-sdk
new file mode 160000
index 0000000000000000000000000000000000000000..edafa3be475877fd47341e039518566bc199a709
--- /dev/null
+++ b/zipr-sdk
@@ -0,0 +1 @@
+Subproject commit edafa3be475877fd47341e039518566bc199a709
diff --git a/zipr_sdk b/zipr_sdk
deleted file mode 160000
index 7497a3d96f91e6ab85f539c0226ab55662fa2c32..0000000000000000000000000000000000000000
--- a/zipr_sdk
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7497a3d96f91e6ab85f539c0226ab55662fa2c32