diff --git a/app/br/br.cpp b/app/br/br.cpp
index f9a7e64..9f8b1d1 100644
--- a/app/br/br.cpp
+++ b/app/br/br.cpp
@@ -51,7 +51,8 @@ static void help()
            "-cluster <simmat> ... <simmat> <aggressiveness> {csv}\n"
            "-makeMask <target_gallery> <query_gallery> {mask}\n"
            "-combineMasks <mask> ... <mask> {mask} (And|Or)\n"
-           "-convert <(csv,simmat,mask)> {(csv,simmat,mask)}\n"
+           "-cat <gallery> ... <gallery> {gallery}\n"
+           "-convert <template> {template}\n"
            "-reformat <target_sigset> <query_sigset> <simmat> {output}\n"
            "-evalClassification <predicted_gallery> <truth_gallery>\n"
            "-evalRegression <predicted_gallery> <truth_gallery>\n"
@@ -141,6 +142,9 @@ int main(int argc, char *argv[])
         } else if (!strcmp(fun, "combineMasks")) {
             check(parc >= 4, "Insufficient parameter count for 'combineMasks'.");
             br_combine_masks(parc-2, parv, parv[parc-2], parv[parc-1]);
+        } else if (!strcmp(fun, "cat")) {
+            check(parc >= 2, "Insufficient parameter count for 'cat'.");
+            br_cat(parc-1, parv, parv[parc-1]);
         } else if (!strcmp(fun, "convert")) {
             check(parc == 2, "Incorrect parameter count for 'convert'.");
             br_convert(parv[0], parv[1]);
diff --git a/app/openbr-gui/transformeditor.cpp b/app/openbr-gui/transformeditor.cpp
index c07ad94..4f2752a 100644
--- a/app/openbr-gui/transformeditor.cpp
+++ b/app/openbr-gui/transformeditor.cpp
@@ -28,17 +28,17 @@ br::TransformEditor::TransformEditor(Transform *transform, QWidget *parent)
     layout.addWidget(&name);
     setLayout(&layout);
 
-    name.setCurrentIndex(name.findText(transform->name().remove("Transform")));
+    name.setCurrentIndex(name.findText(transform->objectName().remove("Transform")));
     const QMetaObject *mo = transform->metaObject();
     for (int i=mo->propertyOffset(); i<mo->propertyCount(); i++) {
         QMetaProperty mp = mo->property(i);
         const QString typeName = mp.typeName();
         if (typeName == "QList<br::Transform*>") {
             QString separator;
-            if      (transform->name() == "ChainTransform") separator = "!";
-            else if (transform->name() == "PipeTransform")  separator = "+";
-            else if (transform->name() == "ForkTransform")  separator = "/";
-            else                                            separator = "?";
+            if      (transform->objectName() == "Chain") separator = "!";
+            else if (transform->objectName() == "Pipe")  separator = "+";
+            else if (transform->objectName() == "Fork")  separator = "/";
+            else                                         separator = "?";
             parameters.append(new TransformListEditor(mp.read(transform).value< QList<br::Transform*> >(), separator, this));
         }
     }
diff --git a/scripts/matlab/loadMtx.m b/scripts/matlab/loadMtx.m
deleted file mode 100644
index a41331c..0000000
--- a/scripts/matlab/loadMtx.m
+++ /dev/null
@@ -1,59 +0,0 @@
-function [x2] = loadMtx(filename,isRowMajor)
-% [x2] = loadMtx(filename,reverse)
-%
-% Loads a *.mtx file into a Matlab matrix. 
-%       'filename' - the name of the mtx file
-%       'isRowMajor' - determines whether the 
-%                   matrix is read in row major or
-%                   column major order (optional, default is false)
-%
-% This file can likely be improved in terms of effeciency. 
-
-   
-    if nargin < 2,
-        reverse = false;
-    end
-
-    z = fopen(filename,'r');
-    if z == -1,
-        fprintf('Error opening file %s\n',filename);
-        x2 = 0;
-        return
-    end
-
-    buf = zeros(100,1);
-    str_list = cell(4,1);
-    for i = 1:4,
-        cnt = 0;
-        while true
-            cnt = cnt + 1;
-            [a ] = fread(z,1,'uchar');
-            if a == 10
-                break;
-            end
-            buf(cnt) = a;
-        end
-        str_list{i} = char(buf(1:cnt-1)');
-    end
-
-    s = strsplit(' ',str_list{4});
-    x = str2num(s{2});
-    x1 = str2num(s{3});
-    typ = s{1}(2);
-
-    %x2 = fread(z,[x1  x],'float32');
-    if strcmp(typ,'F')
-        x2 = fread(z,[x1  x],'single');
-    elseif strcmp(typ,'B')
-        x2 = fread(z,[x1  x],'int8');
-    else
-        assert(0);
-    end
-    x2 = x2';
-    fclose(z);
-
-    if reverse,
-        sz = size(x2);
-        x2 = x2';
-        x2 = reshape(x2,sz);
-    end
diff --git a/sdk/core/core.cpp b/sdk/core/core.cpp
index 949667d..22a078e 100644
--- a/sdk/core/core.cpp
+++ b/sdk/core/core.cpp
@@ -315,11 +315,26 @@ void br::Compare(const File &targetGallery, const File &queryGallery, const File
 
 void br::Convert(const File &src, const File &dst)
 {
+    qDebug("Converting %s to %s", qPrintable(src.flat()), qPrintable(dst.flat()));
     QScopedPointer<Format> before(Factory<Format>::make(src));
     QScopedPointer<Format> after(Factory<Format>::make(dst));
     after->write(before->read());
 }
 
+void br::Cat(const QStringList &inputGalleries, const QString &outputGallery)
+{
+    qDebug("Concatenating %d galleries to %s", inputGalleries.size(), qPrintable(outputGallery));
+    foreach (const QString &inputGallery, inputGalleries)
+        if (inputGallery == outputGallery)
+            qFatal("br::Cat outputGallery must not be in inputGalleries.");
+    QScopedPointer<Gallery> og(Gallery::make(outputGallery));
+    foreach (const QString &inputGallery, inputGalleries) {
+        QScopedPointer<Gallery> ig(Gallery::make(inputGallery));
+        bool done = false;
+        while (!done) og->writeBlock(ig->readBlock(&done));
+    }
+}
+
 QSharedPointer<br::Transform> br::Transform::fromAlgorithm(const QString &algorithm)
 {
     return AlgorithmManager::getAlgorithm(algorithm)->transform;
diff --git a/sdk/core/qtutils.cpp b/sdk/core/qtutils.cpp
index f546ea3..716f4ff 100644
--- a/sdk/core/qtutils.cpp
+++ b/sdk/core/qtutils.cpp
@@ -113,7 +113,8 @@ void QtUtils::writeFile(const QString &file, const QByteArray &data, int compres
     QFile f(file);
     touchDir(f);
     if (!f.open(QFile::WriteOnly)) qFatal("QtUtils::writeFile failed to open %s for writing.", qPrintable(file));
-    f.write(qCompress(data, compression));
+    if (compression == 0) f.write(data);
+    else                  f.write(qCompress(data, compression));
     f.close();
 }
 
diff --git a/sdk/core/qtutils.h b/sdk/core/qtutils.h
index a4ebe29..807ef43 100644
--- a/sdk/core/qtutils.h
+++ b/sdk/core/qtutils.h
@@ -18,7 +18,6 @@
 #define __QTUTILS_H
 
 #include <QByteArray>
-#include <QDataStream>
 #include <QDir>
 #include <QFile>
 #include <QFileInfo>
diff --git a/sdk/jitcv/jitcv.h b/sdk/jitcv/jitcv.h
index ec4ab4a..8d30286 100644
--- a/sdk/jitcv/jitcv.h
+++ b/sdk/jitcv/jitcv.h
@@ -83,13 +83,15 @@ struct Matrix
     inline uint32_t bytes() const { return bits() / 8 * elements(); }
 };
 
-typedef void (*UnaryFunction_t)(const Matrix *src, Matrix *dst);
-typedef void (*BinaryFunction_t)(const Matrix *srcA, const Matrix *srcB, Matrix *dst);
-typedef void (*UnaryKernel_t)(const Matrix *src, Matrix *dst, uint32_t size);
-typedef void (*BinaryKernel_t)(const Matrix *srcA, const Matrix *srcB, Matrix *dst, uint32_t size);
+typedef void (*UnaryFunction)(const Matrix *src, Matrix *dst);
+typedef void (*BinaryFunction)(const Matrix *srcA, const Matrix *srcB, Matrix *dst);
+UnaryFunction jit_make_unary_function(const char *description);
+BinaryFunction jit_make_binary_function(const char *description);
 
-UnaryFunction_t jit_unary_make(const char *description);
-BinaryFunction_t jit_binary_make(const char *description);
+typedef void (*UnaryKernel)(const Matrix *src, Matrix *dst, uint32_t size);
+typedef void (*BinaryKernel)(const Matrix *srcA, const Matrix *srcB, Matrix *dst, uint32_t size);
+UnaryKernel jit_make_unary_kernel(const char *description, const Matrix *src);
+BinaryKernel jit_make_binary_kernel(const char *description, const Matrix *srcA, const Matrix *srcB);
 
 }
 
diff --git a/sdk/openbr.cpp b/sdk/openbr.cpp
index b0922d8..6ef8b21 100644
--- a/sdk/openbr.cpp
+++ b/sdk/openbr.cpp
@@ -31,6 +31,11 @@ const char *br_about()
     return about.data();
 }
 
+void br_cat(int num_input_galleries, const char *input_galleries[], const char *output_gallery)
+{
+    Cat(QtUtils::toStringList(num_input_galleries, input_galleries), output_gallery);
+}
+
 void br_cluster(int num_simmats, const char *simmats[], float aggressiveness, const char *csv)
 {
     ClusterGallery(QtUtils::toStringList(num_simmats, simmats), aggressiveness, csv);
diff --git a/sdk/openbr.h b/sdk/openbr.h
index d653bd5..a81d7ef 100644
--- a/sdk/openbr.h
+++ b/sdk/openbr.h
@@ -73,6 +73,11 @@ extern "C" {
 BR_EXPORT const char *br_about();
 
 /*!
+ * \brief Wraps br::Cat()
+ */
+BR_EXPORT void br_cat(int num_input_galleries, const char *input_galleries[], const char *output_gallery);
+
+/*!
  * \brief Clusters one or more similarity matrices into a list of subjects.
  *
  * A similarity matrix is a type of br::Output. The current clustering algorithm is a simplified implementation of \cite zhu11.
diff --git a/sdk/openbr_plugin.cpp b/sdk/openbr_plugin.cpp
index 18b842d..0908a21 100644
--- a/sdk/openbr_plugin.cpp
+++ b/sdk/openbr_plugin.cpp
@@ -442,11 +442,6 @@ TemplateList TemplateList::fromInput(const br::File &input)
 }
 
 /* Object - public methods */
-QString Object::name() const
-{
-    return metaObject()->className();
-}
-
 QStringList Object::parameters() const
 {
     QStringList parameters;
@@ -505,7 +500,7 @@ QString Object::argument(int index) const
 QString Object::description() const
 {
     QString argumentString = arguments().join(",");
-    return name() + (argumentString.isEmpty() ? "" : ("(" + argumentString + ")"));
+    return objectName() + (argumentString.isEmpty() ? "" : ("(" + argumentString + ")"));
 }
 
 void Object::store(QDataStream &stream) const
@@ -642,6 +637,23 @@ QStringList br::Object::parse(const QString &string, char split)
 /* Object - private methods */
 void Object::init(const File &file_)
 {
+    this->file = file_;
+
+    // Set name
+    QString name = metaObject()->className();
+    if (name.startsWith("br::")) name = name.right(name.size()-4);
+    const QMetaObject *superClass = metaObject()->superClass();
+    while (superClass != NULL) {
+        QString superClassName = superClass->className();
+        if (superClassName.startsWith("br::"))
+            superClassName = superClassName.right(superClassName.size()-4);
+        if (name.endsWith(superClassName))
+            name = name.left(name.size() - superClassName.size());
+        superClass = superClass->superClass();
+    }
+    setObjectName(name);
+
+    // Set properties
     for (int i=0; i<metaObject()->propertyCount(); i++) {
         QMetaProperty property = metaObject()->property(i);
         if (property.isResettable())
@@ -649,13 +661,13 @@ void Object::init(const File &file_)
                 qFatal("Failed to reset %s::%s", metaObject()->className(), property.name());
     }
 
-    this->file = file_;
-    foreach (QString name, file.localKeys()) {
-        const QString value = file.value(name).toString();
-        if (name.startsWith("_Arg"))
-            name = metaObject()->property(metaObject()->propertyOffset()+name.mid(4).toInt()).name();
-        setProperty(name, value);
+    foreach (QString key, file.localKeys()) {
+        const QString value = file.value(key).toString();
+        if (key.startsWith("_Arg"))
+            key = metaObject()->property(metaObject()->propertyOffset()+key.mid(4).toInt()).name();
+        setProperty(key, value);
     }
+
     init();
 }
 
@@ -681,7 +693,9 @@ int br::Context::blocks(int size) const
 
 bool br::Context::contains(const QString &name)
 {
-    const char *c_name = qPrintable(name);
+    QByteArray bytes = name.toLocal8Bit();
+    const char * c_name = bytes.constData();
+
     for (int i=0; i<metaObject()->propertyCount(); i++)
         if (!strcmp(c_name, metaObject()->property(i).name()))
             return true;
@@ -1055,14 +1069,10 @@ public:
         transform->setParent(this);
         transforms.append(transform);
         file = transform->file;
+        setObjectName(transforms.first()->objectName());
     }
 
 private:
-    QString name() const
-    {
-        return transforms.first()->name();
-    }
-
     Transform *clone() const
     {
         return new Independent(transforms.first()->clone());
@@ -1206,7 +1216,7 @@ static void _project(const Transform *transform, const Template *src, Template *
     try {
         transform->project(*src, *dst);
     } catch (...) {
-        qWarning("Exception triggered when processing %s with transform %s", qPrintable(src->file.flat()), qPrintable(transform->name()));
+        qWarning("Exception triggered when processing %s with transform %s", qPrintable(src->file.flat()), qPrintable(transform->objectName()));
         *dst = Template(src->file);
         dst->file.setBool("FTE");
     }
@@ -1217,7 +1227,7 @@ static void _backProject(const Transform *transform, const Template *dst, Templa
     try {
         transform->backProject(*dst, *src);
     } catch (...) {
-        qWarning("Exception triggered when processing %s with transform %s", qPrintable(src->file.flat()), qPrintable(transform->name()));
+        qWarning("Exception triggered when processing %s with transform %s", qPrintable(src->file.flat()), qPrintable(transform->objectName()));
         *src = Template(dst->file);
         src->file.setBool("FTE");
     }
diff --git a/sdk/openbr_plugin.h b/sdk/openbr_plugin.h
index 7298010..470bef2 100644
--- a/sdk/openbr_plugin.h
+++ b/sdk/openbr_plugin.h
@@ -381,7 +381,6 @@ class BR_EXPORT Object : public QObject
 public:
     File file; /*!< \brief The file used to construct the plugin. */
 
-    virtual QString name() const; /*!< \brief The plugin class name. */
     virtual void init() {} /*!< \brief Overload this function instead of the default constructor to initialize the derived class. It should be safe to call this function multiple times. */
     virtual void store(QDataStream &stream) const; /*!< \brief Serialize the object. */
     virtual void load(QDataStream &stream); /*!< \brief Deserialize the object. Default implementation calls init() after deserialization. */
@@ -1100,6 +1099,14 @@ BR_EXPORT void Compare(const File &targetGallery, const File &queryGallery, cons
  */
 BR_EXPORT void Convert(const File &input, const File &output);
 
+/*!
+ * \brief Concatenate several galleries into one.
+ * \param inputGalleries List of galleries to concatenate.
+ * \param outputGallery Gallery to store the concatenated result.
+ * \note outputGallery must not be in inputGalleries.
+ */
+BR_EXPORT void Cat(const QStringList &inputGalleries, const QString &outputGallery);
+
 /*! @}*/
 
 } // namespace br
diff --git a/sdk/plugins/algorithms.cpp b/sdk/plugins/algorithms.cpp
index 50b31ef..d25208d 100644
--- a/sdk/plugins/algorithms.cpp
+++ b/sdk/plugins/algorithms.cpp
@@ -16,14 +16,15 @@
 
 #include <openbr_plugin.h>
 
-using namespace br;
+namespace br
+{
 
 /*!
  * \ingroup initializers
  * \brief Initializes global abbreviations with implemented algorithms
  * \author Josh Klontz \cite jklontz
  */
-class Algorithms : public Initializer
+class AlgorithmsInitializer : public Initializer
 {
     Q_OBJECT
 
@@ -72,6 +73,8 @@ class Algorithms : public Initializer
     }
 };
 
-BR_REGISTER(Initializer, Algorithms)
+BR_REGISTER(Initializer, AlgorithmsInitializer)
+
+} // namespace br
 
 #include "algorithms.moc"
diff --git a/sdk/plugins/cascade.cpp b/sdk/plugins/cascade.cpp
index ab81aef..19d3898 100644
--- a/sdk/plugins/cascade.cpp
+++ b/sdk/plugins/cascade.cpp
@@ -21,7 +21,9 @@
 #include "core/resource.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 class CascadeResourceMaker : public ResourceMaker<CascadeClassifier>
 {
@@ -55,7 +57,7 @@ private:
  * \brief Wraps OpenCV cascade classifier
  * \author Josh Klontz \cite jklontz
  */
-class Cascade : public UntrainableTransform
+class CascadeTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(QString model READ get_model WRITE set_model RESET reset_model STORED false)
@@ -87,6 +89,8 @@ class Cascade : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Cascade)
+BR_REGISTER(Transform, CascadeTransform)
+
+} // namespace br
 
 #include "cascade.moc"
diff --git a/sdk/plugins/cluster.cpp b/sdk/plugins/cluster.cpp
index 7c8009a..d347f3b 100644
--- a/sdk/plugins/cluster.cpp
+++ b/sdk/plugins/cluster.cpp
@@ -20,14 +20,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Wraps OpenCV kmeans
  * \author Josh Klontz \cite jklontz
  */
-class KMeans : public Transform
+class KMeansTransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(int k READ get_k WRITE set_k RESET reset_k)
@@ -71,6 +73,8 @@ class KMeans : public Transform
     }
 };
 
-BR_REGISTER(Transform, KMeans)
+BR_REGISTER(Transform, KMeansTransform)
+
+}
 
 #include "cluster.moc"
diff --git a/sdk/plugins/compare.cpp b/sdk/plugins/compare.cpp
index 5deb254..113e57f 100644
--- a/sdk/plugins/compare.cpp
+++ b/sdk/plugins/compare.cpp
@@ -20,14 +20,16 @@
 #include "core/distance_sse.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup distances
  * \brief Standard distance metrics
  * \author Josh Klontz \cite jklontz
  */
-class Dist : public Distance
+class DistDistance : public Distance
 {
     Q_OBJECT
     Q_ENUMS(Metric)
@@ -110,14 +112,14 @@ private:
     }
 };
 
-BR_REGISTER(Distance, Dist)
+BR_REGISTER(Distance, DistDistance)
 
 /*!
  * \ingroup distances
  * \brief Fast 8-bit L1 distance
  * \author Josh Klontz \cite jklontz
  */
-class UCharL1 : public Distance
+class UCharL1Distance : public Distance
 {
     Q_OBJECT
 
@@ -127,7 +129,7 @@ class UCharL1 : public Distance
     }
 };
 
-BR_REGISTER(Distance, UCharL1)
+BR_REGISTER(Distance, UCharL1Distance)
 
 
 /*!
@@ -135,7 +137,7 @@ BR_REGISTER(Distance, UCharL1)
  * \brief Fast 4-bit L1 distance
  * \author Josh Klontz \cite jklontz
  */
-class PackedUCharL1 : public Distance
+class PackedUCharL1Distance : public Distance
 {
     Q_OBJECT
 
@@ -145,14 +147,14 @@ class PackedUCharL1 : public Distance
     }
 };
 
