Introduce model_naming if available