Fixed MockPersistence to handle rename correctly