maha | Renaming an entity.
maha | fixing sub forms bug