-BR_REGISTER(Distance, PackedUCharL1)
+BR_REGISTER(Distance, PackedUCharL1Distance)
 
 /*!
  * \ingroup distances
  * \brief Returns \c true if the templates are identical, \c false otherwise.
  * \author Josh Klontz \cite jklontz
  */
-class Identical : public Distance
+class IdenticalDistance : public Distance
 {
     Q_OBJECT
 
@@ -168,6 +170,8 @@ class Identical : public Distance
     }
 };
 
-BR_REGISTER(Distance, Identical)
+BR_REGISTER(Distance, IdenticalDistance)
+
+} // namespace br
 
 #include "compare.moc"
diff --git a/sdk/plugins/crop.cpp b/sdk/plugins/crop.cpp
index 4b2f478..ca128aa 100644
--- a/sdk/plugins/crop.cpp
+++ b/sdk/plugins/crop.cpp
@@ -20,14 +20,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Crops the regions of interest.
  * \author Josh Klontz \cite jklontz
  */
-class ROI : public UntrainableTransform
+class ROITransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -38,14 +40,14 @@ class ROI : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, ROI)
+BR_REGISTER(Transform, ROITransform)
 
 /*!
  * \ingroup transforms
  * \brief Resize the template
  * \author Josh Klontz \cite jklontz
  */
-class Resize : public UntrainableTransform
+class ResizeTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int rows READ get_rows WRITE set_rows RESET reset_rows STORED false)
@@ -59,14 +61,14 @@ class Resize : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Resize)
+BR_REGISTER(Transform, ResizeTransform)
 
 /*!
  * \ingroup transforms
  * \brief Limit the size of the template
  * \author Josh Klontz \cite jklontz
  */
-class LimitSize : public UntrainableTransform
+class LimitSizeTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int max READ get_max WRITE set_max RESET reset_max STORED false)
@@ -84,14 +86,14 @@ class LimitSize : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, LimitSize)
+BR_REGISTER(Transform, LimitSizeTransform)
 
 /*!
  * \ingroup transforms
  * \brief Crop out black borders
  * \author Josh Klontz \cite jklontz
  */
-class CropBlack : public UntrainableTransform
+class CropBlackTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -128,6 +130,8 @@ class CropBlack : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, CropBlack)
+BR_REGISTER(Transform, CropBlackTransform)
+
+} // namespace br
 
 #include "crop.moc"
diff --git a/sdk/plugins/cvt.cpp b/sdk/plugins/cvt.cpp
index fe85f5c..6fd9b4d 100644
--- a/sdk/plugins/cvt.cpp
+++ b/sdk/plugins/cvt.cpp
@@ -20,14 +20,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Colorspace conversion
  * \author Josh Klontz \cite jklontz
  */
-class Cvt : public UntrainableTransform
+class CvtTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_ENUMS(Code)
@@ -63,14 +65,14 @@ private:
     }
 };
 
-BR_REGISTER(Transform, Cvt)
+BR_REGISTER(Transform, CvtTransform)
 
 /*!
  * \ingroup transforms
  * \brief Convert to floating point format.
  * \author Josh Klontz \cite jklontz
  */
