Move org save to after variant names are asserted. Doh