diff --git a/core/app/models/spree/variant.rb b/core/app/models/spree/variant.rb
index 9c8973e6882..aad8bbaf625 100644
--- a/core/app/models/spree/variant.rb
+++ b/core/app/models/spree/variant.rb
@@ -398,7 +398,7 @@ def variant_properties
     # The gallery for the variant, which represents all the images
     # associated with it
     #
-    # @return [Spree::Gallery] the media for a variant
+    # @return [Spree::Config.variant_gallery_class] the media for a variant
     def gallery
       @gallery ||= Spree::Config.variant_gallery_class.new(self)
     end
diff --git a/core/lib/spree/app_configuration.rb b/core/lib/spree/app_configuration.rb
index d24ec420033..9080e72168d 100644
--- a/core/lib/spree/app_configuration.rb
+++ b/core/lib/spree/app_configuration.rb
@@ -412,14 +412,14 @@ def payment_canceller
     # @!attribute [rw] variant_gallery_class
     # @return [Class] a class that implements an `images` method and returns an
     # Enumerable of images adhering to the present_image_class interface
-    class_name_attribute :variant_gallery_class, default: 'Spree::Gallery::VariantGallery'
+    class_name_attribute :variant_gallery_class, default: 'SolidusPaperclip::Gallery::Variant'
 
     # Allows providing your own class for image galleries on Products
     #
     # @!attribute [rw] product_gallery_class
     # @return [Class] a class that implements an `images` method and returns an
     # Enumerable of images adhering to the present_image_class interface
-    class_name_attribute :product_gallery_class, default: 'Spree::Gallery::ProductGallery'
+    class_name_attribute :product_gallery_class, default: 'SolidusPaperclip::Gallery::Product'
 
     # Allows providing your own class instance for generating order numbers.
     #