Refactored Bundle name from shop to retriever