renamed Identifiable to Entity and BasePersistentObject to EntitySupport