Fixed regression with data-view-mode not being saved properly due to manually set #name.