Some changes in entity and form names