Fixed the "shop" <=> "store"-confusion by renaming all "store" etc. to "shop".