Rename Viewport property to CurrentViewport