Applied model_name fix to refactor