-class CvtFloat : public UntrainableTransform
+class CvtFloatTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -80,14 +82,14 @@ class CvtFloat : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, CvtFloat)
+BR_REGISTER(Transform, CvtFloatTransform)
 
 /*!
  * \ingroup transforms
  * \brief Convert to uchar format
  * \author Josh Klontz \cite jklontz
  */
-class CvtUChar : public UntrainableTransform
+class CvtUCharTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -97,14 +99,14 @@ class CvtUChar : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, CvtUChar)
+BR_REGISTER(Transform, CvtUCharTransform)
 
 /*!
  * \ingroup transforms
  * \brief Split a multi-channel matrix into several single-channel matrices.
  * \author Josh Klontz \cite jklontz
  */
-class SplitChannels : public UntrainableTransform
+class SplitChannelsTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -117,14 +119,14 @@ class SplitChannels : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, SplitChannels)
+BR_REGISTER(Transform, SplitChannelsTransform)
 
 /*!
  * \ingroup transforms
  * \brief Enforce the matrix has a certain number of channels by adding or removing channels.
  * \author Josh Klontz \cite jklontz
  */
-class EnsureChannels : public UntrainableTransform
+class EnsureChannelsTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int n READ get_n WRITE set_n RESET reset_n STORED false)
@@ -156,6 +158,8 @@ class EnsureChannels : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, EnsureChannels)
+BR_REGISTER(Transform, EnsureChannelsTransform)
+
+} // namespace br
 
 #include "cvt.moc"
diff --git a/sdk/plugins/denoising.cpp b/sdk/plugins/denoising.cpp
index e3aba6f..955459c 100644
--- a/sdk/plugins/denoising.cpp
+++ b/sdk/plugins/denoising.cpp
@@ -18,14 +18,16 @@
 #include <openbr_plugin.h>
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Wraps OpenCV Non-Local Means Denoising
  * \author Josh Klontz \cite jklontz
  */
-class NLMeansDenoising : public UntrainableTransform
+class NLMeansDenoisingTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(float h READ get_h WRITE set_h RESET reset_h STORED false)
@@ -41,6 +43,8 @@ class NLMeansDenoising : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, NLMeansDenoising)
+BR_REGISTER(Transform, NLMeansDenoisingTransform)
+
+} // namespace br
 
 #include "denoising.moc"
diff --git a/sdk/plugins/draw.cpp b/sdk/plugins/draw.cpp
index d044307..ec915aa 100644
--- a/sdk/plugins/draw.cpp
+++ b/sdk/plugins/draw.cpp
@@ -20,14 +20,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Renders metadata onto the image
  * \author Josh Klontz \cite jklontz
  */
-class Draw : public UntrainableTransform
+class DrawTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(bool verbose READ get_verbose WRITE set_verbose RESET reset_verbose STORED false)
@@ -52,14 +54,14 @@ class Draw : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Draw)
+BR_REGISTER(Transform, DrawTransform)
 
 /*!
  * \ingroup transforms
  * \brief Draws a grid on the image
  * \author Josh Klontz \cite jklontz
  */
-class DrawGrid : public UntrainableTransform
+class DrawGridTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int rows READ get_rows WRITE set_rows RESET reset_rows STORED false)
@@ -87,14 +89,14 @@ class DrawGrid : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, DrawGrid)
+BR_REGISTER(Transform, DrawGridTransform)
 
 /*!
  * \ingroup transforms
  * \brief Remove landmarks.
  * \author Josh Klontz \cite jklontz
  */
-class Edit : public UntrainableTransform
+class EditTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -129,7 +131,7 @@ class Edit : public UntrainableTransform
 
     static void mouseCallback(int event, int x, int y, int flags, void *userdata)
     {
-        ((const Edit*)userdata)->mouseEvent(event, x, y, flags);
+        ((const EditTransform*)userdata)->mouseEvent(event, x, y, flags);
     }
 
     void mouseEvent(int event, int x, int y, int flags) const
@@ -149,9 +151,11 @@ class Edit : public UntrainableTransform
     }
 };
 
-Template Edit::currentTemplate;
-QMutex Edit::currentTemplateLock;
+Template EditTransform::currentTemplate;
+QMutex EditTransform::currentTemplateLock;
+
+BR_REGISTER(Transform, EditTransform)
 
-BR_REGISTER(Transform, Edit)
+} // namespace br
 
 #include "draw.moc"
diff --git a/sdk/plugins/eigen3.cpp b/sdk/plugins/eigen3.cpp
index 15a0a90..46a1097 100644
--- a/sdk/plugins/eigen3.cpp
+++ b/sdk/plugins/eigen3.cpp
@@ -20,7 +20,8 @@
 #include "core/common.h"
 #include "core/eigenutils.h"
 
-using namespace br;
+namespace br
+{
 
 /*!
  * \ingroup transforms
@@ -28,7 +29,7 @@ using namespace br;
  * \author Brendan Klare \cite bklare
  * \author Josh Klontz \cite jklontz
  */
-class PCA : public Transform
+class PCATransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(float keep READ get_keep WRITE set_keep RESET reset_keep STORED false)
@@ -45,11 +46,11 @@ class PCA : public Transform
     Eigen::VectorXf mean, eVals;
     Eigen::MatrixXf eVecs;
 
-    friend class DFFS;
-    friend class LDA;
+    friend class DFFSTransform;
+    friend class LDATransform;
 
 public:
-    PCA() : keep(0.95), drop(0), whiten(false) {}
+    PCATransform() : keep(0.95), drop(0), whiten(false) {}
 
 private:
     /*
@@ -195,14 +196,14 @@ private:
     }
 };
 
-BR_REGISTER(Transform, PCA)
+BR_REGISTER(Transform, PCATransform)
 
 /*!
  * \ingroup transforms
  * \brief Computes Distance From Feature Space (DFFS) \cite moghaddam97.
  * \author Josh Klontz \cite jklontz
  */
-class DFFS : public Transform
+class DFFSTransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(float keep READ get_keep WRITE set_keep RESET reset_keep STORED false)
@@ -210,7 +211,7 @@ class DFFS : public Transform
     BR_PROPERTY(float, keep, 0.95)
     BR_PROPERTY(br::Transform*, transform, NULL)
 
-    PCA pca;
+    PCATransform pca;
     Transform *cvtFloat;
 
     void init()
@@ -241,7 +242,7 @@ class DFFS : public Transform
     }
 };
 
-BR_REGISTER(Transform, DFFS)
+BR_REGISTER(Transform, DFFSTransform)
 
 /*!
  * \ingroup transforms
@@ -249,7 +250,7 @@ BR_REGISTER(Transform, DFFS)
  * \author Brendan Klare \cite bklare
  * \author Josh Klontz \cite jklontz
  */
-class LDA : public Transform
+class LDATransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(float pcaKeep READ get_pcaKeep WRITE set_pcaKeep RESET reset_pcaKeep STORED false)
@@ -268,7 +269,7 @@ class LDA : public Transform
         int instances = trainingSet.size();
 
         // Perform PCA dimensionality reduction
-        PCA pca;
+        PCATransform pca;
         pca.keep = pcaKeep;
         pca.train(trainingSet);
         mean = pca.mean;
@@ -294,7 +295,7 @@ class LDA : public Transform
         for (int i=0; i<numClasses; i++) classMeans.col(i) /= classCounts[i];
         for (int i=0; i<instances; i++)  data.col(i) -= classMeans.col(classes[i]);
 
-        PCA space1;
+        PCATransform space1;
 
         if (!directLDA)
         {
@@ -389,7 +390,7 @@ class LDA : public Transform
         // because each class is a vector used to compute the covariance,
         // but one degree of freedom is lost removing the global mean.
         int dim2 = std::min((int)space1.keep, numClasses-1);
-        PCA space2;
+        PCATransform space2;
         space2.keep = dim2;
         space2.train(data2);
 
@@ -421,6 +422,8 @@ class LDA : public Transform
     }
 };
 
-BR_REGISTER(Transform, LDA)
+BR_REGISTER(Transform, LDATransform)
+
+} // namespace br
 
 #include "eigen3.moc"
diff --git a/sdk/plugins/eyes.cpp b/sdk/plugins/eyes.cpp
index 445f68d..8525808 100644
--- a/sdk/plugins/eyes.cpp
+++ b/sdk/plugins/eyes.cpp
@@ -39,7 +39,9 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
@@ -50,7 +52,7 @@ using namespace br;
  * \author David Bolme
  * \author Josh Klontz \cite jklontz
  */
-class ASEFEyes : public UntrainableTransform
+class ASEFEyesTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -59,7 +61,7 @@ class ASEFEyes : public UntrainableTransform
     int width, height;
 
 public:
-    ASEFEyes()
+    ASEFEyesTransform()
     {
         QFile file;
         QByteArray line, lf, rf, magic_number;
@@ -186,6 +188,8 @@ private:
     }
 };
 
-BR_REGISTER(Transform, ASEFEyes)
+BR_REGISTER(Transform, ASEFEyesTransform)
+
+} // namespace br
 
 #include "eyes.moc"
diff --git a/sdk/plugins/fill.cpp b/sdk/plugins/fill.cpp
index a73653a..a739c2f 100644
--- a/sdk/plugins/fill.cpp
+++ b/sdk/plugins/fill.cpp
@@ -18,14 +18,16 @@
 #include <openbr_plugin.h>
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Wraps OpenCV inpainting
  * \author Josh Klontz \cite jklontz
  */
-class Inpaint : public UntrainableTransform
+class InpaintTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_ENUMS(Method)
@@ -53,14 +55,14 @@ private:
     }
 };
 
-BR_REGISTER(Transform, Inpaint)
+BR_REGISTER(Transform, InpaintTransform)
 
 /*!
  * \ingroup transforms
  * \brief Fill 0 pixels with the mean of non-0 pixels.
  * \author Josh Klontz \cite jklontz
  */
-class MeanFill : public UntrainableTransform
+class MeanFillTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -71,14 +73,14 @@ class MeanFill : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, MeanFill)
+BR_REGISTER(Transform, MeanFillTransform)
 
 /*!
  * \ingroup transforms
  * \brief Fill black pixels with the specified color.
  * \author Josh Klontz \cite jklontz
  */
-class Flood : public UntrainableTransform
+class FloodTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int r READ get_r WRITE set_r RESET reset_r STORED false)
@@ -97,14 +99,14 @@ class Flood : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Flood)
+BR_REGISTER(Transform, FloodTransform)
 
 /*!
  * \ingroup transforms
  * \brief Alpha-blend two matrices
  * \author Josh Klontz \cite jklontz
  */
-class Blend : public UntrainableMetaTransform
+class BlendTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(float alpha READ get_alpha WRITE set_alpha RESET reset_alpha STORED false)
@@ -117,6 +119,8 @@ class Blend : public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, Blend)
+BR_REGISTER(Transform, BlendTransform)
+
+} // namespace br
 
 #include "fill.moc"
diff --git a/sdk/plugins/filter.cpp b/sdk/plugins/filter.cpp
index 1e28ba5..1d2aa9c 100644
--- a/sdk/plugins/filter.cpp
+++ b/sdk/plugins/filter.cpp
@@ -20,14 +20,16 @@
 #include "core/tanh_sse.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Gamma correction
  * \author Josh Klontz \cite jklontz
  */
-class Gamma : public UntrainableTransform
+class GammaTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(float gamma READ get_gamma WRITE set_gamma RESET reset_gamma)
@@ -48,14 +50,14 @@ class Gamma : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Gamma)
+BR_REGISTER(Transform, GammaTransform)
 
 /*!
  * \ingroup transforms
  * \brief Gaussian blur
  * \author Josh Klontz \cite jklontz
  */
