Unify usage of GUID and name when possible. Updated main window menu.