Correct label text of access restrictions, reorder storage classes.