Renamed view objects more appropriately.