Adding form to ClassDiagram
Sweeping renaming in Model