-class Blur : public UntrainableTransform
+class BlurTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(float sigma READ get_sigma WRITE set_sigma RESET reset_sigma STORED false)
@@ -67,14 +69,14 @@ class Blur : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Blur)
+BR_REGISTER(Transform, BlurTransform)
 
 /*!
  * \ingroup transforms
  * \brief Difference of gaussians
  * \author Josh Klontz \cite jklontz
  */
-class DoG : public UntrainableTransform
+class DoGTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(float sigma0 READ get_sigma0 WRITE set_sigma0 RESET reset_sigma0 STORED false)
@@ -109,7 +111,7 @@ class DoG : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, DoG)
+BR_REGISTER(Transform, DoGTransform)
 
 /*!
  * \ingroup transforms
@@ -119,7 +121,7 @@ BR_REGISTER(Transform, DoG)
  * \author Scott Klum \cite sklum
  */
 
-class CSDN : public UntrainableTransform
+class CSDNTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -159,7 +161,7 @@ class CSDN : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, CSDN)
+BR_REGISTER(Transform, CSDNTransform)
 
 /*!
  * \ingroup transforms
@@ -168,7 +170,7 @@ BR_REGISTER(Transform, CSDN)
  * Image Processing, IEEE Transactions on , vol.19, no.6, pp.1635-1650, June 2010
  * \author Josh Klontz \cite jklontz
  */
-class ContrastEq : public UntrainableTransform
+class ContrastEqTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(float a READ get_a WRITE set_a RESET reset_a STORED false)
@@ -216,14 +218,14 @@ class ContrastEq : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, ContrastEq)
+BR_REGISTER(Transform, ContrastEqTransform)
 
 /*!
  * \ingroup transforms
  * \brief Raise each element to the specified power.
  * \author Josh Klontz \cite jklontz
  */
-class Pow : public UntrainableTransform
+class PowTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(float power READ get_power WRITE set_power RESET reset_power STORED false)
@@ -238,6 +240,8 @@ class Pow : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Pow)
+BR_REGISTER(Transform, PowTransform)
+
+} // namespace br
 
 #include "filter.moc"
diff --git a/sdk/plugins/format.cpp b/sdk/plugins/format.cpp
index 26688c9..de4c88c 100644
--- a/sdk/plugins/format.cpp
+++ b/sdk/plugins/format.cpp
@@ -27,9 +27,51 @@
 #include "core/opencvutils.h"
 #include "core/qtutils.h"
 
-using namespace br;
 using namespace cv;
 
+namespace br
+{
+
+/*!
+ * \ingroup formats
+ * \brief A simple binary matrix format.
+ * \author Josh Klonyz \cite jklontz
+ * First 4 bytes indicate the number of rows.
+ * Second 4 bytes indicate the number of columns.
+ * The rest of the bytes are 32-bit floating data elements.
+ */
+class binFormat : public Format
+{
+    Q_OBJECT
+
+    Template read() const
+    {
+        QByteArray data;
+        QtUtils::readFile(file, data);
+        return Template(file, Mat(((quint32*)data.data())[0],
+                                  ((quint32*)data.data())[1],
+                                  CV_32FC1,
+                                  data.data()+8).clone());
+    }
+
+    void write(const Template &t) const
+    {
+        Mat m;
+        t.m().convertTo(m, CV_32F);
+        if (m.channels() != 1) qFatal("binFormat::write only supports single channel matrices.");
+
+        QByteArray data;
+        QDataStream stream(&data, QFile::WriteOnly);
+        stream.writeRawData((const char*)&m.rows, 4);
+        stream.writeRawData((const char*)&m.cols, 4);
+        stream.writeRawData((const char*)m.data, 4*m.rows*m.cols);
+
+        QtUtils::writeFile(file, data);
+    }
+};
+
+BR_REGISTER(Format, binFormat)
+
 /*!
  * \ingroup formats
  * \brief Reads a comma separated value file.
@@ -50,23 +92,20 @@ class csvFormat : public Format
         QList< QList<float> > valsList;
         foreach (const QString &line, lines) {
             QList<float> vals;
-            foreach (const QString &word, line.split(QRegExp(" *, *"))) {
+            foreach (const QString &word, line.split(QRegExp(" *, *"), QString::SkipEmptyParts)) {
                 bool ok;
                 const float val = word.toFloat(&ok);
                 vals.append(val);
                 isUChar = isUChar && (val == float(uchar(val)));
             }
-            valsList.append(vals);
+            if (!vals.isEmpty())
+                valsList.append(vals);
         }
 
-        assert((valsList.size() > 0) && (valsList[0].size() > 0));
         Mat m(valsList.size(), valsList[0].size(), CV_32FC1);
-        for (int i=0; i<valsList.size(); i++) {
-            assert(valsList[i].size() == valsList[0].size());
-            for (int j=0; j<valsList[i].size(); j++) {
+        for (int i=0; i<valsList.size(); i++)
+            for (int j=0; j<valsList[i].size(); j++)
                 m.at<float>(i,j) = valsList[i][j];
-            }
-        }
 
         if (isUChar) m.convertTo(m, CV_8U);
         return Template(m);
@@ -218,8 +257,8 @@ class matFormat : public Format
             error |= (int(bytes) != stream.readRawData(data.data(), bytes));
 
             // Alignment
-            int skipBytes = (bytes < 4) ? (4 - bytes) : 0;
-            if (skipBytes != 0) error |= (skipBytes != stream.skipRawData(skipBytes));
+            int skipBytes = (bytes < 4) ? (4 - bytes) : (8 - bytes%8)%8;
+            if (skipBytes != 0) stream.skipRawData(skipBytes);
 
             if (error) qFatal("matFormat::Element Unexpected end of file.");
         }
@@ -289,7 +328,98 @@ class matFormat : public Format
 
     void write(const Template &t) const
     {
+        QByteArray data;
+        QDataStream stream(&data, QFile::WriteOnly);
+
+        { // Header
+            QByteArray header = "MATLAB 5.0 MAT-file; Made with OpenBR | www.openbiometrics.org\n";
+            QByteArray buffer(116-header.size(), 0);
+            stream.writeRawData(header.data(), header.size());
+            stream.writeRawData(buffer.data(), buffer.size());
+            quint64 subsystem = 0;
+            quint16 version = 0x0100;
+            const char *endianness = "IM";
+            stream.writeRawData((const char*)&subsystem, 8);
+            stream.writeRawData((const char*)&version, 2);
+            stream.writeRawData(endianness, 2);
+        }
+
+        for (int i=0; i<t.size(); i++) {
+            const Mat &m = t[i];
+            if (m.channels() != 1) qFatal("matFormat::write only supports single channel matrices.");
+
+            QByteArray subdata;
+            QDataStream substream(&subdata, QFile::WriteOnly);
+
+            {  // Array Flags
+                quint32 type = 6;
+                quint32 bytes = 8;
+                quint64 arrayClass = 0;
+                switch (m.type()) {
+                  case CV_64FC1: arrayClass = 6; break;
+                  case CV_32FC1: arrayClass = 7; break;
+                  case CV_8UC1: arrayClass = 8; break;
+                  case CV_8SC1: arrayClass = 9; break;
+                  case CV_16UC1: arrayClass = 10; break;
+                  case CV_16SC1: arrayClass = 11; break;
+                  case CV_32SC1: arrayClass = 12; break;
+                  default: qFatal("matFormat::write unsupported matrix class.");
+                }
+                substream.writeRawData((const char*)&type, 4);
+                substream.writeRawData((const char*)&bytes, 4);
+                substream.writeRawData((const char*)&arrayClass, 8);
+            }
+
+            { // Dimensions Array
+                quint32 type = 5;
+                quint32 bytes = 8;
+                substream.writeRawData((const char*)&type, 4);
+                substream.writeRawData((const char*)&bytes, 4);
+                substream.writeRawData((const char*)&m.rows, 4);
+                substream.writeRawData((const char*)&m.cols, 4);
+            }
+
+            { // Array Name
+                QByteArray name(qPrintable(QString("OpenBR_%1").arg(QString::number(i))));
+                quint32 type = 1;
+                quint32 bytes = name.size();
+                QByteArray buffer((8 - bytes%8)%8, 0);
+                substream.writeRawData((const char*)&type, 4);
+                substream.writeRawData((const char*)&bytes, 4);
+                substream.writeRawData(name.data(), name.size());
+                substream.writeRawData(buffer.data(), buffer.size());
+            }
+
+            { // Real part
+                quint32 type = 0;
+                switch (m.type()) {
+                  case CV_8SC1:  type = 1; break;
+                  case CV_8UC1:  type = 2; break;
+                  case CV_16SC1: type = 3; break;
+                  case CV_16UC1: type = 4; break;
+                  case CV_32SC1: type = 5; break;
+                  case CV_32FC1: type = 7; break;
+                  case CV_64FC1: type = 9; break;
+                  default: qFatal("matFormat::write unsupported matrix type.");
+                }
+                quint32 bytes = m.elemSize() * m.rows * m.cols;
+                QByteArray buffer((8 - bytes%8)%8, 0);
+                substream.writeRawData((const char*)&type, 4);
+                substream.writeRawData((const char*)&bytes, 4);
+                substream.writeRawData((const char*)m.data, bytes);
+                substream.writeRawData(buffer.data(), buffer.size());
+            }
 
+            { // Matrix
+                quint32 type = 14;
+                quint32 bytes = subdata.size();
+                stream.writeRawData((const char*)&type, 4);
+                stream.writeRawData((const char*)&bytes, 4);
+                stream.writeRawData(subdata.data(), subdata.size());
+            }
+        }
+
+        QtUtils::writeFile(file, data);
     }
 };
 
@@ -394,4 +524,6 @@ class xmlFormat : public Format
 BR_REGISTER(Format, xmlFormat)
 #endif // BR_EMBEDDED
 
+} // namespace br
+
 #include "format.moc"
diff --git a/sdk/plugins/gallery.cpp b/sdk/plugins/gallery.cpp
index 39d8ebc..de4b3a2 100644
--- a/sdk/plugins/gallery.cpp
+++ b/sdk/plugins/gallery.cpp
@@ -28,7 +28,8 @@
 #include "core/opencvutils.h"
 #include "core/qtutils.h"
 
-using namespace br;
+namespace br
+{
 
 QDataStream &operator<<(QDataStream &stream, const Template &t)
 {
@@ -660,4 +661,6 @@ class googleGallery : public Gallery
 
 BR_REGISTER(Gallery, googleGallery)
 
+} // namespace br
+
 #include "gallery.moc"
diff --git a/sdk/plugins/hash.cpp b/sdk/plugins/hash.cpp
index 40f1576..4483591 100644
--- a/sdk/plugins/hash.cpp
+++ b/sdk/plugins/hash.cpp
@@ -19,14 +19,15 @@
 
 #include "core/qtutils.h"
 
-using namespace br;
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Wraps QCryptographicHash
  * \author Josh Klontz \cite jklontz
  */
-class CryptographicHash : public UntrainableTransform
+class CryptographicHashTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_ENUMS(Algorithm)
@@ -52,6 +53,8 @@ private:
     }
 };
 
-BR_REGISTER(Transform, CryptographicHash)
+BR_REGISTER(Transform, CryptographicHashTransform)
+
+} // namespace br
 
 #include "hash.moc"
diff --git a/sdk/plugins/hist.cpp b/sdk/plugins/hist.cpp
index 0e758b5..3829d7f 100644
--- a/sdk/plugins/hist.cpp
+++ b/sdk/plugins/hist.cpp
@@ -21,14 +21,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Histograms the matrix
  * \author Josh Klontz \cite jklontz
  */
-class Hist : public UntrainableTransform
+class HistTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(float max READ get_max WRITE set_max RESET reset_max STORED false)
@@ -60,14 +62,14 @@ class Hist : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Hist)
+BR_REGISTER(Transform, HistTransform)
 
 /*!
  * \ingroup transforms
  * \brief Converts each element to its rank-ordered value.
  * \author Josh Klontz \cite jklontz
  */
