diff --git a/DNA/DNA.pri b/DNA/DNA.pri
index dc14cf4d9..efd50f423 100644
--- a/DNA/DNA.pri
+++ b/DNA/DNA.pri
@@ -1,2 +1,5 @@
-include(DNA_common/DNA_common.pri)
-include(DNA_mp1/DNA_mp1.pri)
+include(DNACommon/DNACommon.pri)
+include(DNAMP1/DNAMP1.pri)
+include(DNAMP2/DNAMP2.pri)
+include(DNAMP3/DNAMP3.pri)
+
diff --git a/DNA/DNA_common/common.hpp b/DNA/DNACommon/DNACommon.hpp
similarity index 100%
rename from DNA/DNA_common/common.hpp
rename to DNA/DNACommon/DNACommon.hpp
diff --git a/DNA/DNACommon/DNACommon.pri b/DNA/DNACommon/DNACommon.pri
new file mode 100644
index 000000000..eff19b8b3
--- /dev/null
+++ b/DNA/DNACommon/DNACommon.pri
@@ -0,0 +1,2 @@
+HEADERS += \
+    $$PWD/DNACommon.hpp
diff --git a/DNA/DNA_mp1/DNA_mp1.pri b/DNA/DNAMP1/DNAMP1.pri
similarity index 100%
rename from DNA/DNA_mp1/DNA_mp1.pri
rename to DNA/DNAMP1/DNAMP1.pri
diff --git a/DNA/DNA_mp1/MLVL.hpp b/DNA/DNAMP1/MLVL.hpp
similarity index 92%
rename from DNA/DNA_mp1/MLVL.hpp
rename to DNA/DNAMP1/MLVL.hpp
index c888d208f..d548e4286 100644
--- a/DNA/DNA_mp1/MLVL.hpp
+++ b/DNA/DNAMP1/MLVL.hpp
@@ -1,6 +1,6 @@
-#include "../DNA_common/common.hpp"
+#include "../DNACommon/DNACommon.hpp"
 
-namespace MP1
+namespace DNAMP1
 {
 
 struct MLVL : public BigDNA
@@ -94,12 +94,7 @@ struct MLVL : public BigDNA
     Vector<LayerFlags, DNA_COUNT(layerFlagCount)> layerFlags;
 
     Value<atUint32> layerNameCount;
-    struct LayerName : public BigDNA
-    {
-        DECL_DNA
-        String<-1> name;
-    };
-    Vector<LayerName, DNA_COUNT(layerNameCount)> layerNames;
+    Vector<String<-1>, DNA_COUNT(layerNameCount)> layerNames;
 
     Value<atUint32> layerNameOffsetCount;
     Vector<atUint32, DNA_COUNT(layerNameOffsetCount)> layerNameOffsets;
diff --git a/DNA/DNAMP2/DNAMP2.pri b/DNA/DNAMP2/DNAMP2.pri
new file mode 100644
index 000000000..e69de29bb
diff --git a/DNA/DNAMP3/DNAMP3.pri b/DNA/DNAMP3/DNAMP3.pri
new file mode 100644
index 000000000..e69de29bb
diff --git a/DNA/DNA_common/DNA_common.pri b/DNA/DNA_common/DNA_common.pri
deleted file mode 100644
index 50ac9cb37..000000000
--- a/DNA/DNA_common/DNA_common.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += \
-    $$PWD/common.hpp