Rename test related resources to be with the bundle name, instead of entity name