-class Rank : public UntrainableTransform
+class RankTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -92,14 +94,14 @@ class Rank : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Rank)
+BR_REGISTER(Transform, RankTransform)
 
 /*!
  * \ingroup transforms
  * \brief An integral histogram
  * \author Josh Klontz \cite jklontz
  */
-class IntegralHist : public UntrainableTransform
+class IntegralHistTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int bins READ get_bins WRITE set_bins RESET reset_bins STORED false)
@@ -128,14 +130,14 @@ class IntegralHist : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, IntegralHist)
+BR_REGISTER(Transform, IntegralHistTransform)
 
 /*!
  * \ingroup transforms
  * \brief Detects regions of low variance
  * \author Josh Klontz \cite jklontz
  */
-class VarianceChangeDetector : public UntrainableTransform
+class VarianceChangeDetectorTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int bins READ get_bins WRITE set_bins RESET reset_bins STORED false)
@@ -213,6 +215,8 @@ class VarianceChangeDetector : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, VarianceChangeDetector)
+BR_REGISTER(Transform, VarianceChangeDetectorTransform)
+
+} // namespace br
 
 #include "hist.moc"
diff --git a/sdk/plugins/keypoint.cpp b/sdk/plugins/keypoint.cpp
index b99a1e3..e9bfc7c 100644
--- a/sdk/plugins/keypoint.cpp
+++ b/sdk/plugins/keypoint.cpp
@@ -21,14 +21,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Wraps OpenCV Key Point Detector
  * \author Josh Klontz \cite jklontz
  */
-class KeyPointDetector : public UntrainableTransform
+class KeyPointDetectorTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(QString detector READ get_detector WRITE set_detector RESET reset_detector STORED false)
@@ -62,14 +64,14 @@ class KeyPointDetector : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, KeyPointDetector)
+BR_REGISTER(Transform, KeyPointDetectorTransform)
 
 /*!
  * \ingroup transforms
  * \brief Wraps OpenCV Key Point Descriptor
  * \author Josh Klontz \cite jklontz
  */
-class KeyPointDescriptor : public UntrainableTransform
+class KeyPointDescriptorTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(QString descriptor READ get_descriptor WRITE set_descriptor RESET reset_descriptor STORED false)
@@ -100,14 +102,14 @@ class KeyPointDescriptor : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, KeyPointDescriptor)
+BR_REGISTER(Transform, KeyPointDescriptorTransform)
 
 /*!
  * \ingroup transforms
  * \brief Wraps OpenCV Key Point Matcher
  * \author Josh Klontz \cite jklontz
  */
-class KeyPointMatcher : public Distance
+class KeyPointMatcherTransform : public Distance
 {
     Q_OBJECT
     Q_PROPERTY(QString matcher READ get_matcher WRITE set_matcher RESET reset_matcher STORED false)
@@ -146,14 +148,14 @@ class KeyPointMatcher : public Distance
     }
 };
 
-BR_REGISTER(Distance, KeyPointMatcher)
+BR_REGISTER(Distance, KeyPointMatcherTransform)
 
 /*!
  * \ingroup transforms
  * \brief Specialize wrapper OpenCV SIFT wrapper
  * \author Josh Klontz \cite jklontz
  */
-class SIFTDescriptor : public UntrainableTransform
+class SIFTDescriptorTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int size READ get_size WRITE set_size RESET reset_size STORED false)
@@ -174,14 +176,14 @@ class SIFTDescriptor : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, SIFTDescriptor)
+BR_REGISTER(Transform, SIFTDescriptorTransform)
 
 /*!
  * \ingroup transforms
  * \brief Add landmarks to the template in a grid layout
  * \author Josh Klontz \cite jklontz
  */
-class Grid : public UntrainableTransform
+class GridTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int rows READ get_rows WRITE set_rows RESET reset_rows STORED false)
@@ -202,6 +204,8 @@ class Grid : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Grid)
+BR_REGISTER(Transform, GridTransform)
+
+} // namespace br
 
 #include "keypoint.moc"
diff --git a/sdk/plugins/lbp.cpp b/sdk/plugins/lbp.cpp
index b0499f8..6f632fe 100644
--- a/sdk/plugins/lbp.cpp
+++ b/sdk/plugins/lbp.cpp
@@ -19,7 +19,9 @@
 #include <openbr_plugin.h>
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
@@ -28,7 +30,7 @@ using namespace br;
  * Pattern Analysis and Machine Intelligence, IEEE Transactions, vol.28, no.12, pp.2037-2041, Dec. 2006
  * \author Josh Klontz \cite jklontz
  */
-class LBP : public UntrainableTransform
+class LBPTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int radius READ get_radius WRITE set_radius RESET reset_radius STORED false)
@@ -41,7 +43,7 @@ class LBP : public UntrainableTransform
     uchar lut[256];
     uchar null;
 
-    friend class ColoredU2;
+    friend class ColoredU2Transform;
 
     /* Returns the number of 0->1 or 1->0 transitions in i */
     static int numTransitions(int i)
@@ -119,14 +121,14 @@ class LBP : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, LBP)
+BR_REGISTER(Transform, LBPTransform)
 
 /*!
  * \ingroup transforms
  * \brief For visualization of LBP patterns.
  * \author Josh Klontz \cite jklontz
  */
-class ColoredU2 : public UntrainableTransform
+class ColoredU2Transform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -150,7 +152,7 @@ class ColoredU2 : public UntrainableTransform
 
             uchar uid = 0;
             for (int i=0; i<256; i++) {
-                const int transitions = LBP::numTransitions(i);
+                const int transitions = LBPTransform::numTransitions(i);
                 int u2;
                 if   (transitions <= 2) u2 = uid++;
                 else                    u2 = 58;
@@ -187,6 +189,8 @@ class ColoredU2 : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, ColoredU2)
+BR_REGISTER(Transform, ColoredU2Transform)
+
+} // namespace br
 
 #include "lbp.moc"
diff --git a/sdk/plugins/llvm.cpp b/sdk/plugins/llvm.cpp
index 6cdd96f..c7e68d2 100644
--- a/sdk/plugins/llvm.cpp
+++ b/sdk/plugins/llvm.cpp
@@ -81,25 +81,6 @@ static Mat MatFromMatrix(const Matrix &m)
     return Mat(m.rows, m.columns, CV_MAKETYPE(depth, m.channels), m.data).clone();
 }
 
-static void AllocateMatrixFromMat(Matrix &m, cv::Mat &mat)
-{
-    int cvType = -1;
-    switch (m.type()) {
-      case Matrix::u8:  cvType = CV_8U; break;
-      case Matrix::s8:  cvType = CV_8S; break;
-      case Matrix::u16: cvType = CV_16U; break;
-      case Matrix::s16: cvType = CV_16S; break;
-      case Matrix::s32: cvType = CV_32S; break;
-      case Matrix::f32: cvType = CV_32F; break;
-      case Matrix::f64: cvType = CV_64F; break;
-      default:          qFatal("OpenCV does not support Matrix format: %s", qPrintable(MatrixToString(m)));
-    }
-
-    m.deallocate();
-    mat = Mat(m.rows, m.columns, CV_MAKETYPE(cvType, m.channels));
-    m.data = mat.data;
-}
-
 QDebug operator<<(QDebug dbg, const Matrix &m)
 {
     dbg.nospace() << MatrixToString(m);
@@ -140,6 +121,7 @@ struct MatrixBuilder : public Matrix
 
     void copyHeaderCode(const MatrixBuilder &other) const {
         setChannels(other.getChannels());
+        setColumns(other.getColumns());
         setRows(other.getRows());
         setFrames(other.getFrames());
         setHash(other.getHash());
@@ -317,41 +299,42 @@ namespace br
 {
 
 /*!
- * \brief LLVM Unary Kernel
+ * \brief LLVM Unary Transform
  * \author Josh Klontz \cite jklontz
  */
-class UnaryKernel : public UntrainableMetaTransform
+class UnaryTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
 
-    UnaryKernel_t kernel;
+    UnaryKernel kernel;
     quint16 hash;
 
 public:
-    UnaryKernel() : kernel(NULL), hash(0) {}
+    UnaryTransform() : kernel(NULL), hash(0) {}
     virtual int preallocate(const Matrix &src, Matrix &dst) const = 0; /*!< Preallocate destintation matrix based on source matrix. */
     virtual Value *buildPreallocate(const MatrixBuilder &src, const MatrixBuilder &dst) const { (void) src; (void) dst; return MatrixBuilder::constant(0); }
     virtual void build(const MatrixBuilder &src, const MatrixBuilder &dst, PHINode *i) const = 0; /*!< Build the kernel. */
 
-    void apply(const Matrix &src, Matrix &dst) const
-    {
-        const int size = preallocate(src, dst);
-        dst.allocate();
-        invoke(src, dst, size);
-    }
-
     void optimize(Function *f) const
     {
         while (TheFunctionPassManager->run(*f));
         TheExtraFunctionPassManager->run(*f);
     }
 
-    UnaryKernel_t getKernel(const Matrix *src) const
+    UnaryFunction getFunction(const Matrix *src) const
     {
-        const QString functionName = mangledName(*src);
+        const QString functionName = mangledName();
         Function *function = TheModule->getFunction(qPrintable(functionName));
         if (function == NULL) function = compile(*src);
-        return (UnaryKernel_t)TheExecutionEngine->getPointerToFunction(function);
+        return (UnaryFunction)TheExecutionEngine->getPointerToFunction(function);
+    }
+
+    UnaryKernel getKernel(const Matrix *src) const
+    {
+        const QString functionName = mangledName(*src);
+        Function *function = TheModule->getFunction(qPrintable(functionName));
+        if (function == NULL) function = compileKernel(*src);
+        return (UnaryKernel)TheExecutionEngine->getPointerToFunction(function);
     }
 
 private:
@@ -433,7 +416,7 @@ private:
         builder.CreateRetVoid();
 
         optimize(function);
-        return kernel;
+        return function;
     }
 
     Function *compileKernel(const Matrix &m) const
@@ -476,24 +459,9 @@ private:
     {
         const Matrix m(MatrixFromMat(src));
         Matrix n;
-        const int size = preallocate(m, n);
-        AllocateMatrixFromMat(n, dst);
-        invoke(m, n, size);
-    }
-
-    void invoke(const Matrix &src, Matrix &dst, int size) const
-    {
-        if (src.hash != hash) {
-            static QMutex compilerLock;
-            QMutexLocker locker(&compilerLock);
-
-            if (src.hash != hash) {
-                const_cast<UnaryKernel*>(this)->kernel = getKernel(&src);
-                const_cast<UnaryKernel*>(this)->hash = src.hash;
-            }
-        }
-
-        kernel(&src, &dst, size);
+        UnaryFunction function = getFunction(&m);
+        function(&m, &n);
+        dst.m() = MatFromMatrix(n);
     }
 };
 
@@ -501,15 +469,15 @@ private:
  * \brief LLVM Binary Kernel
  * \author Josh Klontz \cite jklontz
  */
-class BinaryKernel: public UntrainableMetaTransform
+class BinaryTransform: public UntrainableMetaTransform
 {
     Q_OBJECT
 
-    BinaryKernel_t kernel;
+    BinaryKernel kernel;
     quint16 hashA, hashB;
 
 public:
-    BinaryKernel() : kernel(NULL), hashA(0), hashB(0) {}
+    BinaryTransform() : kernel(NULL), hashA(0), hashB(0) {}
     virtual int preallocate(const Matrix &srcA, const Matrix &srcB, Matrix &dst) const = 0; /*!< Preallocate destintation matrix based on source matrix. */
     virtual void build(const MatrixBuilder &srcA, const MatrixBuilder &srcB, const MatrixBuilder &dst, PHINode *i) const = 0; /*!< Build the kernel. */
 
@@ -582,9 +550,9 @@ private:
                     function = TheModule->getFunction(qPrintable(functionName));
                 }
 
-                const_cast<BinaryKernel*>(this)->kernel = (BinaryKernel_t)TheExecutionEngine->getPointerToFunction(function);
-                const_cast<BinaryKernel*>(this)->hashA = srcA.hash;
-                const_cast<BinaryKernel*>(this)->hashB = srcB.hash;
+                const_cast<BinaryTransform*>(this)->kernel = (BinaryKernel)TheExecutionEngine->getPointerToFunction(function);
+                const_cast<BinaryTransform*>(this)->hashA = srcA.hash;
+                const_cast<BinaryTransform*>(this)->hashB = srcB.hash;
             }
         }
 
