Use state_var_of_original_name here