diff --git a/hdl/verif/tb_hash_compression.sv b/hdl/verif/tb_hash_compression.sv
index c13dd3625bcb66ffee401fe1ff819a4bb90fdd1f..62bcc099cb36b6dbbb233251353bac3746a6d2ae 100644
--- a/hdl/verif/tb_hash_compression.sv
+++ b/hdl/verif/tb_hash_compression.sv
@@ -168,7 +168,7 @@ module tb_hash_compression;
         data_out_drive_ready = 0;
         
         // Read input data into Queue
-        fd = $fopen("../stimulus/testbench/output_data_builder_stim.csv", "r");
+        fd = $fopen("../stimulus/testbench/inout_message_block_stim_ref.csv", "r");
         while ($fscanf (fd, "%x,%b", input_data, input_data_last) == 2) begin
             data_in_queue.push_back(input_data);
             data_in_last_queue.push_back(input_data_last);
@@ -176,7 +176,7 @@ module tb_hash_compression;
         $fclose(fd);
         
         // Read output data into Queue
-        fd = $fopen("../stimulus/testbench/output_data_hash_stim.csv", "r");
+        fd = $fopen("../stimulus/testbench/output_hash_ref.csv", "r");
         while ($fscanf (fd, "%x,%b", output_data, output_data_last) == 2) begin
             data_out_queue.push_back(output_data);
             data_out_last_queue.push_back(output_data_last);
diff --git a/hdl/verif/tb_message_build.sv b/hdl/verif/tb_message_build.sv
index 70f6e4b7d9e52f7ef30726b16083c8af2eb7e39b..0ec9b7c20eadc1cdc042d2563b5d176ab6328532 100644
--- a/hdl/verif/tb_message_build.sv
+++ b/hdl/verif/tb_message_build.sv
@@ -190,7 +190,7 @@ module tb_message_build;
         data_out_drive_ready = 0;
         
         // Read input data into Queue
-        fd = $fopen("../stimulus/testbench/input_data_builder_stim.csv", "r");
+        fd = $fopen("../stimulus/testbench/input_data_stim.csv", "r");
         while ($fscanf (fd, "%x,%b", input_data, input_data_last) == 2) begin
             data_in_queue.push_back(input_data);
             data_in_last_queue.push_back(input_data_last);
@@ -198,7 +198,7 @@ module tb_message_build;
         $fclose(fd);
         
         // Read input cfg into Queue
-        fd = $fopen("../stimulus/testbench/input_cfg_builder_stim.csv", "r");
+        fd = $fopen("../stimulus/testbench/input_cfg_stim.csv", "r");
         while ($fscanf (fd, "%x,%x,%b", input_cfg_size, input_cfg_scheme, input_cfg_last) == 3) begin
             cfg_size_queue.push_back(input_cfg_size);
             cfg_scheme_queue.push_back(input_cfg_scheme);
@@ -207,7 +207,7 @@ module tb_message_build;
         $fclose(fd);
         
         // Read output data into Queue
-        fd = $fopen("../stimulus/testbench/output_data_builder_stim.csv", "r");
+        fd = $fopen("../stimulus/testbench/inout_message_block_stim_ref.csv", "r");
         while ($fscanf (fd, "%x,%b", output_data, output_data_last) == 2) begin
             data_out_queue.push_back(output_data);
             data_out_last_queue.push_back(output_data_last);
diff --git a/model/py/hash_model.py b/model/py/hash_model.py
index 0ceda930ed02386b2de712544a6dbd470ceb8765..4aa8702b9ce4854303acf0131eafb34b2cb76a85 100644
--- a/model/py/hash_model.py
+++ b/model/py/hash_model.py
@@ -22,7 +22,7 @@ def main():
         quit()
     # Read in Descriptor File
     # - contains number of packets of data to generate and random seed
-    stim_file = os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/model/" + "model_builder_stim.csv"
+    stim_file = os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/model/" + "model_stim.csv"
     with open(stim_file, "r") as stim:
         csvreader = csv.reader(stim, delimiter=",")
         stim_list = list(csvreader)
