diff --git a/companion/src/simulation/CMakeLists.txt b/companion/src/simulation/CMakeLists.txt
index 0b6ad1f2d4..c1566830cc 100644
--- a/companion/src/simulation/CMakeLists.txt
+++ b/companion/src/simulation/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(simulation_SRCS
   debugoutput.cpp
   radiooutputswidget.cpp
-  simulatordialog.cpp
   simulateduiwidget.cpp
   simulateduiwidget9X.cpp
   simulateduiwidgetX7.cpp
@@ -11,6 +10,7 @@ set(simulation_SRCS
   simulatorinterface.cpp
   simulatormainwindow.cpp
   simulatorstartupdialog.cpp
+  simulatorwidget.cpp
   telemetrysimu.cpp
   trainersimu.cpp
   widgets/radiowidget.cpp
@@ -20,7 +20,6 @@ set(simulation_SRCS
 set(simulation_UIS
   debugoutput.ui
   radiooutputswidget.ui
-  simulatordialog.ui
   simulateduiwidget9X.ui
   simulateduiwidgetX7.ui
   simulateduiwidgetX9.ui
@@ -28,6 +27,7 @@ set(simulation_UIS
   simulateduiwidgetX12.ui
   simulatormainwindow.ui
   simulatorstartupdialog.ui
+  simulatorwidget.ui
   telemetrysimu.ui
   trainersimu.ui
 )
@@ -38,9 +38,9 @@ set(simulation_HDRS
   radiouiaction.h
   simulateduiwidget.h
   # simulator.h
-  simulatordialog.h
   simulatormainwindow.h
   simulatorstartupdialog.h
+  simulatorwidget.h
   telemetrysimu.h
   trainersimu.h
   widgets/buttonswidget.h
diff --git a/companion/src/simulation/simulateduiwidget.h b/companion/src/simulation/simulateduiwidget.h
index a894427cc8..dba6e7435b 100644
--- a/companion/src/simulation/simulateduiwidget.h
+++ b/companion/src/simulation/simulateduiwidget.h
@@ -21,8 +21,9 @@
 #ifndef SIMULATEDUIWIDGET_H
 #define SIMULATEDUIWIDGET_H
 
+#include "boards.h"
 #include "constants.h"
-#include "simulatordialog.h"
+#include "simulator.h"
 
 #include <QWidget>
 #include <QMouseEvent>
diff --git a/companion/src/simulation/simulatormainwindow.cpp b/companion/src/simulation/simulatormainwindow.cpp
index acaab27aad..1b46f1b680 100644
--- a/companion/src/simulation/simulatormainwindow.cpp
+++ b/companion/src/simulation/simulatormainwindow.cpp
@@ -24,7 +24,7 @@
 #include "appdata.h"
 #include "debugoutput.h"
 #include "radiooutputswidget.h"
-#include "simulatordialog.h"
+#include "simulatorwidget.h"
 #include "simulatorinterface.h"
 #include "telemetrysimu.h"
 #include "trainersimu.h"
@@ -63,7 +63,7 @@ SimulatorMainWindow::SimulatorMainWindow(QWidget *parent, SimulatorInterface * s
   setCorner(Qt::TopRightCorner, Qt::RightDockWidgetArea);
   setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea);
 
-  m_simulatorWidget = new SimulatorDialog(this, m_simulator, flags);
+  m_simulatorWidget = new SimulatorWidget(this, m_simulator, flags);
   setWindowTitle(m_simulatorWidget->windowTitle());
 
   toggleRadioDocked(true);
@@ -116,9 +116,9 @@ SimulatorMainWindow::SimulatorMainWindow(QWidget *parent, SimulatorInterface * s
   connect(ui->actionFixedRadioHeight, &QAction::toggled, this, &SimulatorMainWindow::showRadioFixedHeight);
   connect(ui->actionDockRadio, &QAction::toggled, this, &SimulatorMainWindow::showRadioDocked);
   if (m_simulatorWidget) {
-    connect(ui->actionScreenshot, &QAction::triggered, m_simulatorWidget, &SimulatorDialog::captureScreenshot);
-    connect(ui->actionReloadRadioData, &QAction::triggered, m_simulatorWidget, &SimulatorDialog::restart);
-    connect(m_simulatorWidget, &SimulatorDialog::windowTitleChanged, this, &SimulatorMainWindow::setWindowTitle);
+    connect(ui->actionScreenshot, &QAction::triggered, m_simulatorWidget, &SimulatorWidget::captureScreenshot);
+    connect(ui->actionReloadRadioData, &QAction::triggered, m_simulatorWidget, &SimulatorWidget::restart);
+    connect(m_simulatorWidget, &SimulatorWidget::windowTitleChanged, this, &SimulatorMainWindow::setWindowTitle);
   }
   if (m_outputsWidget)
     connect(ui->actionReloadRadioData, &QAction::triggered, m_outputsWidget, &RadioOutputsWidget::restart);
@@ -411,7 +411,7 @@ void SimulatorMainWindow::toggleRadioDocked(bool dock)
       m_simulatorDockWidget->move(newPos);
     }
 
-    connect(m_simulatorWidget, &SimulatorDialog::windowTitleChanged, m_simulatorDockWidget, &QDockWidget::setWindowTitle);
+    connect(m_simulatorWidget, &SimulatorWidget::windowTitleChanged, m_simulatorDockWidget, &QDockWidget::setWindowTitle);
     connect(m_simulatorDockWidget, &QDockWidget::topLevelChanged, [this](bool top) {
       showRadioDocked(!top);
     });
diff --git a/companion/src/simulation/simulatormainwindow.h b/companion/src/simulation/simulatormainwindow.h
index c69e74512f..a63982bd6d 100644
--- a/companion/src/simulation/simulatormainwindow.h
+++ b/companion/src/simulation/simulatormainwindow.h
@@ -30,7 +30,7 @@
 class DebugOutput;
 class RadioData;
 class RadioOutputsWidget;
-class SimulatorDialog;
+class SimulatorWidget;
 class SimulatorInterface;
 class TrainerSimulator;
 class TelemetrySimulator;
@@ -84,7 +84,7 @@ class SimulatorMainWindow : public QMainWindow
     SimulatorInterface  * m_simulator;
 
     Ui::SimulatorMainWindow * ui;
-    SimulatorDialog * m_simulatorWidget;
+    SimulatorWidget * m_simulatorWidget;
     DebugOutput * m_consoleWidget;
     RadioOutputsWidget * m_outputsWidget;
 
diff --git a/companion/src/simulation/simulatordialog.cpp b/companion/src/simulation/simulatorwidget.cpp
similarity index 92%
rename from companion/src/simulation/simulatordialog.cpp
rename to companion/src/simulation/simulatorwidget.cpp
index 0d2cb62a5b..6eb9eadfdf 100644
--- a/companion/src/simulation/simulatordialog.cpp
+++ b/companion/src/simulation/simulatorwidget.cpp
@@ -18,8 +18,8 @@
  * GNU General Public License for more details.
  */
 
-#include "simulatordialog.h"
-#include "ui_simulatordialog.h"
+#include "simulatorwidget.h"
+#include "ui_simulatorwidget.h"
 
 #include "appdata.h"
 #include "radiofaderwidget.h"
@@ -40,9 +40,9 @@
 #include <QFile>
 #include <iostream>
 
-SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator, quint8 flags):
+SimulatorWidget::SimulatorWidget(QWidget * parent, SimulatorInterface *simulator, quint8 flags):
   QWidget(parent),
-  ui(new Ui::SimulatorDialog),
+  ui(new Ui::SimulatorWidget),
   simulator(simulator),
   firmware(getCurrentFirmware()),
   radioSettings(GeneralSettings()),
@@ -103,7 +103,7 @@ SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator
   radioUiWidget->setFocusPolicy(Qt::WheelFocus);
   radioUiWidget->setFocus();
 
-  connect(radioUiWidget, &SimulatedUIWidget::customStyleRequest, this, &SimulatorDialog::setUiAreaStyle);
+  connect(radioUiWidget, &SimulatedUIWidget::customStyleRequest, this, &SimulatorWidget::setUiAreaStyle);
 
   vJoyLeft = new VirtualJoystickWidget(this, 'L');
   ui->leftStickLayout->addWidget(vJoyLeft);
@@ -120,7 +120,7 @@ SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator
   connect(vJoyRight, SIGNAL(trimSliderMoved(int,int)), this, SLOT(onTrimSliderMoved(int,int)));
 }
 
-SimulatorDialog::~SimulatorDialog()
+SimulatorWidget::~SimulatorWidget()
 {
   shutdown();
 
@@ -148,17 +148,17 @@ SimulatorDialog::~SimulatorDialog()
  * Public slots/setters
  */
 
-void SimulatorDialog::setSdPath(const QString & sdPath)
+void SimulatorWidget::setSdPath(const QString & sdPath)
 {
   setPaths(sdPath, radioDataPath);
 }
 
-void SimulatorDialog::setDataPath(const QString & dataPath)
+void SimulatorWidget::setDataPath(const QString & dataPath)
 {
   setPaths(sdCardPath, dataPath);
 }
 
-void SimulatorDialog::setPaths(const QString & sdPath, const QString & dataPath)
+void SimulatorWidget::setPaths(const QString & sdPath, const QString & dataPath)
 {
   sdCardPath = sdPath;
   radioDataPath = dataPath;
@@ -166,7 +166,7 @@ void SimulatorDialog::setPaths(const QString & sdPath, const QString & dataPath)
     simulator->setSdPath(sdPath, dataPath);
 }
 
-void SimulatorDialog::setRadioSettings(const GeneralSettings settings)
+void SimulatorWidget::setRadioSettings(const GeneralSettings settings)
 {
   radioSettings = settings;
 }
@@ -181,7 +181,7 @@ void SimulatorDialog::setRadioSettings(const GeneralSettings settings)
  *   with the same data when start() is called.
  * If you already have a valid RadioData structure, call setRadioData() instead.
  */
-bool SimulatorDialog::setStartupData(const QByteArray & dataSource, bool fromFile)
+bool SimulatorWidget::setStartupData(const QByteArray & dataSource, bool fromFile)
 {
   RadioData simuData;
   quint16 ret = 1;
@@ -246,7 +246,7 @@ bool SimulatorDialog::setStartupData(const QByteArray & dataSource, bool fromFil
   return true;
 }
 
-bool SimulatorDialog::setRadioData(RadioData * radioData)
+bool SimulatorWidget::setRadioData(RadioData * radioData)
 {
   bool ret = true;
 
@@ -273,7 +273,7 @@ bool SimulatorDialog::setRadioData(RadioData * radioData)
   return ret;
 }
 
-bool SimulatorDialog::setOptions(SimulatorOptions & options, bool withSave)
+bool SimulatorWidget::setOptions(SimulatorOptions & options, bool withSave)
 {
   bool ret = false;
 
@@ -301,7 +301,7 @@ bool SimulatorDialog::setOptions(SimulatorOptions & options, bool withSave)
   return ret;
 }
 
-bool SimulatorDialog::saveRadioData(RadioData * radioData, const QString & path, QString * error)
+bool SimulatorWidget::saveRadioData(RadioData * radioData, const QString & path, QString * error)
 {
   QString dir = path;
   if (dir.isEmpty())
@@ -318,7 +318,7 @@ bool SimulatorDialog::saveRadioData(RadioData * radioData, const QString & path,
   return false;
 }
 
-bool SimulatorDialog::useTempDataPath(bool deleteOnClose)
+bool SimulatorWidget::useTempDataPath(bool deleteOnClose)
 {
   if (deleteTempRadioData)
     deleteTempData();
@@ -338,7 +338,7 @@ bool SimulatorDialog::useTempDataPath(bool deleteOnClose)
 }
 
 // This will save radio data from temporary folder structure back into an .otx file, eg. for Horus.
-bool SimulatorDialog::saveTempData()
+bool SimulatorWidget::saveTempData()
 {
   bool ret = false;
   QString error;
@@ -390,7 +390,7 @@ bool SimulatorDialog::saveTempData()
   return ret;
 }
 
-void SimulatorDialog::deleteTempData()
+void SimulatorWidget::deleteTempData()
 {
   if (!radioDataPath.isEmpty()) {
     QDir tpath(radioDataPath);
@@ -400,7 +400,7 @@ void SimulatorDialog::deleteTempData()
   }
 }
 
-void SimulatorDialog::saveState()
+void SimulatorWidget::saveState()
 {
   SimulatorOptions opts = g.profile[radioProfileId].simulatorOptions();
   //opts.windowGeometry = saveGeometry();
@@ -408,12 +408,12 @@ void SimulatorDialog::saveState()
   g.profile[radioProfileId].simulatorOptions(opts);
 }
 
-void SimulatorDialog::setUiAreaStyle(const QString & style)
+void SimulatorWidget::setUiAreaStyle(const QString & style)
 {
   setStyleSheet(style);
 }
 
-void SimulatorDialog::captureScreenshot(bool)
+void SimulatorWidget::captureScreenshot(bool)
 {
   if (radioUiWidget)
     radioUiWidget->captureScreenshot();
@@ -423,7 +423,7 @@ void SimulatorDialog::captureScreenshot(bool)
  * Startup
  */
 
-void SimulatorDialog::start()
+void SimulatorWidget::start()
 {
   setupRadioWidgets();
   setupJoysticks();
@@ -441,7 +441,7 @@ void SimulatorDialog::start()
   setupTimer();
 }
 
-void SimulatorDialog::stop()
+void SimulatorWidget::stop()
 {
   timer->stop();
   simulator->stop();
@@ -451,7 +451,7 @@ void SimulatorDialog::stop()
   }
 }
 
-void SimulatorDialog::restart()
+void SimulatorWidget::restart()
 {
   stop();
   saveState();
@@ -459,7 +459,7 @@ void SimulatorDialog::restart()
   start();
 }
 
-void SimulatorDialog::shutdown()
+void SimulatorWidget::shutdown()
 {
   stop();
   saveState();
@@ -473,14 +473,14 @@ void SimulatorDialog::shutdown()
  * Setup
  */
 
-void SimulatorDialog::setRadioProfileId(int value)
+void SimulatorWidget::setRadioProfileId(int value)
 {
   radioProfileId = value;
   if (simulator)
     simulator->setVolumeGain(g.profile[radioProfileId].volumeGain());
 }
 
-void SimulatorDialog::setupRadioWidgets()
+void SimulatorWidget::setupRadioWidgets()
 {
   int i, midpos, aIdx;
   QString wname;
@@ -572,7 +572,7 @@ void SimulatorDialog::setupRadioWidgets()
   }
 }
 
-void SimulatorDialog::setupJoysticks()
+void SimulatorWidget::setupJoysticks()
 {
 #ifdef JOYSTICKS
   static bool joysticksEnabled = false;
@@ -627,7 +627,7 @@ void SimulatorDialog::setupJoysticks()
 #endif
 }
 
-void SimulatorDialog::setupTimer()
+void SimulatorWidget::setupTimer()
 {
   if (timer) {
     timer->stop();
@@ -643,7 +643,7 @@ void SimulatorDialog::setupTimer()
   timer->start(10);
 }
 
-void SimulatorDialog::restoreRadioWidgetsState()
+void SimulatorWidget::restoreRadioWidgetsState()
 {
   RadioWidget::RadioWidgetState state;
   QMap<int, QByteArray> switchesMap;
@@ -680,7 +680,7 @@ void SimulatorDialog::restoreRadioWidgetsState()
   }
 }
 
-QList<QByteArray> SimulatorDialog::saveRadioWidgetsState()
+QList<QByteArray> SimulatorWidget::saveRadioWidgetsState()
 {
   QList<QByteArray> states;
 
@@ -698,7 +698,7 @@ QList<QByteArray> SimulatorDialog::saveRadioWidgetsState()
  */
 
 // Read various values from firmware simulator and populate values in this UI
-void SimulatorDialog::setValues()
+void SimulatorWidget::setValues()
 {
   int currentPhase = simulator->getPhase();
 
@@ -713,7 +713,7 @@ void SimulatorDialog::setValues()
 }
 
 // "get" values from this UI and send them to the firmware simulator.
-void SimulatorDialog::getValues()
+void SimulatorWidget::getValues()
 {
   static const int numTrims  = firmware->getCapability(NumTrimSwitches);
   int i;
@@ -747,7 +747,7 @@ void SimulatorDialog::getValues()
 }
 
 // Read stick trim values from firmware simulator and set joystick widgets as needed.
-void SimulatorDialog::setTrims()
+void SimulatorWidget::setTrims()
 {
   typedef VirtualJoystickWidget VJW;
   static Trims lastTrims;
@@ -792,25 +792,25 @@ void SimulatorDialog::setTrims()
 //{
 //}
 
-void SimulatorDialog::mousePressEvent(QMouseEvent *event)
+void SimulatorWidget::mousePressEvent(QMouseEvent *event)
 {
   if (radioUiWidget)
     radioUiWidget->mousePressEvent(event);
 }
 
-void SimulatorDialog::mouseReleaseEvent(QMouseEvent *event)
+void SimulatorWidget::mouseReleaseEvent(QMouseEvent *event)
 {
   if (radioUiWidget)
     radioUiWidget->mouseReleaseEvent(event);
 }
 
-void SimulatorDialog::wheelEvent(QWheelEvent *event)
+void SimulatorWidget::wheelEvent(QWheelEvent *event)
 {
   if (radioUiWidget)
     radioUiWidget->wheelEvent(event);
 }
 
-void SimulatorDialog::onTimerEvent()
+void SimulatorWidget::onTimerEvent()
 {
   static unsigned int lcd_counter = 0;
 
@@ -829,22 +829,22 @@ void SimulatorDialog::onTimerEvent()
   }
 }
 
-void SimulatorDialog::onTrimPressed(int which)
+void SimulatorWidget::onTrimPressed(int which)
 {
   trimPressed = which;
 }
 
-void SimulatorDialog::onTrimReleased()
+void SimulatorWidget::onTrimReleased()
 {
   trimPressed = TRIM_NONE;
 }
 
-void SimulatorDialog::onTrimSliderMoved(int which, int value)
+void SimulatorWidget::onTrimSliderMoved(int which, int value)
 {
   simulator->setTrim(which, value);
 }
 
-void SimulatorDialog::centerSticks()
+void SimulatorWidget::centerSticks()
 {
   if (vJoyLeft)
     vJoyLeft->centerStick();
@@ -853,7 +853,7 @@ void SimulatorDialog::centerSticks()
     vJoyRight->centerStick();
 }
 
-void SimulatorDialog::onjoystickAxisValueChanged(int axis, int value)
+void SimulatorWidget::onjoystickAxisValueChanged(int axis, int value)
 {
 #ifdef JOYSTICKS
   int stick;
diff --git a/companion/src/simulation/simulatordialog.h b/companion/src/simulation/simulatorwidget.h
similarity index 93%
rename from companion/src/simulation/simulatordialog.h
rename to companion/src/simulation/simulatorwidget.h
index 75f2be1f99..69e798ec37 100644
--- a/companion/src/simulation/simulatordialog.h
+++ b/companion/src/simulation/simulatorwidget.h
@@ -18,8 +18,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _SIMULATORDIALOG_H_
-#define _SIMULATORDIALOG_H_
+#ifndef _SIMULATORWIDGET_H_
+#define _SIMULATORWIDGET_H_
 
 #include "constants.h"
 #include "helpers.h"
@@ -52,18 +52,18 @@ class QLabel;
 class QFrame;
 
 namespace Ui {
-  class SimulatorDialog;
+  class SimulatorWidget;
 }
 
 using namespace Simulator;
 
-class SimulatorDialog : public QWidget
+class SimulatorWidget : public QWidget
 {
   Q_OBJECT
 
   public:
-    explicit SimulatorDialog(QWidget * parent, SimulatorInterface *simulator, quint8 flags=0);
-    virtual ~SimulatorDialog();
+    explicit SimulatorWidget(QWidget * parent, SimulatorInterface *simulator, quint8 flags=0);
+    virtual ~SimulatorWidget();
 
     void setSdPath(const QString & sdPath);
     void setDataPath(const QString & dataPath);
@@ -103,7 +103,7 @@ class SimulatorDialog : public QWidget
     void setTrims();
 
 
-    Ui::SimulatorDialog * ui;
+    Ui::SimulatorWidget * ui;
     SimulatorInterface * simulator;
     Firmware * firmware;
     GeneralSettings radioSettings;
@@ -156,4 +156,4 @@ class SimulatorDialog : public QWidget
 
 };
 
-#endif // _SIMULATORDIALOG_H_
+#endif // _SIMULATORWIDGET_H_
diff --git a/companion/src/simulation/simulatordialog.ui b/companion/src/simulation/simulatorwidget.ui
similarity index 99%
rename from companion/src/simulation/simulatordialog.ui
rename to companion/src/simulation/simulatorwidget.ui
index a4862824ea..21088103ca 100644
--- a/companion/src/simulation/simulatordialog.ui
+++ b/companion/src/simulation/simulatorwidget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>SimulatorDialog</class>
- <widget class="QWidget" name="SimulatorDialog">
+ <class>SimulatorWidget</class>
+ <widget class="QWidget" name="SimulatorWidget">
   <property name="geometry">
    <rect>
     <x>0</x>