Fixed worng imports leftover after renaming