Some renaming in split()