renaming Element to Entity