rename the toplevel as per the suggestions