Renaming of nodes/edges + Better selection