@@ -596,7 +564,7 @@ private:
  * \brief LLVM Stitchable Kernel
  * \author Josh Klontz \cite jklontz
  */
-class StitchableKernel : public UnaryKernel
+class StitchableTransform : public UnaryTransform
 {
     Q_OBJECT
 
@@ -629,7 +597,7 @@ private:
  * \brief LLVM stitch transform
  * \author Josh Klontz \cite jklontz
  */
-class stitchTransform : public UnaryKernel
+class stitchTransform : public UnaryTransform
 {
     Q_OBJECT
     Q_PROPERTY(QList<br::Transform*> kernels READ get_kernels WRITE set_kernels RESET reset_kernels STORED false)
@@ -638,15 +606,15 @@ class stitchTransform : public UnaryKernel
     void init()
     {
         foreach (Transform *transform, kernels)
-            if (dynamic_cast<StitchableKernel*>(transform) == NULL)
-                qFatal("%s is not a stitchable kernel!", qPrintable(transform->name()));
+            if (dynamic_cast<StitchableTransform*>(transform) == NULL)
+                qFatal("%s is not a stitchable transform!", qPrintable(transform->name()));
     }
 
     int preallocate(const Matrix &src, Matrix &dst) const
     {
         Matrix tmp = src;
         foreach (const Transform *kernel, kernels) {
-            static_cast<const UnaryKernel*>(kernel)->preallocate(tmp, dst);
+            static_cast<const UnaryTransform*>(kernel)->preallocate(tmp, dst);
             tmp = dst;
         }
         return dst.elements();
@@ -658,8 +626,8 @@ class stitchTransform : public UnaryKernel
         MatrixBuilder dst(dst_);
         Value *val = src.load(i);
         foreach (Transform *transform, kernels) {
-            static_cast<UnaryKernel*>(transform)->preallocate(src, dst);
-            val = static_cast<StitchableKernel*>(transform)->stitch(src, dst, val);
+            static_cast<UnaryTransform*>(transform)->preallocate(src, dst);
+            val = static_cast<StitchableTransform*>(transform)->stitch(src, dst, val);
             src.copyHeader(dst);
             src.m = dst.m;
         }
@@ -674,7 +642,7 @@ BR_REGISTER(Transform, stitchTransform)
  * \brief LLVM square transform
  * \author Josh Klontz \cite jklontz
  */
-class squareTransform : public StitchableKernel
+class squareTransform : public StitchableTransform
 {
     Q_OBJECT
 
@@ -692,7 +660,7 @@ BR_REGISTER(Transform, squareTransform)
  * \brief LLVM pow transform
  * \author Josh Klontz \cite jklontz
  */
-class powTransform : public StitchableKernel
+class powTransform : public StitchableTransform
 {
     Q_OBJECT
     Q_PROPERTY(double exponent READ get_exponent WRITE set_exponent RESET reset_exponent STORED false)
@@ -731,7 +699,7 @@ BR_REGISTER(Transform, powTransform)
  * \brief LLVM sum transform
  * \author Josh Klontz \cite jklontz
  */
-class sumTransform : public UnaryKernel
+class sumTransform : public UnaryTransform
 {
     Q_OBJECT
     Q_PROPERTY(bool channels READ get_channels WRITE set_channels RESET reset_channels STORED false)
@@ -821,7 +789,7 @@ BR_REGISTER(Transform, sumTransform)
  * \brief LLVM casting transform
  * \author Josh Klontz \cite jklontz
  */
-class castTransform : public StitchableKernel
+class castTransform : public StitchableTransform
 {
     Q_OBJECT
     Q_ENUMS(Type)
@@ -865,7 +833,7 @@ BR_REGISTER(Transform, castTransform)
  * \brief LLVM scale transform
  * \author Josh Klontz \cite jklontz
  */
-class scaleTransform : public StitchableKernel
+class scaleTransform : public StitchableTransform
 {
     Q_OBJECT
     Q_PROPERTY(double a READ get_a WRITE set_a RESET reset_a STORED false)
@@ -885,7 +853,7 @@ BR_REGISTER(Transform, scaleTransform)
  * \brief LLVM abs transform
  * \author Josh Klontz \cite jklontz
  */
-class absTransform : public StitchableKernel
+class absTransform : public StitchableTransform
 {
     Q_OBJECT
 
@@ -907,7 +875,7 @@ BR_REGISTER(Transform, absTransform)
  * \brief LLVM add transform
  * \author Josh Klontz \cite jklontz
  */
-class addTransform : public StitchableKernel
+class addTransform : public StitchableTransform
 {
     Q_OBJECT
     Q_PROPERTY(double b READ get_b WRITE set_b RESET reset_b STORED false)
@@ -927,7 +895,7 @@ BR_REGISTER(Transform, addTransform)
  * \brief LLVM clamp transform
  * \author Josh Klontz \cite jklontz
  */
-class clampTransform : public StitchableKernel
+class clampTransform : public StitchableTransform
 {
     Q_OBJECT
     Q_PROPERTY(double min READ get_min WRITE set_min RESET reset_min STORED false)
@@ -1035,17 +1003,17 @@ class LLVMInitializer : public Initializer
         kernel->project(src, dst);
         qDebug() << dst.m();
 
-//        src.m() = (Mat_<qint32>(2,2) << -1, -3, 9, 27);
-//        kernel->project(src, dst);
-//        qDebug() << dst.m();
+        src.m() = (Mat_<qint32>(2,2) << -1, -3, 9, 27);
+        kernel->project(src, dst);
+        qDebug() << dst.m();
 
-//        src.m() = (Mat_<float>(2,2) << -1.5, -2.5, 3.5, 4.5);
-//        kernel->project(src, dst);
-//        qDebug() << dst.m();
+        src.m() = (Mat_<float>(2,2) << -1.5, -2.5, 3.5, 4.5);
+        kernel->project(src, dst);
+        qDebug() << dst.m();
 
-//        src.m() = (Mat_<double>(2,2) << 1.75, 2.75, -3.75, -4.75);
-//        kernel->project(src, dst);
-//        qDebug() << dst.m();
+        src.m() = (Mat_<double>(2,2) << 1.75, 2.75, -3.75, -4.75);
+        kernel->project(src, dst);
+        qDebug() << dst.m();
     }
 
     void finalize() const
@@ -1091,15 +1059,29 @@ class LLVMInitializer : public Initializer
 
 BR_REGISTER(Initializer, LLVMInitializer)
 
-UnaryFunction_t jit_unary_make(const char *description)
+UnaryFunction jit_make_unary_function(const char *description)
+{
+    QScopedPointer<UnaryTransform> unaryTransform(Factory<UnaryTransform>::make(description));
+    return unaryTransform->getFunction(NULL);
+}
+
+BinaryFunction jit_make_binary_function(const char *description)
 {
     (void) description;
     return NULL;
 }
 
-BinaryFunction_t jit_binary_make(const char *description)
+UnaryKernel jit_make_unary_kernel(const char *description, const Matrix *src)
+{
+    QScopedPointer<UnaryTransform> unaryTransform(Factory<UnaryTransform>::make(description));
+    return unaryTransform->getKernel(src);
+}
+
+BinaryKernel jit_make_binary_kernel(const char *description, const Matrix *srcA, const Matrix *srcB)
 {
     (void) description;
+    (void) srcA;
+    (void) srcB;
     return NULL;
 }
 
diff --git a/sdk/plugins/mask.cpp b/sdk/plugins/mask.cpp
index 72dbdea..b30e3c2 100644
--- a/sdk/plugins/mask.cpp
+++ b/sdk/plugins/mask.cpp
@@ -18,14 +18,16 @@
 #include <openbr_plugin.h>
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Applies an eliptical mask
  * \author Josh Klontz \cite jklontz
  */
-class Mask : public UntrainableTransform
+class MaskTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -41,14 +43,14 @@ class Mask : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Mask)
+BR_REGISTER(Transform, MaskTransform)
 
 /*!
  * \ingroup transforms
  * \brief Masks image according to pixel change.
  * \author Josh Klontz \cite jklontz
  */
-class GradientMask : public UntrainableTransform
+class GradientMaskTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int delta READ get_delta WRITE set_delta RESET reset_delta STORED false)
@@ -72,14 +74,14 @@ class GradientMask : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, GradientMask)
+BR_REGISTER(Transform, GradientMaskTransform)
 
 /*!
  * \ingroup transforms
  * \brief http://worldofcameras.wordpress.com/tag/skin-detection-opencv/
  * \author Josh Klontz \cite jklontz
  */
-class SkinMask : public UntrainableTransform
+class SkinMaskTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -103,14 +105,14 @@ class SkinMask : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, SkinMask)
+BR_REGISTER(Transform, SkinMaskTransform)
 
 /*!
  * \ingroup transforms
  * \brief Morphological operator
  * \author Josh Klontz \cite jklontz
  */
-class Morph : public UntrainableTransform
+class MorphTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_ENUMS(Op)
@@ -145,14 +147,14 @@ private:
     }
 };
 
-BR_REGISTER(Transform, Morph)
+BR_REGISTER(Transform, MorphTransform)
 
 /*!
  * \ingroup transforms
  * \brief Set the template's label to the area of the largest convex hull.
  * \author Josh Klontz \cite jklontz
  */
-class LargestConvexArea : public UntrainableTransform
+class LargestConvexAreaTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -173,6 +175,8 @@ class LargestConvexArea : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, LargestConvexArea)
+BR_REGISTER(Transform, LargestConvexAreaTransform)
+
+} // namespace br
 
 #include "mask.moc"
diff --git a/sdk/plugins/meta.cpp b/sdk/plugins/meta.cpp
index d425f0c..03a5ad2 100644
--- a/sdk/plugins/meta.cpp
+++ b/sdk/plugins/meta.cpp
@@ -22,7 +22,9 @@
 #include "core/qtutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 static TemplateList Simplified(const TemplateList &templates)
 {
@@ -119,7 +121,7 @@ class PipeTransform : public MetaTransform
             try {
                 dst >> *f;
             } catch (...) {
-                qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->name()));
+                qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->objectName()));
                 dst = Template(src.file);
                 dst.file.setBool("FTE");
             }
@@ -148,7 +150,7 @@ class PipeTransform : public MetaTransform
             try {
                 src >> *f;
             } catch (...) {
-                qWarning("Exception triggered when processing %s with transform %s", qPrintable(dst.file.flat()), qPrintable(f->name()));
+                qWarning("Exception triggered when processing %s with transform %s", qPrintable(dst.file.flat()), qPrintable(f->objectName()));
                 src = Template(src.file);
                 src.file.setBool("FTE");
             }
@@ -197,7 +199,7 @@ class ChainTransform : public MetaTransform
             try {
                 dst >> *f;
             } catch (...) {
-                qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->name()));
+                qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->objectName()));
                 dst = Template(src.file);
                 dst.file.setBool("FTE");
             }
