rename & add scope imports