PLFM-1760 Replace entity name with entity id for entities in the trash c...

...an to avoid name conflict