diff --git a/src/server/BreCal/validators/validation_rule_functions.py b/src/server/BreCal/validators/validation_rule_functions.py
index 478a7cf..9bb2e94 100644
--- a/src/server/BreCal/validators/validation_rule_functions.py
+++ b/src/server/BreCal/validators/validation_rule_functions.py
@@ -223,7 +223,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_agency_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -251,7 +251,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_agency_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -281,7 +281,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_mooring_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -311,7 +311,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_mooring_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -341,7 +341,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_portadministration_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -371,7 +371,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_portadministration_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -401,7 +401,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_pilot_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -431,7 +431,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_pilot_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -461,7 +461,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_tug_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -491,7 +491,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_tug_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -521,7 +521,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_terminal_berth_eta"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -554,7 +554,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_time_delta_violation_query_time_to_now(query_time=query_time, key_time=key_time, threshold=threshold)
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_missing_time_terminal_berth_etd"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -577,7 +577,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             )
         
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_shipcall_incoming_participants_disagree_on_eta"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -600,7 +600,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
             )
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_shipcall_outgoing_participants_disagree_on_etd"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -637,7 +637,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = (violation_state_eta) or (violation_state_etd)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_shipcall_shifting_participants_disagree_on_eta_or_etd"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -669,7 +669,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = times_terminal.operations_start < times_agency.eta_berth
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_eta_time_not_in_operation_window"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -701,7 +701,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = times_terminal.operations_end > times_agency.etd_berth
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_etd_time_not_in_operation_window"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -729,7 +729,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = not self.time_logic.time_inbetween(query_time=times_agency.eta_berth, start_time=shipcall.tidal_window_from, end_time=shipcall.tidal_window_to)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_eta_time_not_in_tidal_window"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -757,7 +757,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = not self.time_logic.time_inbetween(query_time=times_agency.etd_berth, start_time=shipcall.tidal_window_from, end_time=shipcall.tidal_window_to)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_etd_time_not_in_tidal_window"
             return (StatusFlags.RED, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -778,7 +778,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_unique_shipcall_counts(query, times_agency=times_agency, rounding=rounding, maximum_threshold=maximum_threshold, all_times_agency=all_times_agency)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_too_many_identical_eta_times"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -799,7 +799,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = self.check_unique_shipcall_counts(query, times_agency=times_agency, rounding=rounding, maximum_threshold=maximum_threshold, all_times_agency=all_times_agency)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_too_many_identical_etd_times"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -835,7 +835,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = times_agency.berth_id!=times_terminal.berth_id
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_agency_and_terminal_berth_id_disagreement"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()
@@ -871,7 +871,7 @@ class ValidationRuleFunctions(ValidationRuleBaseFunctions):
         violation_state = bool(times_agency.pier_side)!=bool(times_terminal.pier_side)
 
         if violation_state:
-            validation_name = inspect.currentframe().f_code.co_name
+            validation_name = "validation_rule_fct_agency_and_terminal_pier_side_disagreement"
             return (StatusFlags.YELLOW, validation_name)
         else:
             return self.get_no_violation_default_output()