modules: make names unique

71 files changed, 335 insertions, 335 deletions

diff --git a/filter-accela/ftnoir_accela_filtercontrols.ui b/filter-accela/ftnoir_accela_filtercontrols.ui
index 5509bd3f..4ed91099 100644
--- a/filter-accela/ftnoir_accela_filtercontrols.ui
+++ b/filter-accela/ftnoir_accela_filtercontrols.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AccelaUICFilterControls</class>
- <widget class="QWidget" name="AccelaUICFilterControls">
+ <class>AccelaUICdialog_accela</class>
+ <widget class="QWidget" name="AccelaUICdialog_accela">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/filter-accela/ftnoir_filter_accela.cpp b/filter-accela/ftnoir_filter_accela.cpp
index c0f355a4..4fec74b2 100644
--- a/filter-accela/ftnoir_filter_accela.cpp
+++ b/filter-accela/ftnoir_filter_accela.cpp
@@ -14,12 +14,12 @@
 constexpr double settings_accela::rot_gains[16][2];
 constexpr double settings_accela::trans_gains[16][2];
 
-FTNoIR_Filter::FTNoIR_Filter() : first_run(true)
+accela::accela() : first_run(true)
 {
     s.make_splines(rot, trans);
 }
 
-void FTNoIR_Filter::filter(const double* input, double *output)
+void accela::filter(const double* input, double *output)
 {
     if (first_run)
     {
@@ -96,5 +96,5 @@ void settings_accela::make_splines(spline& rot, spline& trans)
         trans.addPoint(QPointF(trans_gains[i][0], trans_gains[i][1]));
 }
 
-OPENTRACK_DECLARE_FILTER(FTNoIR_Filter, FilterControls, FTNoIR_FilterDll)
+OPENTRACK_DECLARE_FILTER(accela, dialog_accela, accelaDll)
 
diff --git a/filter-accela/ftnoir_filter_accela.h b/filter-accela/ftnoir_filter_accela.h
index d03dd155..67cba49e 100644
--- a/filter-accela/ftnoir_filter_accela.h
+++ b/filter-accela/ftnoir_filter_accela.h
@@ -14,10 +14,10 @@
 #include <QMutex>
 #include <QTimer>
 
-class FTNoIR_Filter : public IFilter
+class accela : public IFilter
 {
 public:
-    FTNoIR_Filter();
+    accela();
     void filter(const double* input, double *output) override;
     void center() override { first_run = true; }
     spline rot, trans;
@@ -35,15 +35,15 @@ private:
     }
 };
 
-class FilterControls: public IFilterDialog
+class dialog_accela: public IFilterDialog
 {
     Q_OBJECT
 public:
-    FilterControls();
+    dialog_accela();
     void register_filter(IFilter*) override {}
     void unregister_filter() override {}
 private:
-    Ui::AccelaUICFilterControls ui;
+    Ui::AccelaUICdialog_accela ui;
     void save();
     settings_accela s;
 private slots:
@@ -57,7 +57,7 @@ private slots:
     void update_rot_nl_slider(const slider_value& sl);
 };
 
-class FTNoIR_FilterDll : public Metadata
+class accelaDll : public Metadata
 {
 public:
     QString name() { return QString("Accela"); }
diff --git a/filter-accela/ftnoir_filter_accela_dialog.cpp b/filter-accela/ftnoir_filter_accela_dialog.cpp
index c8262dd5..79db1ffa 100644
--- a/filter-accela/ftnoir_filter_accela_dialog.cpp
+++ b/filter-accela/ftnoir_filter_accela_dialog.cpp
@@ -13,7 +13,7 @@
 #include "spline-widget/spline-widget.hpp"
 #include <QDialog>
 
-FilterControls::FilterControls()
+dialog_accela::dialog_accela()
 {
     ui.setupUi(this);
 
@@ -70,18 +70,18 @@ FilterControls::FilterControls()
     }
 }
 
-void FilterControls::doOK()
+void dialog_accela::doOK()
 {
     save();
     close();
 }
 
-void FilterControls::doCancel()
+void dialog_accela::doCancel()
 {
     close();
 }
 
-void FilterControls::save()
+void dialog_accela::save()
 {
     s.b->save();
 }
@@ -89,34 +89,34 @@ void FilterControls::save()
 #define FIELD(x, a) ((a).arg(((x).cur()), 0, 'g', 4))
 #define LIT(x) QStringLiteral(x)
 
-void FilterControls::update_rot_display(const slider_value& val)
+void dialog_accela::update_rot_display(const slider_value& val)
 {
     static const QString str(QString::fromUtf8("%1°"));
     ui.rot_gain->setText(FIELD(val, str));
 }
 
-void FilterControls::update_trans_display(const slider_value& val)
+void dialog_accela::update_trans_display(const slider_value& val)
 {
     ui.trans_gain->setText(FIELD(val, LIT("%1mm")));
 }
 
-void FilterControls::update_ewma_display(const slider_value& val)
+void dialog_accela::update_ewma_display(const slider_value& val)
 {
     ui.ewma_label->setText(FIELD(val, LIT("%1ms")));
 }
 
-void FilterControls::update_rot_dz_display(const slider_value& val)
+void dialog_accela::update_rot_dz_display(const slider_value& val)
 {
     static const QString str(QString::fromUtf8("%1°"));
     ui.rot_dz->setText(FIELD(val, str));
 }
 
-void FilterControls::update_trans_dz_display(const slider_value& val)
+void dialog_accela::update_trans_dz_display(const slider_value& val)
 {
     ui.trans_dz->setText(FIELD(val, LIT("%1mm")));
 }
 
