Editing name handling all over