Update import paths from latest upstream.