I don't think it matters either way. Regardless (I'll continue to make the comments here than in #64), I think you should use the new names (FieldData, Field vs ModelData, ModelType) after the bullets where you declare that you've changed their names.