Fixed import renaming oversights.