@@ -224,7 +226,7 @@ class ChainTransform : public MetaTransform
             try {
                 src >> *f;
             } catch (...) {
-                qWarning("Exception triggered when processing %s with transform %s", qPrintable(dst.file.flat()), qPrintable(f->name()));
+                qWarning("Exception triggered when processing %s with transform %s", qPrintable(dst.file.flat()), qPrintable(f->objectName()));
                 src = Template(src.file);
                 src.file.setBool("FTE");
             }
@@ -264,7 +266,7 @@ class ForkTransform : public MetaTransform
             try {
                 dst.merge((*f)(src));
             } catch (...) {
-                qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->name()));
+                qWarning("Exception triggered when processing %s with transform %s", qPrintable(src.file.flat()), qPrintable(f->objectName()));
                 dst = Template(src.file);
                 dst.file.setBool("FTE");
             }
@@ -456,8 +458,8 @@ class FTETransform : public Transform
 
         QList<float> vals;
         foreach (const Template &t, projectedData) {
-            if (!t.file.contains(transform->name())) qFatal("FTE::train matrix metadata missing key %s.", qPrintable(transform->name()));
-            vals.append(t.file.getFloat(transform->name()));
+            if (!t.file.contains(transform->objectName())) qFatal("FTE::train matrix metadata missing key %s.", qPrintable(transform->objectName()));
+            vals.append(t.file.getFloat(transform->objectName()));
         }
         float q1, q3;
         Common::Median(vals, &q1, &q3);
@@ -469,14 +471,16 @@ class FTETransform : public Transform
     {
         Template projectedSrc;
         transform->project(src, projectedSrc);
-        const float val = projectedSrc.file.getFloat(transform->name());
+        const float val = projectedSrc.file.getFloat(transform->objectName());
 
         dst = src;
-        dst.file.insert(transform->name(), val);
+        dst.file.insert(transform->objectName(), val);
         dst.file.insert("FTE", (val < min) || (val > max));
     }
 };
 
 BR_REGISTER(Transform, FTETransform)
 
+} // namespace br
+
 #include "meta.moc"
diff --git a/sdk/plugins/misc.cpp b/sdk/plugins/misc.cpp
index bfef00f..79d7a5d 100644
--- a/sdk/plugins/misc.cpp
+++ b/sdk/plugins/misc.cpp
@@ -20,7 +20,9 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
@@ -253,4 +255,6 @@ class RenameTransform : public UntrainableMetaTransform
 
 BR_REGISTER(Transform, RenameTransform)
 
+}
+
 #include "misc.moc"
diff --git a/sdk/plugins/normalize.cpp b/sdk/plugins/normalize.cpp
index 34e7a56..163699d 100644
--- a/sdk/plugins/normalize.cpp
+++ b/sdk/plugins/normalize.cpp
@@ -23,14 +23,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Histogram equalization
  * \author Josh Klontz \cite jklontz
  */
-class EqualizeHist : public UntrainableTransform
+class EqualizeHistTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -40,14 +42,14 @@ class EqualizeHist : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, EqualizeHist)
+BR_REGISTER(Transform, EqualizeHistTransform)
 
 /*!
  * \ingroup transforms
  * \brief Normalize matrix to unit length
  * \author Josh Klontz \cite jklontz
  */
-class Normalize : public UntrainableTransform
+class NormalizeTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_ENUMS(NormType)
@@ -68,14 +70,14 @@ private:
     }
 };
 
-BR_REGISTER(Transform, Normalize)
+BR_REGISTER(Transform, NormalizeTransform)
 
 /*!
  * \ingroup transforms
  * \brief Normalize each dimension based on training data.
  * \author Josh Klontz \cite jklontz
  */
-class Center : public Transform
+class CenterTransform : public Transform
 {
     Q_OBJECT
     Q_ENUMS(Method)
@@ -180,6 +182,8 @@ private:
     }
 };
 
-BR_REGISTER(Transform, Center)
+BR_REGISTER(Transform, CenterTransform)
+
+} // namespace br
 
 #include "normalize.moc"
diff --git a/sdk/plugins/output.cpp b/sdk/plugins/output.cpp
index 4d76c75..6ea3410 100644
--- a/sdk/plugins/output.cpp
+++ b/sdk/plugins/output.cpp
@@ -42,7 +42,8 @@
 #include "core/opencvutils.h"
 #include "core/qtutils.h"
 
-using namespace br;
+namespace br
+{
 
 /*!
  * \ingroup outputs
@@ -420,4 +421,6 @@ class histOutput : public Output
 
 BR_REGISTER(Output, histOutput)
 
+} // namespace br
+
 #include "output.moc"
diff --git a/sdk/plugins/pixel.cpp b/sdk/plugins/pixel.cpp
index c86aa2e..248996b 100644
--- a/sdk/plugins/pixel.cpp
+++ b/sdk/plugins/pixel.cpp
@@ -17,14 +17,16 @@
 #include <openbr_plugin.h>
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Treat each pixel as a classification task
  * \author E. Taborsky \cite mmtaborsky
  */
-class PerPixelClassifier : public MetaTransform
+class PerPixelClassifierTransform : public MetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(br::Transform* transform READ get_transform WRITE set_transform RESET reset_transform)
@@ -171,14 +173,14 @@ class PerPixelClassifier : public MetaTransform
     }
 };
 
-BR_REGISTER(Transform, PerPixelClassifier)
+BR_REGISTER(Transform, PerPixelClassifierTransform)
 
 /*!
  * \ingroup transforms
  * \brief Construct feature vectors of neighboring pixels
  * \author E. Taborsky \cite mmtaborsky
  */
-class Neighbors: public UntrainableMetaTransform
+class NeighborsTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
 
@@ -214,14 +216,14 @@ class Neighbors: public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, Neighbors)
+BR_REGISTER(Transform, NeighborsTransform)
 
 /*!
  * \ingroup transforms
  * \brief To binary vector
  * \author E. Taborsky \cite mmtaborsky
  */
-class ToBinaryVector: public UntrainableMetaTransform
+class ToBinaryVectorTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(br::Transform* transform READ get_transform WRITE set_transform RESET reset_transform STORED false)
@@ -264,7 +266,7 @@ class ToBinaryVector: public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, ToBinaryVector)
+BR_REGISTER(Transform, ToBinaryVectorTransform)
 
 /*!
  * \ingroup transforms
@@ -272,7 +274,7 @@ BR_REGISTER(Transform, ToBinaryVector)
  * \author E. Taborsky \cite mmtaborsky
  */
 
-class ToMetadata: public UntrainableMetaTransform
+class ToMetadataTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
 
@@ -288,6 +290,8 @@ class ToMetadata: public UntrainableMetaTransform
 
 };
 
-BR_REGISTER(Transform, ToMetadata)
+BR_REGISTER(Transform, ToMetadataTransform)
+
+} // namespace br
 
 #include "pixel.moc"
diff --git a/sdk/plugins/quantize.cpp b/sdk/plugins/quantize.cpp
index 702a623..9d8f109 100644
--- a/sdk/plugins/quantize.cpp
+++ b/sdk/plugins/quantize.cpp
@@ -19,14 +19,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Approximate floats as uchar.
  * \author Josh Klontz \cite jklontz
  */
-class Quantize : public Transform
+class QuantizeTransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(float a READ get_a WRITE set_a RESET reset_a)
@@ -48,14 +50,14 @@ class Quantize : public Transform
     }
 };
 
-BR_REGISTER(Transform, Quantize)
+BR_REGISTER(Transform, QuantizeTransform)
 
 /*!
  * \ingroup transforms
  * \brief Approximate floats as signed bit.
  * \author Josh Klontz \cite jklontz
  */
-class Binarize : public UntrainableTransform
+class BinarizeTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -78,14 +80,14 @@ class Binarize : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Binarize)
+BR_REGISTER(Transform, BinarizeTransform)
 
 /*!
  * \ingroup transforms
  * \brief Compress two uchar into one uchar.
  * \author Josh Klontz \cite jklontz
  */
-class Pack : public UntrainableTransform
+class PackTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -104,6 +106,8 @@ class Pack : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Pack)
+BR_REGISTER(Transform, PackTransform)
+
+} // namespace br
 
 #include "quantize.moc"
diff --git a/sdk/plugins/random.cpp b/sdk/plugins/random.cpp
index 2099db2..a16eb81 100644
--- a/sdk/plugins/random.cpp
+++ b/sdk/plugins/random.cpp
@@ -21,14 +21,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Selects a random transform.
  * \author Josh Klontz \cite jklontz
  */
-class RndTransform : public Transform
+class RndTransformTransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(QList<br::Transform*> transforms READ get_transforms WRITE set_transforms RESET reset_transforms STORED false)
@@ -62,14 +64,14 @@ class RndTransform : public Transform
     }
 };
 
-BR_REGISTER(Transform, RndTransform)
+BR_REGISTER(Transform, RndTransformTransform)
 
 /*!
  * \ingroup transforms
  * \brief Generates a random subspace.
  * \author Josh Klontz \cite jklontz
  */
-class RndSubspace : public Transform
+class RndSubspaceTransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(float fraction READ get_fraction WRITE set_fraction RESET reset_fraction STORED false)
@@ -128,14 +130,14 @@ class RndSubspace : public Transform
     }
 };
 
-BR_REGISTER(Transform, RndSubspace)
+BR_REGISTER(Transform, RndSubspaceTransform)
 
 /*!
  * \ingroup transforms
  * \brief Selects a random region.
  * \author Josh Klontz \cite jklontz
  */
-class RndRegion : public Transform
+class RndRegionTransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(float x READ get_x WRITE set_x RESET reset_x)
@@ -167,14 +169,14 @@ class RndRegion : public Transform
     }
 };
 
-BR_REGISTER(Transform, RndRegion)
+BR_REGISTER(Transform, RndRegionTransform)
 
 /*!
  * \ingroup transforms
  * \brief Generates a random landmark.
  * \author Josh Klontz \cite jklontz
  */
-class RndPoint : public Transform
+class RndPointTransform : public Transform
 {
     Q_OBJECT
     Q_PROPERTY(float x READ get_x WRITE set_x RESET reset_x)
@@ -198,6 +200,8 @@ class RndPoint : public Transform
     }
 };
 
-BR_REGISTER(Transform, RndPoint)
+BR_REGISTER(Transform, RndPointTransform)
+
+} // namespace br
 
 #include "random.moc"
diff --git a/sdk/plugins/reduce.cpp b/sdk/plugins/reduce.cpp
index e2ccfdf..88c41f0 100644
--- a/sdk/plugins/reduce.cpp
+++ b/sdk/plugins/reduce.cpp
@@ -17,14 +17,16 @@
 #include <openbr_plugin.h>
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Subtract two matrices.
  * \author Josh Klontz \cite jklontz
  */
-class Subtract : public UntrainableMetaTransform
+class SubtractTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
 
@@ -36,14 +38,14 @@ class Subtract : public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, Subtract)
+BR_REGISTER(Transform, SubtractTransform)
 
 /*!
  * \ingroup transforms
  * \brief Take the absolute difference of two matrices.
  * \author Josh Klontz \cite jklontz
  */
-class AbsDiff : public UntrainableMetaTransform
+class AbsDiffTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
 
@@ -55,14 +57,14 @@ class AbsDiff : public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, AbsDiff)
+BR_REGISTER(Transform, AbsDiffTransform)
 
 /*!
  * \ingroup transforms
  * \brief Logical AND of two matrices.
  * \author Josh Klontz \cite jklontz
  */
-class And : public UntrainableMetaTransform
+class AndTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
 
@@ -75,6 +77,8 @@ class And : public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, And)
+BR_REGISTER(Transform, AndTransform)
+
+} // namespace br
 
 #include "reduce.moc"
