Renaming unload to be in sync with load