Fix deprecated variables for Unite