Added code from the behaviors_name_errors branch