renamed entity
Lot of changes for issue #1729