Fix build names.
Drop a few "opinsys" from classnames.