@@ -91,28 +91,28 @@ def main():
 
     # Write out Input Data Stimulus to Text File
     input_header = ["input_data", "input_data_last"]
-    with open(os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/testbench/" + "input_data_builder_stim.csv", "w", encoding="UTF8", newline='') as f:
+    with open(os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/testbench/" + "input_data_stim.csv", "w", encoding="UTF8", newline='') as f:
         writer = csv.writer(f)
         for idx, word in enumerate(in_data_words_list):
             writer.writerow(["{0:x}".format(int(word, 2)), in_data_words_last_list[idx]])
             
     # Write out Cfg Stimulus to Text File
     input_header = ["input_cfg_size", "input_cfg_scheme", "input_cfg_last"]
-    with open(os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/testbench/" + "input_cfg_builder_stim.csv", "w", encoding="UTF8", newline='') as f:
+    with open(os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/testbench/" + "input_cfg_stim.csv", "w", encoding="UTF8", newline='') as f:
         writer = csv.writer(f)
         for idx, word in enumerate(cfg_words_list):
             writer.writerow(["{0:x}".format(int(word, 2)), "0", "1"])
             
     # Write out Expected output to text file
     output_header = ["output_data", "output_data_last"]
-    with open(os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/testbench/" + "output_data_builder_stim.csv", "w", encoding="UTF8", newline='') as f:
+    with open(os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/testbench/" + "inout_message_block_stim_ref.csv", "w", encoding="UTF8", newline='') as f:
         writer = csv.writer(f)
         for idx, word in enumerate(out_data_words_list):
             writer.writerow(["{0:x}".format(int(word, 2)), out_data_words_last_list[idx]])
     
     # Write out hash value to text file
     output_header = ["output_data", "output_data_last"]
-    with open(os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/testbench/" + "output_data_hash_stim.csv", "w", encoding="UTF8", newline='') as f:
+    with open(os.environ["SHA_2_ACC_DIR"] + "/simulate/stimulus/testbench/" + "output_hash_ref.csv", "w", encoding="UTF8", newline='') as f:
         writer = csv.writer(f)
         for idx, word in enumerate(hash_list):
             writer.writerow([word, "1"])
diff --git a/simulate/sim/.DS_Store b/simulate/sim/.DS_Store
index 5889eb539cf119a200352029a18ab2ec0951d095..9fdb14b4b0f5892a63e2bbe07d8809e48be05fec 100644
Binary files a/simulate/sim/.DS_Store and b/simulate/sim/.DS_Store differ
diff --git a/simulate/stimulus/model/model_builder_stim.csv b/simulate/stimulus/model/model_stim.csv
similarity index 100%
rename from simulate/stimulus/model/model_builder_stim.csv
rename to simulate/stimulus/model/model_stim.csv
diff --git a/simulate/stimulus/testbench/output_data_builder_stim.csv b/simulate/stimulus/testbench/inout_message_block_stim_ref.csv
similarity index 100%
rename from simulate/stimulus/testbench/output_data_builder_stim.csv
rename to simulate/stimulus/testbench/inout_message_block_stim_ref.csv
diff --git a/simulate/stimulus/testbench/input_cfg_builder_stim.csv b/simulate/stimulus/testbench/input_cfg_stim.csv
similarity index 100%
rename from simulate/stimulus/testbench/input_cfg_builder_stim.csv
rename to simulate/stimulus/testbench/input_cfg_stim.csv
diff --git a/simulate/stimulus/testbench/input_data_builder_stim.csv b/simulate/stimulus/testbench/input_data_stim.csv
similarity index 100%
rename from simulate/stimulus/testbench/input_data_builder_stim.csv
rename to simulate/stimulus/testbench/input_data_stim.csv
diff --git a/simulate/stimulus/testbench/output_data_hash_stim.csv b/simulate/stimulus/testbench/output_hash_ref.csv
similarity index 100%
rename from simulate/stimulus/testbench/output_data_hash_stim.csv
rename to simulate/stimulus/testbench/output_hash_ref.csv