Some refactorings of split and one rename