fixed issue with export error on nil available_on
prepended spree models with ::
merged updates, added prefixes to spree models