diff --git a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/QmitkPAUSViewerView.cpp b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/QmitkPAUSViewerView.cpp
index b3191afbf9..c5952656d8 100644
--- a/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/QmitkPAUSViewerView.cpp
+++ b/Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/QmitkPAUSViewerView.cpp
@@ -1,155 +1,155 @@
 /*============================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center (DKFZ)
 All rights reserved.
 
 Use of this source code is governed by a 3-clause BSD license that can be
 found in the LICENSE file.
 
 ============================================================================*/
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 #include "mitkScaleLegendAnnotation.h"
 #include "mitkLayoutAnnotationRenderer.h"
 #include "mitkManualPlacementAnnotationRenderer.h"
 #include "mitkTextAnnotation2D.h"
 
 #include "QmitkPAUSViewerView.h"
 
 const std::string QmitkPAUSViewerView::VIEW_ID = "org.mitk.views.photoacoustics.pausviewer";
 
 QmitkPAUSViewerView::QmitkPAUSViewerView() : m_PADataStorage(mitk::StandaloneDataStorage::New()), m_USDataStorage(mitk::StandaloneDataStorage::New()), m_UltrasoundReference(nullptr)
 {
 }
 
 QmitkPAUSViewerView::~QmitkPAUSViewerView()
 {
   if(m_UltrasoundReference != nullptr)
     *m_UltrasoundReference = nullptr;
 }
 
 void QmitkPAUSViewerView::InitWindows()
 {
   AddOverlays();
 }
 
 void QmitkPAUSViewerView::SetFocus()
 {
 }
 
 void QmitkPAUSViewerView::OnSelectionChanged(berry::IWorkbenchPart::Pointer /*source*/,
   const QList<mitk::DataNode::Pointer>& /*nodes*/)
 {
 }
 
 void QmitkPAUSViewerView::CreateQtPartControl(QWidget *parent)
 {
   m_Controls = new Ui::QmitkPAUSViewerViewControls;
   m_Controls->setupUi(parent);
 
   m_Controls->m_PARenderWindow->GetRenderer()->SetDataStorage(m_PADataStorage);
   m_Controls->m_USRenderWindow->GetRenderer()->SetDataStorage(m_USDataStorage);
 }
 
 void QmitkPAUSViewerView::SetPADataStorage(mitk::StandaloneDataStorage::Pointer paStore)
 {
   if (m_Controls == nullptr)
     return;
 
   m_PADataStorage = paStore;
   m_Controls->m_PARenderWindow->GetRenderer()->SetDataStorage(m_PADataStorage);
   m_Controls->m_PALevelWindow->SetDataStorage(m_PADataStorage);
 }
 
 void QmitkPAUSViewerView::SetUSDataStorage(mitk::StandaloneDataStorage::Pointer usStore)
 {
   if (m_Controls == nullptr)
     return;
 
   m_USDataStorage = usStore;
   m_Controls->m_USRenderWindow->GetRenderer()->SetDataStorage(m_USDataStorage);
   m_Controls->m_USLevelWindow->SetDataStorage(m_USDataStorage);
 }
 
 vtkRenderWindow* QmitkPAUSViewerView::GetPARenderWindow()
 {
   if (m_Controls == nullptr)
     return nullptr;
 
-  return m_Controls->m_PARenderWindow->GetRenderWindow();
+  return m_Controls->m_PARenderWindow->renderWindow();
 }
 
 vtkRenderWindow* QmitkPAUSViewerView::GetUSRenderWindow()
 {
   if (m_Controls == nullptr)
     return nullptr;
 
-  return m_Controls->m_USRenderWindow->GetRenderWindow();
+  return m_Controls->m_USRenderWindow->renderWindow();
 }
 
 
 void QmitkPAUSViewerView::AddOverlays()
 {
   //if (m_PARenderer == nullptr || /*m_PAOverlayController == nullptr||*/ m_USRenderer == nullptr /*|| m_USOverlayController == nullptr*/)
   //{
     m_PARenderer = mitk::BaseRenderer::GetInstance(GetPARenderWindow());
     m_USRenderer = mitk::BaseRenderer::GetInstance(GetUSRenderWindow());
   //}
     MITK_INFO << "1111111111111111111111";
   mitk::ScaleLegendAnnotation::Pointer scaleAnnotation = mitk::ScaleLegendAnnotation::New();
   //scaleAnnotation->SetLeftAxisVisibility(true);
   //scaleAnnotation->SetRightAxisVisibility(false);
   //scaleAnnotation->SetRightAxisVisibility(false);
   //scaleAnnotation->SetTopAxisVisibility(false);
   //scaleAnnotation->SetCornerOffsetFactor(0);
   MITK_INFO << "1111111111111111111111";
 
   // Add Overlays
   //![TextAnnotation2D]
   // Create a textAnnotation2D
   mitk::TextAnnotation2D::Pointer textAnnotation = mitk::TextAnnotation2D::New();
 
   textAnnotation->SetText("Test!"); // set UTF-8 encoded text to render
   textAnnotation->SetFontSize(40);
   textAnnotation->SetColor(1, 0, 0); // Set text color to red
   textAnnotation->SetOpacity(0.5);
   MITK_INFO << "1111111111111111111111";
 
   // The position of the Annotation can be set to a fixed coordinate on the display.
   mitk::Point2D pos;
   pos[0] = 10;
   pos[1] = 20;
   textAnnotation->SetPosition2D(pos);
   MITK_INFO << "1111111111111111111111";
 
   std::string rendererID = m_PARenderer->GetName();
 
   // The LayoutAnnotationRenderer can place the TextAnnotation2D at some defined corner positions
   mitk::LayoutAnnotationRenderer::AddAnnotation(
     textAnnotation, rendererID, mitk::LayoutAnnotationRenderer::TopLeft, 5, 5, 1);
   mitk::LayoutAnnotationRenderer::AddAnnotation(
     textAnnotation, m_PARenderer.GetPointer(), mitk::LayoutAnnotationRenderer::TopLeft, 5, 5, 1);
   mitk::ManualPlacementAnnotationRenderer::AddAnnotation(
     textAnnotation, m_PARenderer.GetPointer());
   MITK_INFO << "1111111111111111111111";
 
 
   mitk::LayoutAnnotationRenderer::AddAnnotation(scaleAnnotation.GetPointer(), m_PARenderer->GetName(), mitk::LayoutAnnotationRenderer::TopLeft, 5, 5, 1);
   mitk::LayoutAnnotationRenderer::AddAnnotation(scaleAnnotation.GetPointer(), m_USRenderer, mitk::LayoutAnnotationRenderer::TopLeft, 5, 5, 1);
   MITK_INFO << "1111111111111111111111";
 
 }
 
 void QmitkPAUSViewerView::RemoveOverlays()
 {
  // m_PAOverlayManager->RemoveAllOverlays();
 }
 
 void QmitkPAUSViewerView::SetUltrasoundReference(QmitkPAUSViewerView** ultrasoundReference)
 {
   m_UltrasoundReference = ultrasoundReference;
 }