diff --git a/boards/uniboard1/designs/unb1_ddr3/doc/README b/boards/uniboard1/designs/unb1_ddr3/doc/README
index 245bf3a6d18d008fe28c5331559e1e9029bdaca1..dcc27dd23312d4c54bb469591cb58ecfe5482341 100644
--- a/boards/uniboard1/designs/unb1_ddr3/doc/README
+++ b/boards/uniboard1/designs/unb1_ddr3/doc/README
@@ -14,7 +14,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb1
 
     # in Modelsim do:
diff --git a/boards/uniboard1/designs/unb1_ddr3_reorder/doc/README b/boards/uniboard1/designs/unb1_ddr3_reorder/doc/README
index 752cd16ede33b354a27132fe3b03100b5651b530..43dcd7791d203a5c3e68da9950f995b562b16edd 100644
--- a/boards/uniboard1/designs/unb1_ddr3_reorder/doc/README
+++ b/boards/uniboard1/designs/unb1_ddr3_reorder/doc/README
@@ -14,7 +14,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb1
 
     # in Modelsim do:
diff --git a/boards/uniboard1/designs/unb1_heater/doc/README b/boards/uniboard1/designs/unb1_heater/doc/README
index 594a16f0a29361fba3ca26bf8e6a7eadbcc71127..4b3e99c67cbd5fb485cd35f6b531738da64745e5 100644
--- a/boards/uniboard1/designs/unb1_heater/doc/README
+++ b/boards/uniboard1/designs/unb1_heater/doc/README
@@ -16,7 +16,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb1
 
     # in Modelsim do:
diff --git a/boards/uniboard1/designs/unb1_minimal/doc/README b/boards/uniboard1/designs/unb1_minimal/doc/README
index ded73efee23c6be34c666d0214d892eb7852fd16..a0085f2f59c52ce8eb99e1dec7658b1c7d4b395d 100644
--- a/boards/uniboard1/designs/unb1_minimal/doc/README
+++ b/boards/uniboard1/designs/unb1_minimal/doc/README
@@ -18,7 +18,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb1
 
     # in Modelsim do:
