Replaced instances of shop to base