rework Dealer namespacing