Changed naming from object to entity
Merge remote-tracking branch 'origin/master'