To facilitate the split, some small changes were made to names of
various structures and functions.