renaming and refactoring index definition and persistence mapping