Finish migration to v2.