rename some imports after update