Fixing imports from package renaming.