Small restructuring of names