renaming, refactorings and small changes in persistence