Some renaming and revision of saving/loading.