new names for view-link classes
merge