Renamed all table representations to Entity representations.
Merge branch 'develop'