Revert "Renamed variables ShoppingLib part 2"

This reverts commit a7e929e90dbe5e6b8b4d4e9846e5250b7a96f16c.