Some renaming in split()

Naming suggested by jundery.

No functional change.