Changed name of 'shopkeeper' to keep in line with naming scheme