Refactoring, rename *store* to *repository*
Comments