fix naming issue, and only pull in spree ~>2.0.0