Renaming: Reindexing tasks
- plus some bits in persistence.service.*