Renamed variables ShoppingLib part 2...