diff --git a/sdk/plugins/regions.cpp b/sdk/plugins/regions.cpp
index 561fc74..1e1e1ab 100644
--- a/sdk/plugins/regions.cpp
+++ b/sdk/plugins/regions.cpp
@@ -18,14 +18,16 @@
 #include <openbr_plugin.h>
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Subdivide matrix into rectangular subregions.
  * \author Josh Klontz \cite jklontz
  */
-class RectRegions : public UntrainableTransform
+class RectRegionsTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int width READ get_width WRITE set_width RESET reset_width STORED false)
@@ -50,14 +52,14 @@ class RectRegions : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, RectRegions)
+BR_REGISTER(Transform, RectRegionsTransform)
 
 /*!
  * \ingroup transforms
  * \brief Turns each row into its own matrix.
  * \author Josh Klontz \cite jklontz
  */
-class ByRow : public UntrainableTransform
+class ByRowTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -68,7 +70,7 @@ class ByRow : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, ByRow)
+BR_REGISTER(Transform, ByRowTransform)
 
 /*!
  * \ingroup transforms
@@ -76,7 +78,7 @@ BR_REGISTER(Transform, ByRow)
  * No requirements are placed on input matrices size and type.
  * \author Josh Klontz \cite jklontz
  */
-class Cat : public UntrainableMetaTransform
+class CatTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(int partitions READ get_partitions WRITE set_partitions RESET reset_partitions)
@@ -105,14 +107,14 @@ class Cat : public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, Cat)
+BR_REGISTER(Transform, CatTransform)
 
 /*!
  * \ingroup transforms
  * \brief Duplicates the template data.
  * \author Josh Klontz \cite jklontz
  */
-class Dup : public UntrainableMetaTransform
+class DupTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
     Q_PROPERTY(int n READ get_n WRITE set_n RESET reset_n STORED false)
@@ -125,6 +127,8 @@ class Dup : public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, Dup)
+BR_REGISTER(Transform, DupTransform)
+
+} // namespace br
 
 #include "regions.moc"
diff --git a/sdk/plugins/register.cpp b/sdk/plugins/register.cpp
index d777827..d8c2dbc 100644
--- a/sdk/plugins/register.cpp
+++ b/sdk/plugins/register.cpp
@@ -17,17 +17,19 @@
 #include <opencv2/imgproc/imgproc.hpp>
 #include <openbr_plugin.h>
 
+#include "core/opencvutils.h"
+
 using namespace cv;
-using namespace br;
 
-#include "core/opencvutils.h"
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Performs a two or three point registration.
  * \author Josh Klontz \cite jklontz
  */
-class Affine : public UntrainableTransform
+class AffineTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_PROPERTY(int width READ get_width WRITE set_width RESET reset_width STORED false)
@@ -101,14 +103,14 @@ class Affine : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, Affine)
+BR_REGISTER(Transform, AffineTransform)
 
 /*!
  * \ingroup transforms
  * \brief Flips the image about an axis.
  * \author Josh Klontz \cite jklontz
  */
-class Flip : public UntrainableTransform
+class FlipTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_ENUMS(Axis)
@@ -129,6 +131,8 @@ private:
     }
 };
 
-BR_REGISTER(Transform, Flip)
+BR_REGISTER(Transform, FlipTransform)
+
+} // namespace br
 
 #include "register.moc"
diff --git a/sdk/plugins/svm.cpp b/sdk/plugins/svm.cpp
index d7244f3..0d3fe54 100644
--- a/sdk/plugins/svm.cpp
+++ b/sdk/plugins/svm.cpp
@@ -21,7 +21,8 @@
 
 #include "core/opencvutils.h"
 
-using namespace br;
+namespace br
+{
 
 /*!
  * \ingroup transforms
@@ -29,7 +30,7 @@ using namespace br;
  * Knowledge Discovery and Data Mining 2(2), 1998.
  * \author Josh Klontz \cite jklontz
  */
-class SVM : public Transform
+class SVMTransform : public Transform
 {
     Q_OBJECT
     Q_ENUMS(Kernel)
@@ -66,7 +67,7 @@ private:
     float a, b;
 
 public:
-    SVM() : a(1), b(0) {}
+    SVMTransform() : a(1), b(0) {}
 
 private:
     void train(const TemplateList &_data)
@@ -153,6 +154,8 @@ private:
     }
 };
 
-BR_REGISTER(Transform, SVM)
+BR_REGISTER(Transform, SVMTransform)
+
+} // namespace br
 
 #include "svm.moc"
diff --git a/sdk/plugins/synthetic.cpp b/sdk/plugins/synthetic.cpp
index 66e3d6c..b922739 100644
--- a/sdk/plugins/synthetic.cpp
+++ b/sdk/plugins/synthetic.cpp
@@ -20,14 +20,16 @@
 #include "core/opencvutils.h"
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief Prediction using only the red wavelength; magic numbers from jmp
  * \author E. Taborsky \cite mmtaborsky
  */
-class RedLinearRegression : public UntrainableTransform
+class RedLinearRegressionTransform : public UntrainableTransform
 {
     Q_OBJECT
 
@@ -56,14 +58,14 @@ class RedLinearRegression : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, RedLinearRegression)
+BR_REGISTER(Transform, RedLinearRegressionTransform)
 
 /*!
  * \ingroup transforms
  * \brief Prediction with magic numbers from jmp; must get input as blue;green;red
  * \author E. Taborsky \cite mmtaborsky
  */
-class OrigLinearRegression : public UntrainableMetaTransform
+class OrigLinearRegressionTransform : public UntrainableMetaTransform
 {
     Q_OBJECT
 
@@ -94,6 +96,8 @@ class OrigLinearRegression : public UntrainableMetaTransform
     }
 };
 
-BR_REGISTER(Transform, OrigLinearRegression)
+BR_REGISTER(Transform, OrigLinearRegressionTransform)
+
+} // namespace br
 
 #include "synthetic.moc"
diff --git a/sdk/plugins/wavelet.cpp b/sdk/plugins/wavelet.cpp
index 2ef2b6b..60cc1f2 100644
--- a/sdk/plugins/wavelet.cpp
+++ b/sdk/plugins/wavelet.cpp
@@ -18,14 +18,16 @@
 #include <openbr_plugin.h>
 
 using namespace cv;
-using namespace br;
+
+namespace br
+{
 
 /*!
  * \ingroup transforms
  * \brief http://en.wikipedia.org/wiki/Gabor_filter
  * \author Josh Klontz \cite jklontz
  */
-class Gabor : public UntrainableTransform
+class GaborTransform : public UntrainableTransform
 {
     Q_OBJECT
     Q_ENUMS(Component)
@@ -53,7 +55,7 @@ private:
 
     Mat kReal, kImaginary;
 
-    friend class GaborJet;
+    friend class GaborJetTransform;
 
     static void makeWavelet(float lambda, float theta, float psi, float sigma, float gamma, Mat &kReal, Mat &kImaginary)
     {
@@ -111,29 +113,29 @@ private:
     }
 };
 
-BR_REGISTER(Transform, Gabor)
+BR_REGISTER(Transform, GaborTransform)
 
 /*!
  * \ingroup transforms
  * \brief A vector of gabor wavelets applied at a point.
  * \author Josh Klontz \cite jklontz
  */
-class GaborJet : public UntrainableTransform
+class GaborJetTransform : public UntrainableTransform
 {
     Q_OBJECT
-    Q_ENUMS(Gabor::Component)
+    Q_ENUMS(br::GaborTransform::Component)
     Q_PROPERTY(QList<float> lambdas READ get_lambdas WRITE set_lambdas RESET reset_lambdas STORED false)
     Q_PROPERTY(QList<float> thetas READ get_thetas WRITE set_thetas RESET reset_thetas STORED false)
     Q_PROPERTY(QList<float> psis READ get_psis WRITE set_psis RESET reset_psis STORED false)
     Q_PROPERTY(QList<float> sigmas READ get_sigmas WRITE set_sigmas RESET reset_sigmas STORED false)
     Q_PROPERTY(QList<float> gammas READ get_gammas WRITE set_gammas RESET reset_gammas STORED false)
-    Q_PROPERTY(Gabor::Component component READ get_component WRITE set_component RESET reset_component STORED false)
+    Q_PROPERTY(br::GaborTransform::Component component READ get_component WRITE set_component RESET reset_component STORED false)
     BR_PROPERTY(QList<float>, lambdas, QList<float>())
     BR_PROPERTY(QList<float>, thetas, QList<float>())
     BR_PROPERTY(QList<float>, psis, QList<float>())
     BR_PROPERTY(QList<float>, sigmas, QList<float>())
     BR_PROPERTY(QList<float>, gammas, QList<float>())
-    BR_PROPERTY(Gabor::Component, component, Gabor::Phase)
+    BR_PROPERTY(GaborTransform::Component, component, GaborTransform::Phase)
 
     QList<Mat> kReals, kImaginaries;
 
@@ -147,13 +149,13 @@ class GaborJet : public UntrainableTransform
                     foreach (float sigma, sigmas)
                         foreach (float gamma, gammas) {
                             Mat kReal, kImaginary;
-                            Gabor::makeWavelet(lambda, theta, psi, sigma, gamma, kReal, kImaginary);
+                            GaborTransform::makeWavelet(lambda, theta, psi, sigma, gamma, kReal, kImaginary);
                             kReals.append(kReal);
                             kImaginaries.append(kImaginary);
                         }
     }
 
-    static float response(const cv::Mat &src, const QPointF &point, const Mat &kReal, const Mat &kImaginary, Gabor::Component component)
+    static float response(const cv::Mat &src, const QPointF &point, const Mat &kReal, const Mat &kImaginary, GaborTransform::Component component)
     {
         Rect roi(std::max(std::min((int)(point.x() - kReal.cols/2.f), src.cols - kReal.cols), 0),
                  std::max(std::min((int)(point.y() - kReal.rows/2.f), src.rows - kReal.rows), 0),
@@ -161,27 +163,27 @@ class GaborJet : public UntrainableTransform
                  kReal.rows);
 
         float real = 0, imaginary = 0, magnitude = 0, phase = 0;
-        if (component != Gabor::Imaginary) {
+        if (component != GaborTransform::Imaginary) {
             Mat dst;
             multiply(src(roi), kReal, dst);
             real = sum(dst)[0];
         }
-        if (component != Gabor::Real) {
+        if (component != GaborTransform::Real) {
             Mat dst;
             multiply(src(roi), kImaginary, dst);
             imaginary = sum(dst)[0];
         }
-        if ((component == Gabor::Magnitude) || (component == Gabor::Phase)) {
+        if ((component == GaborTransform::Magnitude) || (component == GaborTransform::Phase)) {
             magnitude = sqrt(real*real + imaginary*imaginary);
             phase = atan2(imaginary, real)*180/CV_PI;
         }
 
         float dst = 0;
-        if      (component == Gabor::Real)      dst = real;
-        else if (component == Gabor::Imaginary) dst = imaginary;
-        else if (component == Gabor::Magnitude) dst = magnitude;
-        else if (component == Gabor::Phase)     dst = phase;
-        else                                    qFatal("GaborJet::response invalid component.");
+        if      (component == GaborTransform::Real)      dst = real;
+        else if (component == GaborTransform::Imaginary) dst = imaginary;
+        else if (component == GaborTransform::Magnitude) dst = magnitude;
+        else if (component == GaborTransform::Phase)     dst = phase;
+        else                                             qFatal("GaborJet::response invalid component.");
         return dst;
     }
 
@@ -195,6 +197,8 @@ class GaborJet : public UntrainableTransform
     }
 };
 
-BR_REGISTER(Transform, GaborJet)
+BR_REGISTER(Transform, GaborJetTransform)
+
+} // namespace br
 
 #include "wavelet.moc"