Fix changed names of imports