diff --git a/boards/uniboard1/designs/unb1_test/doc/README b/boards/uniboard1/designs/unb1_test/doc/README
index 75278e69b1186ff8f2db354d61270fca7510887c..e2fdce714481f03d9ec2e3d12e35af559ed25dd8 100644
--- a/boards/uniboard1/designs/unb1_test/doc/README
+++ b/boards/uniboard1/designs/unb1_test/doc/README
@@ -46,7 +46,7 @@ The following revisions are available for unb1_test (see the directories in ../r
 Simulation
 ----------
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb1
 
 Further Modelsim instructions: see the README file in the ../revisions/* directories
diff --git a/boards/uniboard2/designs/unb2_minimal/doc/README b/boards/uniboard2/designs/unb2_minimal/doc/README
index f4204c933d59b49110552aab6142f5ba53636e87..037b0a8df8170885130d85039477ac353bf44fa8 100644
--- a/boards/uniboard2/designs/unb2_minimal/doc/README
+++ b/boards/uniboard2/designs/unb2_minimal/doc/README
@@ -26,7 +26,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2
 
     # in Modelsim do:
diff --git a/boards/uniboard2/designs/unb2_test/doc/README b/boards/uniboard2/designs/unb2_test/doc/README
index aa1962e9b773c201dbba3a04cadebc5c81df3fbd..0dff5ebf0ab9bcd3cd838ef7ffe626ee466cf51d 100644
--- a/boards/uniboard2/designs/unb2_test/doc/README
+++ b/boards/uniboard2/designs/unb2_test/doc/README
@@ -54,7 +54,7 @@ The following revisions are available for unb2_test (see the directories in ../r
 Simulation
 ----------
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2
 
 Further Modelsim instructions: see the README file in the ../revisions/* directories
diff --git a/boards/uniboard2a/designs/unb2a_heater/doc/README.txt b/boards/uniboard2a/designs/unb2a_heater/doc/README.txt
index 45784227e7324df032f996bb8777826d80bb5042..8788e379fa87b9245e747a06d0a90b8250953e68 100644
--- a/boards/uniboard2a/designs/unb2a_heater/doc/README.txt
+++ b/boards/uniboard2a/designs/unb2a_heater/doc/README.txt
@@ -26,7 +26,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2a
 
     # in Modelsim do:
diff --git a/boards/uniboard2a/designs/unb2a_minimal/doc/README.txt b/boards/uniboard2a/designs/unb2a_minimal/doc/README.txt
index 2f15b2b53286cc98102d152c0d7f427ee7f2fc5d..37859f9f848528b736ddcff61a7073495f38679f 100644
--- a/boards/uniboard2a/designs/unb2a_minimal/doc/README.txt
+++ b/boards/uniboard2a/designs/unb2a_minimal/doc/README.txt
@@ -28,7 +28,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2a
 
     # in Modelsim do:
diff --git a/boards/uniboard2a/designs/unb2a_test/doc/README.txt b/boards/uniboard2a/designs/unb2a_test/doc/README.txt
index c0cbdbec17f87a5ea1586f2547db6eef790c86a3..ce1710cbd2aebe9cd61b66a764df3f084920776f 100644
--- a/boards/uniboard2a/designs/unb2a_test/doc/README.txt
+++ b/boards/uniboard2a/designs/unb2a_test/doc/README.txt
@@ -53,7 +53,7 @@ The following revisions are available for unb2a_test (see the directories in ../
 Simulation
 ----------
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2a
 
 Further Modelsim instructions: see the README file in the ../revisions/* directories
diff --git a/boards/uniboard2b/designs/unb2b_heater/doc/README.txt b/boards/uniboard2b/designs/unb2b_heater/doc/README.txt
index 986591f6bd898cba4a9fbae3f7a6993cc8bab2e9..b2f7defb7b919f496224df583014d5a518879179 100644
--- a/boards/uniboard2b/designs/unb2b_heater/doc/README.txt
+++ b/boards/uniboard2b/designs/unb2b_heater/doc/README.txt
@@ -26,7 +26,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2b
 
     # in Modelsim do:
diff --git a/boards/uniboard2b/designs/unb2b_jesd/doc/README b/boards/uniboard2b/designs/unb2b_jesd/doc/README
index 2ad1b66249653ab4cf25626064a59ebb2afca74f..4548387ac8254d2f9023e2483e7eb9900fbcc469 100644
--- a/boards/uniboard2b/designs/unb2b_jesd/doc/README
+++ b/boards/uniboard2b/designs/unb2b_jesd/doc/README
@@ -37,7 +37,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2b
 
     # in Modelsim do:
diff --git a/boards/uniboard2b/designs/unb2b_minimal/doc/README b/boards/uniboard2b/designs/unb2b_minimal/doc/README
index e503e227fe2b0070887787aa3ae5023e69140b6c..eb5cae66ce7da505c28e903530687f401ab34072 100644
--- a/boards/uniboard2b/designs/unb2b_minimal/doc/README
+++ b/boards/uniboard2b/designs/unb2b_minimal/doc/README
@@ -28,7 +28,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2b
 
     # in Modelsim do:
diff --git a/boards/uniboard2b/designs/unb2b_test/doc/README.txt b/boards/uniboard2b/designs/unb2b_test/doc/README.txt
index f704e92177b0f38d859d870a7e0acd8183fe14bb..31575a05f4f73a2f8f1fbb071b9fc92b8054415e 100644
--- a/boards/uniboard2b/designs/unb2b_test/doc/README.txt
+++ b/boards/uniboard2b/designs/unb2b_test/doc/README.txt
@@ -53,7 +53,7 @@ The following revisions are available for unb2b_test (see the directories in ../
 Simulation
 ----------
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2b
 
 Further Modelsim instructions: see the README file in the ../revisions/* directories
diff --git a/boards/uniboard2c/designs/unb2c_heater/doc/README.txt b/boards/uniboard2c/designs/unb2c_heater/doc/README.txt
index d906ab22d9536e2b8d68d9b76666314c45e1b0a4..58454429a6fb3899c28619ce2ff5e4b6c1b13e2e 100644
--- a/boards/uniboard2c/designs/unb2c_heater/doc/README.txt
+++ b/boards/uniboard2c/designs/unb2c_heater/doc/README.txt
@@ -26,7 +26,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2c
 
     # in Modelsim do:
diff --git a/boards/uniboard2c/designs/unb2c_jesd/doc/README b/boards/uniboard2c/designs/unb2c_jesd/doc/README
index 40f1369f26ab5ff61b04fa8ee67edb394d0dda84..f25a57e1550817bf0d7fd6549f02c3b6af4312f6 100644
--- a/boards/uniboard2c/designs/unb2c_jesd/doc/README
+++ b/boards/uniboard2c/designs/unb2c_jesd/doc/README
@@ -37,7 +37,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2c
 
     # in Modelsim do:
diff --git a/boards/uniboard2c/designs/unb2c_minimal/doc/README b/boards/uniboard2c/designs/unb2c_minimal/doc/README
index e07a7e406002b2628db57a2491a74a2dacf2c367..10c3150b6c5dcb5f8c9f140af40f867a896ed11d 100644
--- a/boards/uniboard2c/designs/unb2c_minimal/doc/README
+++ b/boards/uniboard2c/designs/unb2c_minimal/doc/README
@@ -28,7 +28,7 @@ Simulation
 ----------
 Modelsim instructions:
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2c
 
     # in Modelsim do:
diff --git a/boards/uniboard2c/designs/unb2c_test/doc/README.txt b/boards/uniboard2c/designs/unb2c_test/doc/README.txt
index 7721fb02fb40a0cd449fca37662d44549324568a..bf6717f0455a3a0f4c15852c188afc86dcafa6d1 100644
--- a/boards/uniboard2c/designs/unb2c_test/doc/README.txt
+++ b/boards/uniboard2c/designs/unb2c_test/doc/README.txt
@@ -53,7 +53,7 @@ The following revisions are available for unb2c_test (see the directories in ../
 Simulation
 ----------
     # in bash do:
-    rm $SIM_DIR/* # (optional)
+    rm -r ${HDL_IOFILE_SIM_DIR}/* # (optional)
     run_modelsim unb2c
 
 Further Modelsim instructions: see the README file in the ../revisions/* directories
diff --git a/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd b/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd
index 7653a297db1aee4c8c3135ee8b1e70c34cfa4612..f46490feb44fd997f9a315dac9eba97d1428790d 100644
--- a/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd
+++ b/libraries/base/mm/tb/vhdl/mm_file_unb_pkg.vhd
@@ -37,7 +37,7 @@ PACKAGE mm_file_unb_pkg IS
   CONSTANT c_mmf_unb_nof_pn          : NATURAL := c_mmf_unb_nof_fn + c_mmf_unb_nof_bn;  -- = 8
   
   -- use fixed central directory to ease use of Python test case with Modelsim
-  CONSTANT c_mmf_unb_file_path       : STRING := "$SIM_DIR/";
+  CONSTANT c_mmf_unb_file_path       : STRING := "$HDL_IOFILE_SIM_DIR/";
   
   -- create mmf file prefix that is unique per slave
   FUNCTION mmf_unb_file_prefix(sys: t_c_mmf_unb_sys; node: NATURAL) RETURN STRING;