Mockups: classnames consistency, remove redundant