Some better naming of top level assistants, use the naming in GUI.