(refactor) Change factory names to singular version to accurately match usage (e.g. 'Restaurants' to 'Restaurant')