Adjust imports to modern conventions