Bit of refactoring/renaming
CRUD for shops