fixed some errors in the imports after renaming