Renamed relationship to entity
Revert "Renamed relationship to entity"

This reverts commit 04a9fc39aa1a4cb627469b14cda07c58ab8ba7c5.
Revert "Revert "Renamed relationship to entity""

This reverts commit de8dc37651fae6bc7d96e8743a92552cd1f0d318.