I agree though that the handling of resource / entity / object / resourceType / entityType / objectType / persistentEntity needs some revisiting and work.