Updated deprecated import locations.