Feature/graphical rename