change imports for new names