Added automatic check of activity, rename attributes in Model.xcdatamodel