-void FilterControls::update_rot_nl_slider(const slider_value& val)
+void dialog_accela::update_rot_nl_slider(const slider_value& val)
 {
     ui.rot_nl->setText(FIELD(val, LIT(
                         "<html><head/><body>"
diff --git a/filter-ewma2/ftnoir_ewma_filtercontrols.ui b/filter-ewma2/ftnoir_ewma_filtercontrols.ui
index 17990e82..d5cc082e 100644
--- a/filter-ewma2/ftnoir_ewma_filtercontrols.ui
+++ b/filter-ewma2/ftnoir_ewma_filtercontrols.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UICFilterControls</class>
- <widget class="QWidget" name="UICFilterControls">
+ <class>UICdialog_ewma</class>
+ <widget class="QWidget" name="UICdialog_ewma">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/filter-ewma2/ftnoir_filter_ewma2.cpp b/filter-ewma2/ftnoir_filter_ewma2.cpp
index beceb4c2..687b5589 100644
--- a/filter-ewma2/ftnoir_filter_ewma2.cpp
+++ b/filter-ewma2/ftnoir_filter_ewma2.cpp
@@ -22,11 +22,11 @@
 // to minSmooth at a rate controlled by the powCurve setting.
 
 
-FTNoIR_Filter::FTNoIR_Filter() : first_run(true)
+ewma::ewma() : first_run(true)
 {
 }
 
-void FTNoIR_Filter::filter(const double *input, double *output)
+void ewma::filter(const double *input, double *output)
 {
     // Start the timer and initialise filter state if it's not running.
     if (first_run)
@@ -76,4 +76,4 @@ void FTNoIR_Filter::filter(const double *input, double *output)
     }
 }
 
-OPENTRACK_DECLARE_FILTER(FTNoIR_Filter, FilterControls, FTNoIR_FilterDll)
+OPENTRACK_DECLARE_FILTER(ewma, dialog_ewma, ewmaDll)
diff --git a/filter-ewma2/ftnoir_filter_ewma2.h b/filter-ewma2/ftnoir_filter_ewma2.h
index 8680971b..b857e8d9 100644
--- a/filter-ewma2/ftnoir_filter_ewma2.h
+++ b/filter-ewma2/ftnoir_filter_ewma2.h
@@ -20,10 +20,10 @@ struct settings : opts {
 };
 
 
-class FTNoIR_Filter : public IFilter
+class ewma : public IFilter
 {
 public:
-    FTNoIR_Filter();
+    ewma();
     void filter(const double *input, double *output);
 private:
     // Deltas are smoothed over the last 1/60sec.
@@ -38,16 +38,16 @@ private:
     bool first_run;
 };
 
-class FilterControls: public IFilterDialog
+class dialog_ewma: public IFilterDialog
 {
     Q_OBJECT
 public:
-    FilterControls();
+    dialog_ewma();
     void register_filter(IFilter*) override {}
     void unregister_filter() override {}
 
 private:
-    Ui::UICFilterControls ui;
+    Ui::UICdialog_ewma ui;
     settings s;
 
 private slots:
@@ -56,7 +56,7 @@ private slots:
     void update_labels(int);
 };
 
-class FTNoIR_FilterDll : public Metadata
+class ewmaDll : public Metadata
 {
 public:
     QString name() { return QString("EWMA"); }
diff --git a/filter-ewma2/ftnoir_filter_ewma2_dialog.cpp b/filter-ewma2/ftnoir_filter_ewma2_dialog.cpp
index 79fcd959..5372767d 100644
--- a/filter-ewma2/ftnoir_filter_ewma2_dialog.cpp
+++ b/filter-ewma2/ftnoir_filter_ewma2_dialog.cpp
@@ -5,7 +5,7 @@
 #include "api/plugin-api.hpp"
 #include "ui_ftnoir_ewma_filtercontrols.h"
 
-FilterControls::FilterControls()
+dialog_ewma::dialog_ewma()
 {
     ui.setupUi(this);
 
@@ -16,9 +16,9 @@ FilterControls::FilterControls()
     tie_setting(s.kMinSmoothing, ui.minSmooth);
     tie_setting(s.kSmoothingScaleCurve, ui.powCurve);
 
-    connect(ui.powCurve, &QSlider::valueChanged, this, &FilterControls::update_labels);
-    connect(ui.minSmooth, &QSlider::valueChanged, this, &FilterControls::update_labels);
-    connect(ui.maxSmooth, &QSlider::valueChanged, this, &FilterControls::update_labels);
+    connect(ui.powCurve, &QSlider::valueChanged, this, &dialog_ewma::update_labels);
+    connect(ui.minSmooth, &QSlider::valueChanged, this, &dialog_ewma::update_labels);
+    connect(ui.maxSmooth, &QSlider::valueChanged, this, &dialog_ewma::update_labels);
 
     using std::min;
     using std::max;
@@ -32,18 +32,18 @@ FilterControls::FilterControls()
     update_labels(0);
 }
 
-void FilterControls::doOK()
+void dialog_ewma::doOK()
 {
     s.b->save();
     close();
 }
 
-void FilterControls::doCancel()
+void dialog_ewma::doCancel()
 {
     close();
 }
 
-void FilterControls::update_labels(int)
+void dialog_ewma::update_labels(int)
 {
     ui.curve_label->setText(QString::number(static_cast<slider_value>(s.kSmoothingScaleCurve).cur() * 100, 'f', 2) + "%");
     ui.min_label->setText(QString::number(static_cast<slider_value>(s.kMinSmoothing).cur() * 100, 'f', 2) + "%");
diff --git a/filter-kalman/ftnoir_kalman_filtercontrols.ui b/filter-kalman/ftnoir_kalman_filtercontrols.ui
index 6ec18ba8..f17984e3 100644
--- a/filter-kalman/ftnoir_kalman_filtercontrols.ui
+++ b/filter-kalman/ftnoir_kalman_filtercontrols.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>KalmanUICFilterControls</class>
- <widget class="QWidget" name="KalmanUICFilterControls">
+ <class>KalmanUICdialog_kalman</class>
+ <widget class="QWidget" name="KalmanUICdialog_kalman">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/filter-kalman/kalman.cpp b/filter-kalman/kalman.cpp
index 6ed5ca91..0fc0c4ba 100644
--- a/filter-kalman/kalman.cpp
+++ b/filter-kalman/kalman.cpp
@@ -104,7 +104,7 @@ PoseVector DeadzoneFilter::filter(const PoseVector &input)
 }
 
 
-void FTNoIR_Filter::fill_transition_matrix(double dt)
+void kalman::fill_transition_matrix(double dt)
 {
     for (int i = 0; i < 6; ++i)
     {
@@ -112,7 +112,7 @@ void FTNoIR_Filter::fill_transition_matrix(double dt)
     }
 }
 
-void FTNoIR_Filter::fill_process_noise_cov_matrix(StateMatrix &target, double dt) const
+void kalman::fill_process_noise_cov_matrix(StateMatrix &target, double dt) const
 {
     // This model is like movement at fixed velocity plus superimposed
     // brownian motion. Unlike standard models for tracking of objects
@@ -141,7 +141,7 @@ void FTNoIR_Filter::fill_process_noise_cov_matrix(StateMatrix &target, double dt
 }
 
 
-PoseVector FTNoIR_Filter::do_kalman_filter(const PoseVector &input, double dt, bool new_input)
+PoseVector kalman::do_kalman_filter(const PoseVector &input, double dt, bool new_input)
 {
     if (new_input)
     {
@@ -157,13 +157,13 @@ PoseVector FTNoIR_Filter::do_kalman_filter(const PoseVector &input, double dt, b
 
 
 
-FTNoIR_Filter::FTNoIR_Filter() {
+kalman::kalman() {
     reset();
 }
 
 // The original code was written by Donovan Baarda <abo@minkirri.apana.org.au>
 // https://sourceforge.net/p/facetracknoir/discussion/1150909/thread/418615e1/?limit=25#af75/084b
-void FTNoIR_Filter::reset()
+void kalman::reset()
 {
     kf.init();
     kf_adaptive_process_noise_cov.init();
@@ -203,7 +203,7 @@ void FTNoIR_Filter::reset()
 }
 
 
-void FTNoIR_Filter::filter(const double* input_, double *output_)
+void kalman::filter(const double* input_, double *output_)
 {
     // almost non-existent cost, so might as well ...
     Eigen::Map<const PoseVector> input(input_, PoseVector::RowsAtCompileTime, 1);
@@ -257,7 +257,7 @@ void FTNoIR_Filter::filter(const double* input_, double *output_)
 
 
 
-FilterControls::FilterControls()
+dialog_kalman::dialog_kalman()
     : filter(nullptr)
 {
     ui.setupUi(this);
@@ -274,7 +274,7 @@ FilterControls::FilterControls()
 }
 
 
-void FilterControls::updateLabels(const slider_value&)
+void dialog_kalman::updateLabels(const slider_value&)
 {
     // M$ hates unicode! (M$ autoconverts source code of one kind of utf-8 format, 
     // the one without BOM, to another kind that QT does not like)
@@ -288,16 +288,16 @@ void FilterControls::updateLabels(const slider_value&)
 }
 
 
-void FilterControls::doOK() {
+void dialog_kalman::doOK() {
     s.b->save();
     close();
 }
 
 
-void FilterControls::doCancel()
+void dialog_kalman::doCancel()
 {
     close();
 }
 
 
-OPENTRACK_DECLARE_FILTER(FTNoIR_Filter, FilterControls, FTNoIR_FilterDll)
+OPENTRACK_DECLARE_FILTER(kalman, dialog_kalman, kalmanDll)
diff --git a/filter-kalman/kalman.h b/filter-kalman/kalman.h
index d60634c4..fd71d99f 100644
--- a/filter-kalman/kalman.h
+++ b/filter-kalman/kalman.h
@@ -131,13 +131,13 @@ struct settings : opts {
 
 };
 
-class FTNoIR_Filter : public IFilter
+class kalman : public IFilter
 {
     PoseVector do_kalman_filter(const PoseVector &input, double dt, bool new_input);
     void fill_transition_matrix(double dt);
     void fill_process_noise_cov_matrix(StateMatrix &target, double dt) const;
 public:
-    FTNoIR_Filter();
+    kalman();
     void reset();
     void filter(const double *input, double *output);
     PoseVector last_input;
@@ -153,23 +153,23 @@ public:
     EIGEN_MAKE_ALIGNED_OPERATOR_NEW
 };
 
-class FTNoIR_FilterDll : public Metadata
+class kalmanDll : public Metadata
 {
 public:
     QString name() { return QString("Kalman"); }
     QIcon icon() { return QIcon(":/images/filter-16.png"); }
 };
 
-class FilterControls: public IFilterDialog
+class dialog_kalman: public IFilterDialog
 {
     Q_OBJECT
 public:
-    FilterControls();
-    Ui::KalmanUICFilterControls ui;
+    dialog_kalman();
+    Ui::KalmanUICdialog_kalman ui;
     void register_filter(IFilter*) override {}
     void unregister_filter() override {}
     settings s;
-    FTNoIR_Filter *filter;
+    kalman *filter;
 public slots:
     void doOK();
     void doCancel();
diff --git a/proto-fg/ftnoir_protocol_fg.cpp b/proto-fg/ftnoir_protocol_fg.cpp
index 599a4d2c..3df51c3e 100644
--- a/proto-fg/ftnoir_protocol_fg.cpp
+++ b/proto-fg/ftnoir_protocol_fg.cpp
@@ -13,7 +13,7 @@
 
 // For Todd and Arda Kutlu
 
-void FTNoIR_Protocol::pose(const double* headpose) {
+void flightgear::pose(const double* headpose) {
     FlightData.x = headpose[TX] * 1e-2;
     FlightData.y = headpose[TY] * 1e-2;
     FlightData.z = headpose[TZ] * 1e-2;
@@ -30,9 +30,9 @@ void FTNoIR_Protocol::pose(const double* headpose) {
     (void) outSocket.writeDatagram(reinterpret_cast<const char*>(&FlightData), sizeof(FlightData), destIP, static_cast<quint16>(destPort));
 }
 
-bool FTNoIR_Protocol::correct()
+bool flightgear::correct()
 {   
     return outSocket.bind(QHostAddress::Any, 0, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint);
 }
 
-OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, FGControls, FTNoIR_ProtocolDll)
+OPENTRACK_DECLARE_PROTOCOL(flightgear, FGControls, flightgearDll)
diff --git a/proto-fg/ftnoir_protocol_fg.h b/proto-fg/ftnoir_protocol_fg.h
index 3cacf1a5..070ca571 100644
--- a/proto-fg/ftnoir_protocol_fg.h
+++ b/proto-fg/ftnoir_protocol_fg.h
@@ -31,7 +31,7 @@ struct settings : opts {
     {}
 };
 
-class FTNoIR_Protocol : public IProtocol
+class flightgear : public IProtocol
 {
 public:
     bool correct();
@@ -61,7 +61,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class flightgearDll : public Metadata
 {
 public:
     QString name() { return QString("FlightGear"); }
diff --git a/proto-fsuipc/ftnoir_protocol_fsuipc.cpp b/proto-fsuipc/ftnoir_protocol_fsuipc.cpp
index 92d9bd88..11d954ab 100644
--- a/proto-fsuipc/ftnoir_protocol_fsuipc.cpp
+++ b/proto-fsuipc/ftnoir_protocol_fsuipc.cpp
@@ -13,7 +13,7 @@
 
 #include <cmath>
 
-FTNoIR_Protocol::FTNoIR_Protocol()
+fsuipc::fsuipc()
 {
     prevPosX = 0.0f;
     prevPosY = 0.0f;
@@ -23,14 +23,14 @@ FTNoIR_Protocol::FTNoIR_Protocol()
     prevRotZ = 0.0f;
 }
 
-FTNoIR_Protocol::~FTNoIR_Protocol()
+fsuipc::~fsuipc()
 {
     FSUIPC_Close();
     FSUIPCLib.unload();
 }
 
 template<typename t>
-int FTNoIR_Protocol::scale2AnalogLimits(t x, t min_x, t max_x)
+int fsuipc::scale2AnalogLimits(t x, t min_x, t max_x)
 {
     t local_x = x;
 
@@ -55,7 +55,7 @@ static inline bool check_float_fresh(t x, t y)
     return std::fabs(x - y) >= eps;
 }
 
-void FTNoIR_Protocol::pose(const double *headpose ) {
+void fsuipc::pose(const double *headpose ) {
     DWORD result;
     TFSState pitch;
     TFSState yaw;
@@ -144,7 +144,7 @@ void FTNoIR_Protocol::pose(const double *headpose ) {
     prevRotZ = virtRotZ;
 }
 
-bool FTNoIR_Protocol::correct()
+bool fsuipc::correct()
 {
     qDebug() << "correct says: Starting Function";
 
@@ -163,4 +163,4 @@ bool FTNoIR_Protocol::correct()
     return true;
 }
 
-OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, FSUIPCControls, FTNoIR_ProtocolDll)
+OPENTRACK_DECLARE_PROTOCOL(fsuipc, FSUIPCControls, fsuipcDll)
diff --git a/proto-fsuipc/ftnoir_protocol_fsuipc.h b/proto-fsuipc/ftnoir_protocol_fsuipc.h
index f7a98ad8..eea346c3 100644
--- a/proto-fsuipc/ftnoir_protocol_fsuipc.h
+++ b/proto-fsuipc/ftnoir_protocol_fsuipc.h
@@ -45,11 +45,11 @@ typedef struct
 } TFSState;
 #pragma pack(pop)
 
-class FTNoIR_Protocol : public IProtocol
+class fsuipc : public IProtocol
 {
 public:
-    FTNoIR_Protocol();
-    ~FTNoIR_Protocol() override;
+    fsuipc();
+    ~fsuipc() override;
     bool correct();
     void pose(const double* headpose);
     QString game_name()
@@ -81,7 +81,7 @@ private slots:
     void getLocationOfDLL();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class fsuipcDll : public Metadata
 {
 public:
     QString name() { return QString("FSUIPC -- Microsoft FS2002/FS2004"); }
diff --git a/proto-ft/ftnoir_protocol_ft.h b/proto-ft/ftnoir_protocol_ft.h
index 546cb0e5..19bb39c3 100644
--- a/proto-ft/ftnoir_protocol_ft.h
+++ b/proto-ft/ftnoir_protocol_ft.h
@@ -40,11 +40,11 @@ struct settings : opts {
 typedef void (__stdcall *importTIRViewsStart)(void);
 typedef void (__stdcall *importTIRViewsStop)(void);
 
-class FTNoIR_Protocol : public IProtocol
+class freetrack : public IProtocol
 {
 public:
-    FTNoIR_Protocol();
-    ~FTNoIR_Protocol() override;
+    freetrack();
+    ~freetrack() override;
     bool correct();
     void pose( const double *headpose );
     QString game_name() override {
@@ -90,7 +90,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class freetrackDll : public Metadata
 {
 public:
     QString name() { return QString("freetrack 2.0 Enhanced"); }
diff --git a/proto-ft/mutex.cpp b/proto-ft/mutex.cpp
index 073c6f08..a012ba90 100644
--- a/proto-ft/mutex.cpp
+++ b/proto-ft/mutex.cpp
@@ -55,6 +55,6 @@ void check_for_first_run::try_exit()
     if (is_first_instance && enabled)
     {
         qDebug() << "ft runonce: removing registry keys";
-        FTNoIR_Protocol::set_protocols(false, false);
+        freetrack::set_protocols(false, false);
     }
 }
diff --git a/proto-ftn/ftnoir_protocol_ftn.cpp b/proto-ftn/ftnoir_protocol_ftn.cpp
index 51db0f9d..b659e3b5 100644
--- a/proto-ftn/ftnoir_protocol_ftn.cpp
+++ b/proto-ftn/ftnoir_protocol_ftn.cpp
@@ -12,11 +12,11 @@
 #include <QFile>
 #include "api/plugin-api.hpp"
 
-FTNoIR_Protocol::FTNoIR_Protocol()
+udp::udp()
 {
 }
 
-void FTNoIR_Protocol::pose(const double *headpose) {
+void udp::pose(const double *headpose) {
     int destPort = s.port;
     QHostAddress destIP(QString("%1.%2.%3.%4").arg(
                             QString::number(static_cast<int>(s.ip1)),
@@ -26,9 +26,9 @@ void FTNoIR_Protocol::pose(const double *headpose) {
     outSocket.writeDatagram((const char *) headpose, sizeof( double[6] ), destIP, destPort);
 }
 
-bool FTNoIR_Protocol::correct()
+bool udp::correct()
 {   
     return outSocket.bind(QHostAddress::Any, 0, QUdpSocket::ShareAddress | QUdpSocket::ReuseAddressHint);
 }
 
-OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, FTNControls, FTNoIR_ProtocolDll)
+OPENTRACK_DECLARE_PROTOCOL(udp, FTNControls, udpDll)
diff --git a/proto-ftn/ftnoir_protocol_ftn.h b/proto-ftn/ftnoir_protocol_ftn.h
index 74120b87..28abf204 100644
--- a/proto-ftn/ftnoir_protocol_ftn.h
+++ b/proto-ftn/ftnoir_protocol_ftn.h
@@ -31,10 +31,10 @@ struct settings : opts {
     {}
 };
 
-class FTNoIR_Protocol : public IProtocol
+class udp : public IProtocol
 {
 public:
-    FTNoIR_Protocol();
+    udp();
     bool correct();
     void pose(const double *headpose);
     QString game_name() {
@@ -61,7 +61,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class udpDll : public Metadata
 {
 public:
     QString name() { return QString("UDP receiver"); }
diff --git a/proto-libevdev/ftnoir_protocol_libevdev.cpp b/proto-libevdev/ftnoir_protocol_libevdev.cpp
index 96411ae3..8b8e294e 100644
--- a/proto-libevdev/ftnoir_protocol_libevdev.cpp
+++ b/proto-libevdev/ftnoir_protocol_libevdev.cpp
@@ -12,7 +12,7 @@ static const int max_input = 65535;
 static const int mid_input = 32767;
 static const int min_input = 0;
 
-FTNoIR_Protocol::FTNoIR_Protocol() : dev(NULL), uidev(NULL)
+evdev::evdev() : dev(NULL), uidev(NULL)
 {
     int error = 0;
 
@@ -61,7 +61,7 @@ error:
     dev = NULL;
 }
 
-FTNoIR_Protocol::~FTNoIR_Protocol()
+evdev::~evdev()
 {
     if (uidev)
         libevdev_uinput_destroy(uidev);
@@ -69,7 +69,7 @@ FTNoIR_Protocol::~FTNoIR_Protocol()
         libevdev_free(dev);
 }
 
-void FTNoIR_Protocol::pose(const double* headpose) {
+void evdev::pose(const double* headpose) {
     static const int axes[] = {
         /* translation goes first */
         ABS_X, ABS_Y, ABS_Z, ABS_RX, ABS_RY, ABS_RZ
@@ -94,4 +94,4 @@ void FTNoIR_Protocol::pose(const double* headpose) {
     (void) libevdev_uinput_write_event(uidev, EV_SYN, SYN_REPORT, 0);
 }
 
-OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, LibevdevControls, FTNoIR_ProtocolDll)
+OPENTRACK_DECLARE_PROTOCOL(evdev, LibevdevControls, evdevDll)
diff --git a/proto-libevdev/ftnoir_protocol_libevdev.h b/proto-libevdev/ftnoir_protocol_libevdev.h
index 79be398b..6f7e4695 100644
--- a/proto-libevdev/ftnoir_protocol_libevdev.h
+++ b/proto-libevdev/ftnoir_protocol_libevdev.h
@@ -15,11 +15,11 @@ extern "C" {
 #   include <libevdev/libevdev-uinput.h>
 }
 
-class FTNoIR_Protocol : public IProtocol
+class evdev : public IProtocol
 {
 public:
-    FTNoIR_Protocol();
-    ~FTNoIR_Protocol() override;
+    evdev();
+    ~evdev() override;
     bool correct() {
         return dev != NULL;
     }
@@ -49,7 +49,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class evdevDll : public Metadata
 {
 public:
     QString name() { return QString("libevdev joystick receiver"); }
diff --git a/proto-mouse/ftnoir_protocol_mouse.cpp b/proto-mouse/ftnoir_protocol_mouse.cpp
index fb88fe92..85b8cf1d 100644
--- a/proto-mouse/ftnoir_protocol_mouse.cpp
+++ b/proto-mouse/ftnoir_protocol_mouse.cpp
@@ -14,7 +14,7 @@
 #   define MOUSEEVENTF_MOVE_NOCOALESCE 0x2000
 #endif
 
-void FTNoIR_Protocol::pose(const double *headpose)
+void mouse::pose(const double *headpose)
 {
     const int axis_x = s.Mouse_X - 1;
     const int axis_y = s.Mouse_Y - 1;
@@ -59,12 +59,12 @@ void FTNoIR_Protocol::pose(const double *headpose)
     last_y = mouse_y;
 }
 
-QString FTNoIR_Protocol::game_name()
+QString mouse::game_name()
 {
     return "Mouse tracker";
 }
 
-double FTNoIR_Protocol::get_rotation(double val, double last_pos)
+double mouse::get_rotation(double val, double last_pos)
 {
     using std::fmod;
     using std::fabs;
@@ -81,7 +81,7 @@ double FTNoIR_Protocol::get_rotation(double val, double last_pos)
         return x_1;
 }
 
-int FTNoIR_Protocol::get_value(double val, double& last_pos, int& last_px, bool is_rotation, double sensitivity)
+int mouse::get_value(double val, double& last_pos, int& last_px, bool is_rotation, double sensitivity)
 {
     static constexpr double c = 1e-1;
 
@@ -103,9 +103,9 @@ int FTNoIR_Protocol::get_value(double val, double& last_pos, int& last_px, bool
     return last_px;
 }
 
-bool FTNoIR_Protocol::correct()
+bool mouse::correct()
 {
     return true;
 }
 
-OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, MOUSEControls, FTNoIR_ProtocolDll)
+OPENTRACK_DECLARE_PROTOCOL(mouse, MOUSEControls, mouseDll)
diff --git a/proto-mouse/ftnoir_protocol_mouse.h b/proto-mouse/ftnoir_protocol_mouse.h
index f2880822..39209401 100644
--- a/proto-mouse/ftnoir_protocol_mouse.h
+++ b/proto-mouse/ftnoir_protocol_mouse.h
@@ -25,10 +25,10 @@ struct settings : opts {
     {}
 };
 
-class FTNoIR_Protocol : public IProtocol
+class mouse : public IProtocol
 {
 public:
-    FTNoIR_Protocol() : last_pos_x(0), last_pos_y(0), last_x(0), last_y(0) {}
+    mouse() : last_pos_x(0), last_pos_y(0), last_x(0), last_y(0) {}
     bool correct() override;
     void pose( const double *headpose) override;
     QString game_name() override;
@@ -57,7 +57,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class mouseDll : public Metadata
 {
 public:
     QString name() { return QString("mouse emulation"); }
diff --git a/proto-sc/ftnoir_protocol_sc.cpp b/proto-sc/ftnoir_protocol_sc.cpp
index cea064ea..d60ab3fe 100644
--- a/proto-sc/ftnoir_protocol_sc.cpp
+++ b/proto-sc/ftnoir_protocol_sc.cpp
@@ -13,17 +13,17 @@
 #include "api/plugin-api.hpp"
 #include "opentrack-library-path.h"
 
-FTNoIR_Protocol::FTNoIR_Protocol() : should_stop(false), hSimConnect(nullptr)
+simconnect::simconnect() : should_stop(false), hSimConnect(nullptr)
 {
 }
 
-FTNoIR_Protocol::~FTNoIR_Protocol()
+simconnect::~simconnect()
 {
     should_stop = true;
     wait();
 }
 
-void FTNoIR_Protocol::run()
+void simconnect::run()
 {
     HANDLE event = CreateEvent(NULL, FALSE, FALSE, nullptr);
 
@@ -58,7 +58,7 @@ void FTNoIR_Protocol::run()
     CloseHandle(event);
 }
 
-void FTNoIR_Protocol::pose( const double *headpose ) {
+void simconnect::pose( const double *headpose ) {
     // euler degrees
     virtSCRotX = float(-headpose[Pitch]);
     virtSCRotY = float(headpose[Yaw]);
@@ -120,7 +120,7 @@ private:
     bool ok;
 };
 
-bool FTNoIR_Protocol::correct()
+bool simconnect::correct()
 {
     if (!SCClientLib.isLoaded())
     {
@@ -140,29 +140,29 @@ bool FTNoIR_Protocol::correct()
 
     simconnect_open = (importSimConnect_Open) SCClientLib.resolve("SimConnect_Open");
     if (simconnect_open == NULL) {
-        qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_Open function not found in DLL!";
+        qDebug() << "simconnect::correct() says: SimConnect_Open function not found in DLL!";
         return false;
     }
     simconnect_set6DOF = (importSimConnect_CameraSetRelative6DOF) SCClientLib.resolve("SimConnect_CameraSetRelative6DOF");
     if (simconnect_set6DOF == NULL) {
-        qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_CameraSetRelative6DOF function not found in DLL!";
+        qDebug() << "simconnect::correct() says: SimConnect_CameraSetRelative6DOF function not found in DLL!";
         return false;
     }
     simconnect_close = (importSimConnect_Close) SCClientLib.resolve("SimConnect_Close");
     if (simconnect_close == NULL) {
-        qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_Close function not found in DLL!";
+        qDebug() << "simconnect::correct() says: SimConnect_Close function not found in DLL!";
         return false;
     }
 
     simconnect_calldispatch = (importSimConnect_CallDispatch) SCClientLib.resolve("SimConnect_CallDispatch");
     if (simconnect_calldispatch == NULL) {
-        qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_CallDispatch function not found in DLL!";
+        qDebug() << "simconnect::correct() says: SimConnect_CallDispatch function not found in DLL!";
         return false;
     }
 
     simconnect_subscribetosystemevent = (importSimConnect_SubscribeToSystemEvent) SCClientLib.resolve("SimConnect_SubscribeToSystemEvent");
     if (simconnect_subscribetosystemevent == NULL) {
-        qDebug() << "FTNoIR_Protocol::correct() says: SimConnect_SubscribeToSystemEvent function not found in DLL!";
+        qDebug() << "simconnect::correct() says: SimConnect_SubscribeToSystemEvent function not found in DLL!";
         return false;
     }
 
@@ -171,14 +171,14 @@ bool FTNoIR_Protocol::correct()
     return true;
 }
 
-void FTNoIR_Protocol::handle()
+void simconnect::handle()
 {
     (void) simconnect_set6DOF(hSimConnect, virtSCPosX, virtSCPosY, virtSCPosZ, virtSCRotX, virtSCRotZ, virtSCRotY);
 }
 
-void CALLBACK FTNoIR_Protocol::processNextSimconnectEvent(SIMCONNECT_RECV* pData, DWORD, void *self_)
+void CALLBACK simconnect::processNextSimconnectEvent(SIMCONNECT_RECV* pData, DWORD, void *self_)
 {
-    FTNoIR_Protocol& self = *reinterpret_cast<FTNoIR_Protocol*>(self_);
+    simconnect& self = *reinterpret_cast<simconnect*>(self_);
 
     switch(pData->dwID)
     {
@@ -190,4 +190,4 @@ void CALLBACK FTNoIR_Protocol::processNextSimconnectEvent(SIMCONNECT_RECV* pData
     }
 }
 
-OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, SCControls, FTNoIR_ProtocolDll)
+OPENTRACK_DECLARE_PROTOCOL(simconnect, SCControls, simconnectDll)
diff --git a/proto-sc/ftnoir_protocol_sc.h b/proto-sc/ftnoir_protocol_sc.h
index 1b3f5eb8..5f8717f4 100644
--- a/proto-sc/ftnoir_protocol_sc.h
+++ b/proto-sc/ftnoir_protocol_sc.h
@@ -32,11 +32,11 @@ struct settings : opts {
     {}
 };
 
-class FTNoIR_Protocol : public IProtocol, private QThread
+class simconnect : public IProtocol, private QThread
 {
 public:
-    FTNoIR_Protocol();
-    ~FTNoIR_Protocol() override;
+    simconnect();
+    ~simconnect() override;
     bool correct();
     void pose(const double* headpose);
     void handle();
@@ -100,7 +100,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class simconnectDll : public Metadata
 {
 public:
     QString name() { return QString("Microsoft FSX SimConnect"); }
diff --git a/proto-wine/ftnoir_protocol_wine.cpp b/proto-wine/ftnoir_protocol_wine.cpp
index bc49ac8c..ea7fadf2 100644
--- a/proto-wine/ftnoir_protocol_wine.cpp
+++ b/proto-wine/ftnoir_protocol_wine.cpp
@@ -9,7 +9,7 @@
 #include <fcntl.h>           /* For O_* constants */
 #include "csv/csv.h"
 
-FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0)
+wine::wine() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeof(WineSHM)), shm(NULL), gameid(0)
 {
     if (lck_shm.success()) {
         shm = (WineSHM*) lck_shm.ptr();
@@ -20,7 +20,7 @@ FTNoIR_Protocol::FTNoIR_Protocol() : lck_shm(WINE_SHM_NAME, WINE_MTX_NAME, sizeo
     wrapper.start("wine", QStringList() << (library_path + "opentrack-wrapper-wine.exe.so"));
 }
 
-FTNoIR_Protocol::~FTNoIR_Protocol()
+wine::~wine()
 {
     if (shm) {
         shm->stop = true;
@@ -31,7 +31,7 @@ FTNoIR_Protocol::~FTNoIR_Protocol()
     //shm_unlink("/" WINE_SHM_NAME);
 }
 
-void FTNoIR_Protocol::pose( const double *headpose )
+void wine::pose( const double *headpose )
 {
     if (shm)
     {
@@ -54,9 +54,9 @@ void FTNoIR_Protocol::pose( const double *headpose )
     }
 }
 
-bool FTNoIR_Protocol::correct()
+bool wine::correct()
 {
     return lck_shm.success();
 }
 
-OPENTRACK_DECLARE_PROTOCOL(FTNoIR_Protocol, FTControls, FTNoIR_ProtocolDll)
+OPENTRACK_DECLARE_PROTOCOL(wine, FTControls, wineDll)
diff --git a/proto-wine/ftnoir_protocol_wine.h b/proto-wine/ftnoir_protocol_wine.h
index 8b41824c..a0a3fa4c 100644
--- a/proto-wine/ftnoir_protocol_wine.h
+++ b/proto-wine/ftnoir_protocol_wine.h
@@ -12,11 +12,11 @@
 #include "compat/shm.h"
 #include "wine-shm.h"
 
-class FTNoIR_Protocol : public IProtocol
+class wine : public IProtocol
 {
 public:
-    FTNoIR_Protocol();
-    ~FTNoIR_Protocol() override;
+    wine();
+    ~wine() override;
 
     bool correct() override;
     void pose(const double* headpose) override;
@@ -49,7 +49,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_ProtocolDll : public Metadata
+class wineDll : public Metadata
 {
 public:
     QString name() override { return QString("Wine -- Windows layer for Unix"); }
diff --git a/tracker-aruco/aruco-trackercontrols.ui b/tracker-aruco/aruco-trackercontrols.ui
index 1d63e88b..1479b2e7 100644
--- a/tracker-aruco/aruco-trackercontrols.ui
+++ b/tracker-aruco/aruco-trackercontrols.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>Form</class>
- <widget class="QWidget" name="Form">
+ <class>dialog_aruco</class>
+ <widget class="QWidget" name="dialog_aruco">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/tracker-aruco/ftnoir_tracker_aruco.cpp b/tracker-aruco/ftnoir_tracker_aruco.cpp
index a36fdd9f..8edb8cf5 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.cpp
+++ b/tracker-aruco/ftnoir_tracker_aruco.cpp
@@ -38,7 +38,7 @@ static resolution_tuple resolution_choices[] =
     { 0, 0 }
 };
 
-Tracker::Tracker() :
+tracker_aruco::tracker_aruco() :
     stop(false),
     layout(nullptr),
     videoWidget(nullptr),
@@ -57,7 +57,7 @@ Tracker::Tracker() :
     detector._thresMethod = aruco::MarkerDetector::FIXED_THRES;
 }
 
-Tracker::~Tracker()
+tracker_aruco::~tracker_aruco()
 {
     stop = true;
     wait();
@@ -68,7 +68,7 @@ Tracker::~Tracker()
     camera.release();
 }
 
-void Tracker::start_tracker(QFrame* videoframe)
+void tracker_aruco::start_tracker(QFrame* videoframe)
 {
     videoframe->show();
     videoWidget = new cv_video_widget(videoframe);
@@ -87,7 +87,7 @@ void Tracker::start_tracker(QFrame* videoframe)
 
 #define HT_PI M_PI
 
-void Tracker::getRT(cv::Matx33d& r_, cv::Vec3d& t_)
+void tracker_aruco::getRT(cv::Matx33d& r_, cv::Vec3d& t_)
 {
     QMutexLocker l(&mtx);
 
@@ -95,7 +95,7 @@ void Tracker::getRT(cv::Matx33d& r_, cv::Vec3d& t_)
     t_ = t;
 }
 
-bool Tracker::detect_with_roi()
+bool tracker_aruco::detect_with_roi()
 {
     if (last_roi.width > 1 && last_roi.height > 1)
     {
@@ -124,14 +124,14 @@ bool Tracker::detect_with_roi()
     return false;
 }
 
-bool Tracker::detect_without_roi()
+bool tracker_aruco::detect_without_roi()
 {
     detector.setMinMaxSize(size_min, size_max);
     detector.detect(grayscale, markers, cv::Mat(), cv::Mat(), -1, false);
     return markers.size() == 1 && markers[0].size() == 4;
 }
 
-bool Tracker::open_camera()
+bool tracker_aruco::open_camera()
 {
     int rint = s.resolution;
     if (rint < 0 || rint >= (int)(sizeof(resolution_choices) / sizeof(resolution_tuple)))
@@ -180,7 +180,7 @@ bool Tracker::open_camera()
     return true;
 }
 
-void Tracker::set_intrinsics()
+void tracker_aruco::set_intrinsics()
 {
     const int w = grayscale.cols, h = grayscale.rows;
     const double diag_fov = static_cast<int>(s.fov) * M_PI / 180.;
@@ -195,7 +195,7 @@ void Tracker::set_intrinsics()
     intrinsics(1, 2) = grayscale.rows/2;
 }
 
-void Tracker::update_fps(double alpha)
+void tracker_aruco::update_fps(double alpha)
 {
     std::uint64_t time = std::uint64_t(cv::getTickCount());
     const double dt = std::max(0., (time - last_time) / freq);
@@ -204,7 +204,7 @@ void Tracker::update_fps(double alpha)
     cur_fps = cur_fps * alpha + (1-alpha) * (fabs(dt) < 1e-6 ? 0 : 1./dt);
 }
 
-void Tracker::draw_ar(bool ok)
+void tracker_aruco::draw_ar(bool ok)
 {
     if (ok)
     {
@@ -219,7 +219,7 @@ void Tracker::draw_ar(bool ok)
     cv::putText(frame, buf, cv::Point(10, 32), cv::FONT_HERSHEY_PLAIN, 2, cv::Scalar(0, 255, 0), 1);
 }
 
-void Tracker::clamp_last_roi()
+void tracker_aruco::clamp_last_roi()
 {
     if (last_roi.x < 0)
         last_roi.x = 0;
@@ -242,7 +242,7 @@ void Tracker::clamp_last_roi()
     last_roi.height -= last_roi.y;
 }
 
-void Tracker::set_points()
+void tracker_aruco::set_points()
 {
     using f = float;
     const f hx = f(s.headpos_x), hy = f(s.headpos_y), hz = f(s.headpos_z);
@@ -257,7 +257,7 @@ void Tracker::set_points()
     obj_points[x4] = cv::Point3f(-size + hx, size + hy, 0 + hz);
 }
 
-void Tracker::draw_centroid()
+void tracker_aruco::draw_centroid()
 {
     repr2.clear();
 
@@ -269,7 +269,7 @@ void Tracker::draw_centroid()
     cv::circle(frame, repr2[0], 4, s, -1);
 }
 
-void Tracker::set_last_roi()
+void tracker_aruco::set_last_roi()
 {
     roi_projection.clear();
 
@@ -286,7 +286,7 @@ void Tracker::set_last_roi()
     set_roi_from_projection();
 }
 
-void Tracker::set_rmat()
+void tracker_aruco::set_rmat()
 {
     cv::Rodrigues(rvec, rmat);
 
@@ -305,7 +305,7 @@ void Tracker::set_rmat()
     t = cv::Vec3d(tvec[0], -tvec[1], tvec[2]);
 }
 
-void Tracker::set_roi_from_projection()
+void tracker_aruco::set_roi_from_projection()
 {
     last_roi = cv::Rect(color.cols-1, color.rows-1, 0, 0);
 
@@ -328,7 +328,7 @@ void Tracker::set_roi_from_projection()
     clamp_last_roi();
 }
 
-void Tracker::run()
+void tracker_aruco::run()
 {
     cv::setNumThreads(0);
 
@@ -389,7 +389,7 @@ fail:
     }
 }
 
-void Tracker::data(double *data)
+void tracker_aruco::data(double *data)
 {
     QMutexLocker lck(&mtx);
 
@@ -401,7 +401,7 @@ void Tracker::data(double *data)
     data[TZ] = pose[TZ];
 }
 
-TrackerControls::TrackerControls()
+dialog_aruco::dialog_aruco()
 {
     tracker = nullptr;
     calib_timer.setInterval(250);
@@ -421,19 +421,19 @@ TrackerControls::TrackerControls()
     connect(this, SIGNAL(destroyed()), this, SLOT(cleanupCalib()));
 
     connect(&calib_timer, SIGNAL(timeout()), this, SLOT(update_tracker_calibration()));
-    connect(ui.cameraName, &QComboBox::currentTextChanged, this, &TrackerControls::set_camera_settings_available);
+    connect(ui.cameraName, &QComboBox::currentTextChanged, this, &dialog_aruco::set_camera_settings_available);
     set_camera_settings_available(ui.cameraName->currentText());
-    connect(ui.camera_settings, &QPushButton::clicked, this, &TrackerControls::show_camera_settings);
+    connect(ui.camera_settings, &QPushButton::clicked, this, &dialog_aruco::show_camera_settings);
 }
 
 
-void TrackerControls::set_camera_settings_available(const QString& camera_name)
+void dialog_aruco::set_camera_settings_available(const QString& camera_name)
 {
     const bool avail = video_property_page::should_show_dialog(camera_name);
     ui.camera_settings->setEnabled(avail);
 }
 
-void TrackerControls::show_camera_settings()
+void dialog_aruco::show_camera_settings()
 {
     const int idx = ui.cameraName->currentIndex();
     if (tracker)
@@ -446,7 +446,7 @@ void TrackerControls::show_camera_settings()
         video_property_page::show(idx);
 }
 
-void TrackerControls::toggleCalibrate()
+void dialog_aruco::toggleCalibrate()
 {
     if (!calib_timer.isActive())
     {
@@ -467,13 +467,13 @@ void TrackerControls::toggleCalibrate()
     }
 }
 
-void TrackerControls::cleanupCalib()
+void dialog_aruco::cleanupCalib()
 {
     if (calib_timer.isActive())
         calib_timer.stop();
 }
 
-void TrackerControls::update_tracker_calibration()
+void dialog_aruco::update_tracker_calibration()
 {
     if (calib_timer.isActive() && tracker)
     {
@@ -484,15 +484,15 @@ void TrackerControls::update_tracker_calibration()
     }
 }
 
-void TrackerControls::doOK()
+void dialog_aruco::doOK()
 {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel()
+void dialog_aruco::doCancel()
 {
     close();
 }
 
-OPENTRACK_DECLARE_TRACKER(Tracker, TrackerControls, TrackerDll)
+OPENTRACK_DECLARE_TRACKER(tracker_aruco, dialog_aruco, aruco_metadata)
diff --git a/tracker-aruco/ftnoir_tracker_aruco.h b/tracker-aruco/ftnoir_tracker_aruco.h
index 41063ca0..7500438b 100644
--- a/tracker-aruco/ftnoir_tracker_aruco.h
+++ b/tracker-aruco/ftnoir_tracker_aruco.h
@@ -46,16 +46,16 @@ struct settings : opts {
     {}
 };
 
-class TrackerControls;
+class dialog_aruco;
 
-class Tracker : protected QThread, public ITracker
+class tracker_aruco : protected QThread, public ITracker
 {
     Q_OBJECT
-    friend class TrackerControls;
+    friend class dialog_aruco;
     static constexpr float c_search_window = 1.3f;
 public:
-    Tracker();
-    ~Tracker() override;
+    tracker_aruco();
+    ~tracker_aruco() override;
     void start_tracker(QFrame* frame) override;
     void data(double *data) override;
     void run() override;
@@ -106,16 +106,16 @@ private:
     static constexpr double alpha_ = .95;
 };
 
-class TrackerControls : public ITrackerDialog
+class dialog_aruco : public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
-    void register_tracker(ITracker * x) override { tracker = static_cast<Tracker*>(x); }
+    dialog_aruco();
+    void register_tracker(ITracker * x) override { tracker = static_cast<tracker_aruco*>(x); }
     void unregister_tracker() override { tracker = nullptr; }
 private:
-    Ui::Form ui;
-    Tracker* tracker;
+    Ui::dialog_aruco ui;
+    tracker_aruco* tracker;
     settings s;
     TranslationCalibrator calibrator;
     QTimer calib_timer;
@@ -129,7 +129,7 @@ private slots:
     void show_camera_settings();
 };
 
-class TrackerDll : public Metadata
+class aruco_metadata : public Metadata
 {
     QString name() { return QString("aruco -- paper marker tracker"); }
     QIcon icon() { return QIcon(":/images/aruco.png"); }
diff --git a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp
index d6d53803..4c5d14ef 100644
--- a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp
+++ b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.cpp
@@ -6,11 +6,11 @@
 #include <cmath>
 
 
-TrackerImpl::TrackerImpl() : pose { 0,0,0, 0,0,0 }, should_quit(false)
+tracker_freepie::tracker_freepie() : pose { 0,0,0, 0,0,0 }, should_quit(false)
 {
 }
 
-TrackerImpl::~TrackerImpl()
+tracker_freepie::~tracker_freepie()
 {
     should_quit = true;
     wait();
@@ -26,7 +26,7 @@ static const t bound(t datum, t least, t max)
     return datum;
 }
 
-void TrackerImpl::run() {
+void tracker_freepie::run() {
 #pragma pack(push, 1)
     struct {
         uint8_t pad1;
@@ -103,13 +103,13 @@ void TrackerImpl::run() {
     }
 }
 
-void TrackerImpl::start_tracker(QFrame*)
+void tracker_freepie::start_tracker(QFrame*)
 {
     start();
     sock.moveToThread(this);
 }
 
-void TrackerImpl::data(double *data)
+void tracker_freepie::data(double *data)
 {
     QMutexLocker foo(&mtx);
 
@@ -118,4 +118,4 @@ void TrackerImpl::data(double *data)
     data[Roll] = pose[Roll];
 }
 
-OPENTRACK_DECLARE_TRACKER(TrackerImpl, TrackerDialog, TrackerMeta)
+OPENTRACK_DECLARE_TRACKER(tracker_freepie, dialog_freepie, meta_freepie)
diff --git a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h
index 4e79c207..d7bc3733 100644
--- a/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h
+++ b/tracker-freepie-udp/ftnoir_tracker_freepie-udp.h
@@ -28,11 +28,11 @@ struct settings : opts {
     {}
 };
 
-class TrackerImpl : public ITracker, private QThread
+class tracker_freepie : public ITracker, private QThread
 {
 public:
-    TrackerImpl();
-    ~TrackerImpl() override;
+    tracker_freepie();
+    ~tracker_freepie() override;
     void start_tracker(QFrame *) override;
     void data(double *data) override;
 protected:
@@ -45,11 +45,11 @@ private:
     volatile bool should_quit;
 };
 
-class TrackerDialog : public ITrackerDialog
+class dialog_freepie : public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerDialog();
+    dialog_freepie();
     void register_tracker(ITracker *) override {}
     void unregister_tracker() override {}
 private:
@@ -60,7 +60,7 @@ private slots:
     void doCancel();
 };
 
-class TrackerMeta : public Metadata
+class meta_freepie : public Metadata
 {
 public:
     QString name() { return QString("FreePIE UDP receiver"); }
diff --git a/tracker-freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp b/tracker-freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
index 42a8308b..5e162bc4 100644
--- a/tracker-freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
+++ b/tracker-freepie-udp/ftnoir_tracker_freepie-udp_dialog.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_tracker_freepie-udp.h"
 #include "api/plugin-api.hpp"
 
-TrackerDialog::TrackerDialog()
+dialog_freepie::dialog_freepie()
 {
     ui.setupUi(this);
 
@@ -18,12 +18,12 @@ TrackerDialog::TrackerDialog()
     tie_setting(s.add_roll, ui.add_roll);
 }
 
-void TrackerDialog::doOK() {
+void dialog_freepie::doOK() {
     s.b->save();
     close();
 }
 
-void TrackerDialog::doCancel()
+void dialog_freepie::doCancel()
 {
     close();
 }
diff --git a/tracker-hatire/ftnoir_tracker_hat.cpp b/tracker-hatire/ftnoir_tracker_hat.cpp
index 10964bba..421a0e26 100644
--- a/tracker-hatire/ftnoir_tracker_hat.cpp
+++ b/tracker-hatire/ftnoir_tracker_hat.cpp
@@ -14,17 +14,17 @@
 
 hatire::hatire()
 {
-	HAT.Rot[0]=0;
-	HAT.Rot[1]=0;
-	HAT.Rot[2]=0;
-	HAT.Trans[0]=0;
-	HAT.Trans[1]=0;
-	HAT.Trans[2]=0;
-
-	Begin.append((char) 0xAA);
-	Begin.append((char) 0xAA);
-	End.append((char) 0x55);
-	End.append((char) 0x55);
+        HAT.Rot[0]=0;
+        HAT.Rot[1]=0;
+        HAT.Rot[2]=0;
+        HAT.Trans[0]=0;
+        HAT.Trans[1]=0;
+        HAT.Trans[2]=0;
+
+        Begin.append((char) 0xAA);
+        Begin.append((char) 0xAA);
+        End.append((char) 0x55);
+        End.append((char) 0x55);
 }
 
 hatire::~hatire()
@@ -37,16 +37,16 @@ void hatire::reset()
     t.sendcmd_str(s.CmdReset);
 }
 
-// return FPS 
+// return FPS
 void hatire::get_info( int *tps )
 {
-	*tps=frame_cnt;
-	frame_cnt=0;
+        *tps=frame_cnt;
+        frame_cnt=0;
 }
 void hatire::start_tracker(QFrame*)
 {
-	CptError=0;
-	frame_cnt=0;
+        CptError=0;
+        frame_cnt=0;
     t.Log("Starting Tracker");
 
     serial_result ret = t.init_serial_port();
@@ -136,14 +136,14 @@ void hatire::data(double *data)
     if (CptError > 50)
     {
         emit t.serial_debug_info("Can't find HAT frame");
-		CptError=0;
-	}
+                CptError=0;
+        }
 
-	// Need to handle this differently in opentrack as opposed to tracknoir
-    //if  (new_frame) { 
-	// in open track always populate the data, it seems opentrack always gives us a zeroed data structure to populate with pose data.
-	// if we have no new data, we don't populate it and so 0 pose gets handed back which is wrong. By always running the code below, if we 
-	// have no new data, we will just give it the previous pose data which is the best thing we can do really.
+        // Need to handle this differently in opentrack as opposed to tracknoir
+    //if  (new_frame) {
+        // in open track always populate the data, it seems opentrack always gives us a zeroed data structure to populate with pose data.
+        // if we have no new data, we don't populate it and so 0 pose gets handed back which is wrong. By always running the code below, if we
+        // have no new data, we will just give it the previous pose data which is the best thing we can do really.
 
     const struct
     {
@@ -167,11 +167,11 @@ void hatire::data(double *data)
         k.place = (k.sign ? -1.f : 1.f) * (k.enable ? k.input : 0.f);
     }
 
-	// For debug
-	//data->x=dataRead.length();
-	//data->y=CptError;
+    // For debug
+    //data->x=dataRead.length();
+    //data->y=CptError;
 }
 
 #include "ftnoir_tracker_hat_dialog.h"
-OPENTRACK_DECLARE_TRACKER(hatire, TrackerControls, TrackerDll)
+OPENTRACK_DECLARE_TRACKER(hatire, dialog_hatire, hatire_metadata)
 
diff --git a/tracker-hatire/ftnoir_tracker_hat.h b/tracker-hatire/ftnoir_tracker_hat.h
index 0969fd9c..0d9d48ad 100644
--- a/tracker-hatire/ftnoir_tracker_hat.h
+++ b/tracker-hatire/ftnoir_tracker_hat.h
@@ -48,7 +48,7 @@ private:
     static inline QByteArray to_latin1(const QString& str) { return str.toLatin1(); }
 };
 
-class TrackerDll : public Metadata
+class hatire_metadata : public Metadata
 {
     QString name() { return QString("Hatire Arduino"); }
     QIcon icon() { return QIcon(":/images/hat.png"); }
diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
index 7acada3f..e12b85ca 100644
--- a/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
+++ b/tracker-hatire/ftnoir_tracker_hat_dialog.cpp
@@ -13,7 +13,7 @@
 
 #include <QScrollBar>
 
-TrackerControls::TrackerControls() : theTracker(nullptr), timer(this)
+dialog_hatire::dialog_hatire() : theTracker(nullptr), timer(this)
 {
     ui.setupUi(this);
 
@@ -118,10 +118,10 @@ TrackerControls::TrackerControls() : theTracker(nullptr), timer(this)
     //connect(ui.lineSend,SIGNAL(keyPressEvent),this,SLOT(on_lineSend_returnPressed()) );
 }
 
-TrackerControls::~TrackerControls() {
+dialog_hatire::~dialog_hatire() {
 }
 
-void TrackerControls::Initialize(QWidget *parent)
+void dialog_hatire::Initialize(QWidget *parent)
 {
     QPoint offsetpos(100, 100);
     if (parent)
@@ -132,14 +132,14 @@ void TrackerControls::Initialize(QWidget *parent)
 //
 // Zero asked to ARDUINO
 //
-void TrackerControls::doZero() {
+void dialog_hatire::doZero() {
     //if (theTracker) theTracker->notifyZeroed();
 }
 
 //
 // Reset asked to ARDUINO
 //
-void TrackerControls::doReset() {
+void dialog_hatire::doReset() {
     if (theTracker) theTracker->reset();
 }
 
@@ -147,14 +147,14 @@ void TrackerControls::doReset() {
 //
 // Serial Info debug
 //
-void TrackerControls::doSerialInfo() {
+void dialog_hatire::doSerialInfo() {
     if (theTracker) theTracker->serial_info();
 }
 
 //
 // Send command to ARDUINO
 //
-void TrackerControls::doSend() {
+void dialog_hatire::doSend() {
     if (theTracker) {
         if (!ui.lineSend->text().isEmpty()) {
             theTracker->send_serial_command(ui.lineSend->text().toLatin1());
@@ -165,7 +165,7 @@ void TrackerControls::doSend() {
 //
 // Enter on lineSend for send to ARDUINO
 //
-void TrackerControls::on_lineSend_returnPressed()
+void dialog_hatire::on_lineSend_returnPressed()
 {
     doSend();
 }
@@ -173,7 +173,7 @@ void TrackerControls::on_lineSend_returnPressed()
 //
 // Display FPS  of Arduino.
 //
-void TrackerControls::poll_tracker_info()
+void dialog_hatire::poll_tracker_info()
 {
     if (theTracker)
     {
@@ -185,7 +185,7 @@ void TrackerControls::poll_tracker_info()
     }
 }
 
-void TrackerControls::WriteMsgInfo(const QByteArray &MsgInfo)
+void dialog_hatire::WriteMsgInfo(const QByteArray &MsgInfo)
 {
     QApplication::beep();
     ui.pteINFO->moveCursor(QTextCursor::End);
@@ -194,18 +194,18 @@ void TrackerControls::WriteMsgInfo(const QByteArray &MsgInfo)
     bar->setValue(bar->maximum());
 }
 
-void TrackerControls::doOK()
+void dialog_hatire::doOK()
 {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel()
+void dialog_hatire::doCancel()
 {
     close();
 }
 
-void TrackerControls::register_tracker(ITracker *tracker)
+void dialog_hatire::register_tracker(ITracker *tracker)
 {
     theTracker = static_cast<hatire*>(tracker);
     connect(&theTracker->t, SIGNAL(serial_debug_info(QByteArray)), this, SLOT(WriteMsgInfo(QByteArray)));
@@ -220,7 +220,7 @@ void TrackerControls::register_tracker(ITracker *tracker)
     timer.start(250);
 }
 
-void TrackerControls::unregister_tracker()
+void dialog_hatire::unregister_tracker()
 {
     timer.stop();
     theTracker = nullptr;
diff --git a/tracker-hatire/ftnoir_tracker_hat_dialog.h b/tracker-hatire/ftnoir_tracker_hat_dialog.h
index 61868d43..7577445c 100644
--- a/tracker-hatire/ftnoir_tracker_hat_dialog.h
+++ b/tracker-hatire/ftnoir_tracker_hat_dialog.h
@@ -12,12 +12,12 @@
 #include <QMetaType>
 
 // Widget that has controls for FTNoIR protocol client-settings.
-class TrackerControls: public ITrackerDialog
+class dialog_hatire: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    explicit TrackerControls();
-    ~TrackerControls() override;
+    explicit dialog_hatire();
+    ~dialog_hatire() override;
     void Initialize(QWidget *parent) ; // unused
     void register_tracker(ITracker *tracker) override;
     void unregister_tracker() override;
diff --git a/tracker-hydra/ftnoir_tracker_hydra.cpp b/tracker-hydra/ftnoir_tracker_hydra.cpp
index 809f2fba..781339fa 100644
--- a/tracker-hydra/ftnoir_tracker_hydra.cpp
+++ b/tracker-hydra/ftnoir_tracker_hydra.cpp
@@ -44,4 +44,4 @@ void Hydra_Tracker::data(double *data)
     data[Roll] = double(ypr[2]) * r2d;
 }
 
-OPENTRACK_DECLARE_TRACKER(Hydra_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(Hydra_Tracker, dialog_hydra, hydraDll)
diff --git a/tracker-hydra/ftnoir_tracker_hydra.h b/tracker-hydra/ftnoir_tracker_hydra.h
index d17d9f73..31a994d5 100644
--- a/tracker-hydra/ftnoir_tracker_hydra.h
+++ b/tracker-hydra/ftnoir_tracker_hydra.h
@@ -24,11 +24,11 @@ private:
     QMutex mutex;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_hydra: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_hydra();
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
 private:
@@ -39,7 +39,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class hydraDll : public Metadata
 {
 public:
     QString name() { return QString("Razer Hydra -- inertial device"); }
diff --git a/tracker-hydra/ftnoir_tracker_hydra_dialog.cpp b/tracker-hydra/ftnoir_tracker_hydra_dialog.cpp
index 42019dfa..56b1e379 100644
--- a/tracker-hydra/ftnoir_tracker_hydra_dialog.cpp
+++ b/tracker-hydra/ftnoir_tracker_hydra_dialog.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_tracker_hydra.h"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls()
+dialog_hydra::dialog_hydra()
 {
     ui.setupUi(this);
 
@@ -9,12 +9,12 @@ TrackerControls::TrackerControls()
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 }
 
-void TrackerControls::doOK() {
+void dialog_hydra::doOK() {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel()
+void dialog_hydra::doCancel()
 {
     close();
 }
diff --git a/tracker-joystick/ftnoir_tracker_joystick.cpp b/tracker-joystick/ftnoir_tracker_joystick.cpp
index fff060d6..498b4e42 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick.cpp
@@ -9,7 +9,7 @@
 #include "api/plugin-api.hpp"
 #include <QMutexLocker>
 
-FTNoIR_Tracker::FTNoIR_Tracker()
+joystick::joystick()
 {
     if (static_cast<QString>(s.guid) == "")
     {
@@ -22,15 +22,15 @@ FTNoIR_Tracker::FTNoIR_Tracker()
     }
 }
 
-FTNoIR_Tracker::~FTNoIR_Tracker()
+joystick::~joystick()
 {
 }
 
-void FTNoIR_Tracker::start_tracker(QFrame*)
+void joystick::start_tracker(QFrame*)
 {
 }
 
-void FTNoIR_Tracker::data(double *data)
+void joystick::data(double *data)
 {
     int map[6] = {
         s.joy_1 - 1,
@@ -68,4 +68,4 @@ void FTNoIR_Tracker::data(double *data)
     }
 }
 
-OPENTRACK_DECLARE_TRACKER(FTNoIR_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(joystick, dialog_joystick, joystickDll)
diff --git a/tracker-joystick/ftnoir_tracker_joystick.h b/tracker-joystick/ftnoir_tracker_joystick.h
index a7e8fddd..3a5175ed 100644
--- a/tracker-joystick/ftnoir_tracker_joystick.h
+++ b/tracker-joystick/ftnoir_tracker_joystick.h
@@ -36,11 +36,11 @@ struct settings : opts {
     {}
 };
 
-class FTNoIR_Tracker : public ITracker
+class joystick : public ITracker
 {
 public:
-    FTNoIR_Tracker();
-    ~FTNoIR_Tracker();
+    joystick();
+    ~joystick();
     void start_tracker(QFrame *);
     void data(double *data);
     settings s;
@@ -49,15 +49,15 @@ public:
     win32_joy_ctx joy_ctx;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_joystick: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_joystick();
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
     Ui::UIJoystickControls ui;
-    FTNoIR_Tracker* tracker;
+    joystick* tracker;
     settings s;
     struct joys {
         QString name;
@@ -69,7 +69,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class joystickDll : public Metadata
 {
 public:
     QString name() { return QString("Joystick input"); }
diff --git a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
index 1d67cdbb..aa4b783a 100644
--- a/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/tracker-joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_tracker_joystick.h"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls() : tracker(nullptr)
+dialog_joystick::dialog_joystick() : tracker(nullptr)
 {
     ui.setupUi( this );
 
@@ -39,7 +39,7 @@ TrackerControls::TrackerControls() : tracker(nullptr)
     tie_setting(s.joy_6, ui.joy_6);
 }
 
-void TrackerControls::doOK() {
+void dialog_joystick::doOK() {
     int idx = ui.joylist->currentIndex();
     joys def { "", "" };
     auto val = _joys.value(idx, def);
@@ -48,6 +48,6 @@ void TrackerControls::doOK() {
     close();
 }
 
-void TrackerControls::doCancel() {
+void dialog_joystick::doCancel() {
     close();
 }
diff --git a/tracker-pt/ftnoir_tracker_pt.cpp b/tracker-pt/ftnoir_tracker_pt.cpp
index 20084c10..d13c5545 100644
--- a/tracker-pt/ftnoir_tracker_pt.cpp
+++ b/tracker-pt/ftnoir_tracker_pt.cpp
@@ -287,5 +287,5 @@ bool Tracker_PT::get_cam_info(CamInfo* info)
 }
 
 #include "ftnoir_tracker_pt_dialog.h"
-OPENTRACK_DECLARE_TRACKER(Tracker_PT, TrackerDialog_PT, TrackerDll)
+OPENTRACK_DECLARE_TRACKER(Tracker_PT, TrackerDialog_PT, PT_metadata)
 
diff --git a/tracker-pt/ftnoir_tracker_pt.h b/tracker-pt/ftnoir_tracker_pt.h
index 513c9b2c..23bc1e9c 100644
--- a/tracker-pt/ftnoir_tracker_pt.h
+++ b/tracker-pt/ftnoir_tracker_pt.h
@@ -82,7 +82,7 @@ private:
     //static constexpr float deg2rad = float(M_PI/180);
 };
 
-class TrackerDll : public Metadata
+class PT_metadata : public Metadata
 {
     QString name() { return QString("PointTracker 1.1"); }
     QIcon icon() { return QIcon(":/Resources/Logo_IR.png"); }
diff --git a/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui b/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui
index 20c8f00b..a22ad85d 100644
--- a/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui
+++ b/tracker-rift-025/ftnoir_rift_clientcontrols_025.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UIRiftControls</class>
- <widget class="QWidget" name="UIRiftControls">
+ <class>dialog_rift_025</class>
+ <widget class="QWidget" name="dialog_rift_025">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_025.cpp
index e0ea2ad7..7c0b2a55 100644
--- a/tracker-rift-025/ftnoir_tracker_rift_025.cpp
+++ b/tracker-rift-025/ftnoir_tracker_rift_025.cpp
@@ -100,4 +100,4 @@ void Rift_Tracker::data(double *data)
     }
 }
 
-OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(Rift_Tracker, dialog_rift_025, rift_025Dll)
diff --git a/tracker-rift-025/ftnoir_tracker_rift_025.h b/tracker-rift-025/ftnoir_tracker_rift_025.h
index 20b88a28..622b0722 100644
--- a/tracker-rift-025/ftnoir_tracker_rift_025.h
+++ b/tracker-rift-025/ftnoir_tracker_rift_025.h
@@ -37,24 +37,24 @@ private:
     OVR::SensorFusion* pSFusion;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_rift_025: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_rift_025();
 
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
 
 private:
-    Ui::UIRiftControls ui;
+    Ui::dialog_rift_025 ui;
     settings s;
 private slots:
     void doOK();
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class rift_025Dll : public Metadata
 {
 public:
     QString name() { return QString("Oculus Rift runtime 0.2.5 -- HMD"); }
diff --git a/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp b/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp
index c3a6a198..010fc699 100644
--- a/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp
+++ b/tracker-rift-025/ftnoir_tracker_rift_dialog_025.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_tracker_rift_025.h"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls()
+dialog_rift_025::dialog_rift_025()
 {
     ui.setupUi( this );
 
@@ -14,12 +14,12 @@ TrackerControls::TrackerControls()
     tie_setting(s.useYawSpring, ui.yawSpring);
 }
 
-void TrackerControls::doOK() {
+void dialog_rift_025::doOK() {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel() {
+void dialog_rift_025::doCancel() {
     close();
 }
 
diff --git a/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui b/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui
index 20c8f00b..2b3316fd 100644
--- a/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui
+++ b/tracker-rift-042/ftnoir_rift_clientcontrols_042.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UIRiftControls</class>
- <widget class="QWidget" name="UIRiftControls">
+ <class>dialog_rift_042</class>
+ <widget class="QWidget" name="dialog_rift_042">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_042.cpp
index 1b819328..af8a386f 100644
--- a/tracker-rift-042/ftnoir_tracker_rift_042.cpp
+++ b/tracker-rift-042/ftnoir_tracker_rift_042.cpp
@@ -87,4 +87,4 @@ void Rift_Tracker::data(double *data)
     }
 }
 
-OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(Rift_Tracker, dialog_rift_042, rift_042Dll)
diff --git a/tracker-rift-042/ftnoir_tracker_rift_042.h b/tracker-rift-042/ftnoir_tracker_rift_042.h
index 69c5487e..103db3cc 100644
--- a/tracker-rift-042/ftnoir_tracker_rift_042.h
+++ b/tracker-rift-042/ftnoir_tracker_rift_042.h
@@ -34,24 +34,24 @@ private:
     settings s;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_rift_042: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_rift_042();
 
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
 
 private:
-    Ui::UIRiftControls ui;
+    Ui::dialog_rift_042 ui;
     settings s;
 private slots:
     void doOK();
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class rift_042Dll : public Metadata
 {
 public:
     QString name() { return QString("Oculus Rift runtime 0.4.2 -- HMD"); }
diff --git a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp
index f520b4b5..032c3c63 100644
--- a/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp
+++ b/tracker-rift-042/ftnoir_tracker_rift_dialog_042.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_tracker_rift_042.h"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls()
+dialog_rift_042::dialog_rift_042()
 {
     ui.setupUi( this );
 
@@ -14,12 +14,12 @@ TrackerControls::TrackerControls()
     tie_setting(s.useYawSpring, ui.yawSpring);
 }
 
-void TrackerControls::doOK() {
+void dialog_rift_042::doOK() {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel() {
+void dialog_rift_042::doCancel() {
     close();
 }
 
diff --git a/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui b/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui
index 20c8f00b..d348fd35 100644
--- a/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui
+++ b/tracker-rift-080/ftnoir_rift_clientcontrols_080.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UIRiftControls</class>
- <widget class="QWidget" name="UIRiftControls">
+ <class>dialog_rift_080</class>
+ <widget class="QWidget" name="dialog_rift_080">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_080.cpp
index a7d09035..35a268f2 100644
--- a/tracker-rift-080/ftnoir_tracker_rift_080.cpp
+++ b/tracker-rift-080/ftnoir_tracker_rift_080.cpp
@@ -100,4 +100,4 @@ void Rift_Tracker::data(double *data)
     }
 }
 
-OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(Rift_Tracker, dialog_rift_080, rift_080Dll)
diff --git a/tracker-rift-080/ftnoir_tracker_rift_080.h b/tracker-rift-080/ftnoir_tracker_rift_080.h
index 139c480f..e1283226 100644
--- a/tracker-rift-080/ftnoir_tracker_rift_080.h
+++ b/tracker-rift-080/ftnoir_tracker_rift_080.h
@@ -33,24 +33,24 @@ private:
     settings s;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_rift_080: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_rift_080();
 
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
 
 private:
-    Ui::UIRiftControls ui;
+    Ui::dialog_rift_080 ui;
     settings s;
 private slots:
     void doOK();
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class rift_080Dll : public Metadata
 {
 public:
     QString name() { return QString("Oculus Rift runtime 0.8.0 -- HMD"); }
diff --git a/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp b/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp
index aba4f6bf..27eb54e4 100644
--- a/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp
+++ b/tracker-rift-080/ftnoir_tracker_rift_dialog_080.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_tracker_rift_080.h"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls()
+dialog_rift_080::dialog_rift_080()
 {
     ui.setupUi( this );
 
@@ -14,12 +14,12 @@ TrackerControls::TrackerControls()
     tie_setting(s.useYawSpring, ui.yawSpring);
 }
 
-void TrackerControls::doOK() {
+void dialog_rift_080::doOK() {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel() {
+void dialog_rift_080::doCancel() {
     close();
 }
 
diff --git a/tracker-rift-140/dialog.cpp b/tracker-rift-140/dialog.cpp
index a6bf8126..bd6ac46c 100644
--- a/tracker-rift-140/dialog.cpp
+++ b/tracker-rift-140/dialog.cpp
@@ -1,7 +1,7 @@
 #include "rift-140.hpp"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls()
+dialog_rift_140::dialog_rift_140()
 {
     ui.setupUi( this );
 
@@ -14,12 +14,12 @@ TrackerControls::TrackerControls()
     tie_setting(s.useYawSpring, ui.yawSpring);
 }
 
-void TrackerControls::doOK() {
+void dialog_rift_140::doOK() {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel() {
+void dialog_rift_140::doCancel() {
     close();
 }
 
diff --git a/tracker-rift-140/dialog.ui b/tracker-rift-140/dialog.ui
index 20c8f00b..6fe583c3 100644
--- a/tracker-rift-140/dialog.ui
+++ b/tracker-rift-140/dialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>UIRiftControls</class>
- <widget class="QWidget" name="UIRiftControls">
+ <class>dialog_rift_140</class>
+ <widget class="QWidget" name="dialog_rift_140">
   <property name="windowModality">
    <enum>Qt::NonModal</enum>
   </property>
diff --git a/tracker-rift-140/impl.cpp b/tracker-rift-140/impl.cpp
index 964858ac..67d5bb47 100644
--- a/tracker-rift-140/impl.cpp
+++ b/tracker-rift-140/impl.cpp
@@ -94,4 +94,4 @@ void Rift_Tracker::data(double *data)
     }
 }
 
-OPENTRACK_DECLARE_TRACKER(Rift_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(Rift_Tracker, dialog_rift_140, rift_140Dll)
diff --git a/tracker-rift-140/lang/pl_PL.ts b/tracker-rift-140/lang/pl_PL.ts
index 29c051ea..cc49d21d 100644
--- a/tracker-rift-140/lang/pl_PL.ts
+++ b/tracker-rift-140/lang/pl_PL.ts
@@ -2,7 +2,7 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="pl_PL">
 <context>
-    <name>UIRiftControls</name>
+    <name>dialog_rift_140</name>
     <message>
         <location filename="../dialog.ui" line="+23"/>
         <source>Oculus Rift tracker settings FaceTrackNoIR</source>
diff --git a/tracker-rift-140/lang/ru_RU.ts b/tracker-rift-140/lang/ru_RU.ts
index 84d12da1..33e80935 100644
--- a/tracker-rift-140/lang/ru_RU.ts
+++ b/tracker-rift-140/lang/ru_RU.ts
@@ -2,7 +2,7 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="ru_RU">
 <context>
-    <name>UIRiftControls</name>
+    <name>dialog_rift_140</name>
     <message>
         <location filename="../dialog.ui" line="+23"/>
         <source>Oculus Rift tracker settings FaceTrackNoIR</source>
diff --git a/tracker-rift-140/rift-140.hpp b/tracker-rift-140/rift-140.hpp
index 912f8587..22b2b383 100644
--- a/tracker-rift-140/rift-140.hpp
+++ b/tracker-rift-140/rift-140.hpp
@@ -34,24 +34,24 @@ private:
     settings s;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_rift_140: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_rift_140();
 
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
 
 private:
-    Ui::UIRiftControls ui;
+    Ui::dialog_rift_140 ui;
     settings s;
 private slots:
     void doOK();
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class rift_140Dll : public Metadata
 {
 public:
     QString name() { return QString("Oculus Rift runtime 1.4.0 -- HMD"); }
diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp
index 37b357c0..4364eca0 100644
--- a/tracker-rs/ftnoir_tracker_rs.cpp
+++ b/tracker-rs/ftnoir_tracker_rs.cpp
@@ -149,4 +149,4 @@ QIcon RSTrackerMetaData::icon() {
     return QIcon(":/images/intel-16x16.png");
 }
 
-OPENTRACK_DECLARE_TRACKER(RSTracker, RSTrackerControls, RSTrackerMetaData)
+OPENTRACK_DECLARE_TRACKER(RSTracker, RSdialog_realsense, RSTrackerMetaData)
diff --git a/tracker-rs/ftnoir_tracker_rs_controls.cpp b/tracker-rs/ftnoir_tracker_rs_controls.cpp
index 9ef14c9e..3ea2a0a1 100644
--- a/tracker-rs/ftnoir_tracker_rs_controls.cpp
+++ b/tracker-rs/ftnoir_tracker_rs_controls.cpp
@@ -7,7 +7,7 @@
 
 #include "ftnoir_tracker_rs_controls.h"
 
-RSTrackerControls::RSTrackerControls()
+RSdialog_realsense::RSdialog_realsense()
 {
     ui.setupUi(this);
     connect(ui.triggerSDKInstallButton, SIGNAL(clicked(bool)), this, SLOT(doInstallRSRuntime()));
@@ -15,19 +15,19 @@ RSTrackerControls::RSTrackerControls()
     connect(ui.buttonBox, SIGNAL(accepted()), this, SLOT(doOK()));
 }
 
-void RSTrackerControls::doInstallRSRuntime()
+void RSdialog_realsense::doInstallRSRuntime()
 {
     bool pStarted = RSTracker::startSdkInstallationProcess();
     if(pStarted == true)
         close();
 }
 
-void RSTrackerControls::doOK()
+void RSdialog_realsense::doOK()
 {
     close();
 }
 
-void RSTrackerControls::doCancel()
+void RSdialog_realsense::doCancel()
 {
     close();
 }
diff --git a/tracker-rs/ftnoir_tracker_rs_controls.h b/tracker-rs/ftnoir_tracker_rs_controls.h
index 1502b76a..eeb6ac29 100644
--- a/tracker-rs/ftnoir_tracker_rs_controls.h
+++ b/tracker-rs/ftnoir_tracker_rs_controls.h
@@ -9,11 +9,11 @@
 
 #include "ftnoir_tracker_rs.h"
 
-class RSTrackerControls : public ITrackerDialog
+class RSdialog_realsense : public ITrackerDialog
 {
     Q_OBJECT
 public:
-    RSTrackerControls();
+    RSdialog_realsense();
     void register_tracker(ITracker *) {}
     void unregister_tracker() {}
 private:
diff --git a/tracker-test/test.cpp b/tracker-test/test.cpp
index 9ffdd366..eba1f603 100644
--- a/tracker-test/test.cpp
+++ b/tracker-test/test.cpp
@@ -12,22 +12,22 @@
 
 #include <QDebug>
 
-const double FTNoIR_Tracker::incr[6] =
+const double test_tracker::incr[6] =
 {
     50, 40, 80,
     70, 5, 3
 };
 
-FTNoIR_Tracker::FTNoIR_Tracker() :
+test_tracker::test_tracker() :
     last_x { 0, 0, 0, 0, 0, 0 }
 {
 }
 
-FTNoIR_Tracker::~FTNoIR_Tracker()
+test_tracker::~test_tracker()
 {
 }
 
-void FTNoIR_Tracker::start_tracker(QFrame*)
+void test_tracker::start_tracker(QFrame*)
 {
     t.start();
 }
@@ -36,7 +36,7 @@ void FTNoIR_Tracker::start_tracker(QFrame*)
 #   include <cstdlib>
 #endif
 
-void FTNoIR_Tracker::data(double *data)
+void test_tracker::data(double *data)
 {
     using std::fmod;
     using std::sin;
@@ -77,7 +77,7 @@ void FTNoIR_Tracker::data(double *data)
         }
 }
 
-TrackerControls::TrackerControls()
+dialog::dialog()
 {
     ui.setupUi(this);
 
@@ -85,15 +85,15 @@ TrackerControls::TrackerControls()
     connect(ui.buttonBox, SIGNAL(rejected()), this, SLOT(doCancel()));
 }
 
-void TrackerControls::doOK()
+void dialog::doOK()
 {
     //s.b->save();
     close();
 }
 
-void TrackerControls::doCancel()
+void dialog::doCancel()
 {
     close();
 }
 
-OPENTRACK_DECLARE_TRACKER(FTNoIR_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(test_tracker, dialog, metadata)
diff --git a/tracker-test/test.h b/tracker-test/test.h
index acaee67d..5d425b96 100644
--- a/tracker-test/test.h
+++ b/tracker-test/test.h
@@ -5,11 +5,11 @@
 
 #include <cmath>
 
-class FTNoIR_Tracker : public ITracker
+class test_tracker : public ITracker
 {
 public:
-    FTNoIR_Tracker();
-    ~FTNoIR_Tracker() override;
+    test_tracker();
+    ~test_tracker() override;
     void start_tracker(QFrame *) override;
     void data(double *data) override;
 
@@ -22,13 +22,13 @@ private:
     Timer t;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog: public ITrackerDialog
 {
     Q_OBJECT
 
     Ui::test_ui ui;
 public:
-    TrackerControls();
+    dialog();
     void register_tracker(ITracker *) override {}
     void unregister_tracker() override {}
 private slots:
@@ -36,7 +36,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class metadata : public Metadata
 {
 public:
     QString name() { return QString("Testing - sine wave"); }
diff --git a/tracker-udp/ftnoir_tracker_udp.cpp b/tracker-udp/ftnoir_tracker_udp.cpp
index b92ed569..5f95ab5a 100644
--- a/tracker-udp/ftnoir_tracker_udp.cpp
+++ b/tracker-udp/ftnoir_tracker_udp.cpp
@@ -11,19 +11,19 @@
 #include "compat/nan.hpp"
 #include "compat/util.hpp"
 
-FTNoIR_Tracker::FTNoIR_Tracker() :
+udp::udp() :
     last_recv_pose { 0,0,0, 0,0,0 },
     last_recv_pose2 { 0,0,0, 0,0,0 },
     should_quit(false)
 {}
 
-FTNoIR_Tracker::~FTNoIR_Tracker()
+udp::~udp()
 {
     should_quit = true;
     wait();
 }
 
-void FTNoIR_Tracker::run()
+void udp::run()
 {
     QByteArray datagram;
     datagram.resize(sizeof(last_recv_pose));
@@ -67,13 +67,13 @@ void FTNoIR_Tracker::run()
     }
 }
 
-void FTNoIR_Tracker::start_tracker(QFrame*)
+void udp::start_tracker(QFrame*)
 {
     start();
     sock.moveToThread(this);
 }
 
-void FTNoIR_Tracker::data(double *data)
+void udp::data(double *data)
 {
     QMutexLocker foo(&mutex);
     for (int i = 0; i < 6; i++)
@@ -100,4 +100,4 @@ void FTNoIR_Tracker::data(double *data)
 }
 
 
-OPENTRACK_DECLARE_TRACKER(FTNoIR_Tracker, TrackerControls, FTNoIR_TrackerDll)
+OPENTRACK_DECLARE_TRACKER(udp, dialog_udp, udpDll)
diff --git a/tracker-udp/ftnoir_tracker_udp.h b/tracker-udp/ftnoir_tracker_udp.h
index b93c5e93..307417b2 100644
--- a/tracker-udp/ftnoir_tracker_udp.h
+++ b/tracker-udp/ftnoir_tracker_udp.h
@@ -19,11 +19,11 @@ struct settings : opts {
     {}
 };
 
-class FTNoIR_Tracker : public ITracker, protected QThread
+class udp : public ITracker, protected QThread
 {
 public:
-    FTNoIR_Tracker();
-    ~FTNoIR_Tracker() override;
+    udp();
+    ~udp() override;
     void start_tracker(QFrame *) override;
     void data(double *data) override;
 protected:
@@ -36,11 +36,11 @@ private:
     volatile bool should_quit;
 };
 
-class TrackerControls: public ITrackerDialog
+class dialog_udp: public ITrackerDialog
 {
     Q_OBJECT
 public:
-    TrackerControls();
+    dialog_udp();
     void register_tracker(ITracker *) override {}
     void unregister_tracker() override {}
 private:
@@ -51,7 +51,7 @@ private slots:
     void doCancel();
 };
 
-class FTNoIR_TrackerDll : public Metadata
+class udpDll : public Metadata
 {
 public:
     QString name() { return QString("UDP sender"); }
diff --git a/tracker-udp/ftnoir_tracker_udp_dialog.cpp b/tracker-udp/ftnoir_tracker_udp_dialog.cpp
index af94183c..8ed7cb02 100644
--- a/tracker-udp/ftnoir_tracker_udp_dialog.cpp
+++ b/tracker-udp/ftnoir_tracker_udp_dialog.cpp
@@ -1,7 +1,7 @@
 #include "ftnoir_tracker_udp.h"
 #include "api/plugin-api.hpp"
 
-TrackerControls::TrackerControls()
+dialog_udp::dialog_udp()
 {
     ui.setupUi( this );
 
@@ -14,12 +14,12 @@ TrackerControls::TrackerControls()
     tie_setting(s.add_roll, ui.add_roll);
 }
 
-void TrackerControls::doOK() {
+void dialog_udp::doOK() {
     s.b->save();
     close();
 }
 
-void TrackerControls::doCancel() {
+void dialog_udp::doCancel() {
     close();
 }