Do not add `Model` suffix to the generated model filename (see #6084)