Renaming: Reindexing service
- plus some bits on other places