Fixed wrong import statements due to automated conversion