Correct remaining old import locations