diff --git a/DataSpec/DNACommon/DNACommon.hpp b/DataSpec/DNACommon/DNACommon.hpp
index 4eede33b3..5b77d86c4 100644
--- a/DataSpec/DNACommon/DNACommon.hpp
+++ b/DataSpec/DNACommon/DNACommon.hpp
@@ -17,9 +17,9 @@ extern ThreadLocalPtr<class PAKRouterBase> g_PakRouter;
 extern ThreadLocalPtr<hecl::blender::Token> g_ThreadBlenderToken;
 
 /* This comes up a great deal */
-typedef athena::io::DNA<athena::Big> BigDNA;
-typedef athena::io::DNAV<athena::Big> BigDNAV;
-typedef athena::io::DNAVYaml<athena::Big> BigDNAVYaml;
+using BigDNA = athena::io::DNA<athena::Endian::Big>;
+using BigDNAV = athena::io::DNAV<athena::Endian::Big>;
+using BigDNAVYaml = athena::io::DNAVYaml<athena::Endian::Big>;
 
 /** FourCC with DNA read/write */
 using DNAFourCC = hecl::DNAFourCC;
diff --git a/DataSpec/DNACommon/GX.cpp b/DataSpec/DNACommon/GX.cpp
index 37206aeaa..f296883b7 100644
--- a/DataSpec/DNACommon/GX.cpp
+++ b/DataSpec/DNACommon/GX.cpp
@@ -3,15 +3,15 @@
 namespace GX {
 
 template <>
-void Color::Enumerate<athena::io::DNA<athena::Big>::Read>(typename Read::StreamT& reader) {
+void Color::Enumerate<athena::io::DNA<athena::Endian::Big>::Read>(Read::StreamT& reader) {
   reader.readUBytesToBuf(&num, 4);
 }
 template <>
-void Color::Enumerate<athena::io::DNA<athena::Big>::Write>(typename Write::StreamT& writer) {
+void Color::Enumerate<athena::io::DNA<athena::Endian::Big>::Write>(Write::StreamT& writer) {
   writer.writeUBytes(reinterpret_cast<const atUint8*>(&num), 4);
 }
 template <>
-void Color::Enumerate<athena::io::DNA<athena::Big>::BinarySize>(typename BinarySize::StreamT& s) {
+void Color::Enumerate<athena::io::DNA<athena::Endian::Big>::BinarySize>(BinarySize::StreamT& s) {
   s += 4;
 }
 
diff --git a/DataSpec/DNACommon/GX.hpp b/DataSpec/DNACommon/GX.hpp
index e9e1a573a..5bcb7b7d7 100644
--- a/DataSpec/DNACommon/GX.hpp
+++ b/DataSpec/DNACommon/GX.hpp
@@ -246,7 +246,7 @@ enum BlendFactor : uint16_t {
   BL_INVDSTALPHA
 };
 
-struct Color : athena::io::DNA<athena::Big> {
+struct Color : athena::io::DNA<athena::Endian::Big> {
   union {
     uint8_t color[4];
     uint32_t num = 0;
diff --git a/DataSpec/DNAMP1/AGSC.cpp b/DataSpec/DNAMP1/AGSC.cpp
index 4e3bb95e9..f136e5cb9 100644
--- a/DataSpec/DNAMP1/AGSC.cpp
+++ b/DataSpec/DNAMP1/AGSC.cpp
@@ -238,7 +238,7 @@ bool AGSC::Cook(const hecl::ProjectPath& dir, const hecl::ProjectPath& refOutPat
       amuse::AudioGroupDatabase group(path.getAbsolutePath());
 
       auto proj = group.getProj().toGCNData(group.getPool(), group.getSdir());
-      auto pool = group.getPool().toData<athena::Big>();
+      auto pool = group.getPool().toData<athena::Endian::Big>();
       auto sdirSamp = group.getSdir().toGCNData(group);
 
       w.writeUint32Big(pool.size());
diff --git a/DataSpec/DNAMP2/AGSC.cpp b/DataSpec/DNAMP2/AGSC.cpp
index 152721e92..9dd18ad58 100644
--- a/DataSpec/DNAMP2/AGSC.cpp
+++ b/DataSpec/DNAMP2/AGSC.cpp
@@ -57,7 +57,7 @@ bool AGSC::Cook(const hecl::ProjectPath& dir, const hecl::ProjectPath& outPath)
   amuse::AudioGroupDatabase group(dir.getAbsolutePath());
 
   auto proj = group.getProj().toGCNData(group.getPool(), group.getSdir());
-  auto pool = group.getPool().toData<athena::Big>();
+  auto pool = group.getPool().toData<athena::Endian::Big>();
   auto sdirSamp = group.getSdir().toGCNData(group);
 
   Header head;
diff --git a/Editor/Space.hpp b/Editor/Space.hpp
index 68d87f096..a0ae82b0f 100644
--- a/Editor/Space.hpp
+++ b/Editor/Space.hpp
@@ -42,7 +42,7 @@ public:
     GameMode
   };
 
-  struct State : athena::io::DNAVYaml<athena::Big> {
+  struct State : athena::io::DNAVYaml<athena::Endian::Big> {
     Delete _d;
   };
   static Space* NewSpaceFromConfigStream(ViewManager& vm, Space* parent, ConfigReader& r);