diff --git a/NIF_IO.cpp b/NIF_IO.cpp
index 4088396490595f805d79196072f995730396d3f8..381f0c9d0ba694b7fe14ecd9d93f9117259669b1 100644
--- a/NIF_IO.cpp
+++ b/NIF_IO.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NIF_IO.h"
-namespace NifLib {
+namespace Niflib {
 
 int BlockSearch( istream& in ) {
 
diff --git a/NIF_IO.h b/NIF_IO.h
index 1eab830c556436585e6f399d0fd84a3e3d1f49af..b2401cdbd1e8660cc82dbab08dbe4a30cfe66b68 100644
--- a/NIF_IO.h
+++ b/NIF_IO.h
@@ -11,7 +11,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include <sstream>
 #include <vector>
 #include "nif_math.h"
-namespace NifLib {
+namespace Niflib {
 using namespace std;
 
 #ifndef NULL
diff --git a/Ref.h b/Ref.h
index 369f48dc03bd1531481d72d7edecd38e2b795bd4..20a8b1b85a9dd4d541fe1b6eae55ffc4d5e786be 100644
--- a/Ref.h
+++ b/Ref.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _REF_H_
 #include <ostream>
 #include "dll_export.h"
-namespace NifLib {
+namespace Niflib {
 
 /**
  * Smart Pointer Template
diff --git a/Type.cpp b/Type.cpp
index 2124249af757caaae50c49abc44958280db22fe6..e9bbd4a36f5c0ac3fac85d38973c0ed0006410f6 100644
--- a/Type.cpp
+++ b/Type.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "Type.h"
-using namespace NifLib;
+using namespace Niflib;
 
 Type::Type (const string & type_name, const Type * par_type ) : name(type_name), base_type(par_type) {} 
 
diff --git a/Type.h b/Type.h
index f473438253f633e2c46e6e6ea03feda63aba4046..cfb35c497740ff350d80fb734ff8e90f7b95350a 100644
--- a/Type.h
+++ b/Type.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "dll_export.h"
 
 using namespace std;
-namespace NifLib {
+namespace Niflib {
 
 /**
  * Run Time Type Inforamtion Class
diff --git a/gen/AVObject.cpp b/gen/AVObject.cpp
index 06eae544a88798b0b25e2fc7bb1490558ce0cdcc..00240675151955d6d9cf5dd2bf64fb85d3f00c1e 100644
--- a/gen/AVObject.cpp
+++ b/gen/AVObject.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AVObject.h"
 #include "../obj/NiAVObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 AVObject::AVObject() : object(NULL) {};
diff --git a/gen/AVObject.h b/gen/AVObject.h
index dffed0354a1d3187bb59392a268b251b44c94a3f..0b1830911381d2d2e590fbf9766e34bbf3b57777 100644
--- a/gen/AVObject.h
+++ b/gen/AVObject.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiAVObject;
diff --git a/gen/BoundingBox.cpp b/gen/BoundingBox.cpp
index 96545cd149b88436c1f7cba834bf4b756fa5ea45..52a0b33d184d0125706f78e43191bdc760935b8a 100644
--- a/gen/BoundingBox.cpp
+++ b/gen/BoundingBox.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "BoundingBox.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 BoundingBox::BoundingBox() : unknownInt((uint)1) {};
diff --git a/gen/BoundingBox.h b/gen/BoundingBox.h
index d50f3cdfd468baa1ab25b1e53c2d67cd8d4761df..f1489eee65015b62583722f367bf253599295f5c 100644
--- a/gen/BoundingBox.h
+++ b/gen/BoundingBox.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/ByteArray.cpp b/gen/ByteArray.cpp
index abb07411da02560d4b7dbe55fc623ba13266653b..8d7950f4aac1ef9ff39bc483effcc60009e320f1 100644
--- a/gen/ByteArray.cpp
+++ b/gen/ByteArray.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "ByteArray.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 ByteArray::ByteArray() : dataSize((uint)0) {};
diff --git a/gen/ByteArray.h b/gen/ByteArray.h
index 79cb83de4625fb814d4b92401e508f8185564942..61abc3cea3559ef9a8a60dd72df4f9181c543806 100644
--- a/gen/ByteArray.h
+++ b/gen/ByteArray.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/ControllerLink.cpp b/gen/ControllerLink.cpp
index 805b1c909b1351a2b970eb3f7bb4f7bf14ff754d..9f08049cca72da3dde6bc34afe2f86b743853a33 100644
--- a/gen/ControllerLink.cpp
+++ b/gen/ControllerLink.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../obj/NiInterpolator.h"
 #include "../obj/NiObject.h"
 #include "../obj/NiStringPalette.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 ControllerLink::ControllerLink() : interpolator(NULL), unknownLink1(NULL), unknownLink2(NULL), unknownShort0((ushort)0), priority_((byte)0), stringPalette(NULL), nodeNameOffset((uint)0), propertyTypeOffset((uint)0), controllerTypeOffset((uint)0), variableOffset1((uint)0), variableOffset2((uint)0) {};
diff --git a/gen/ControllerLink.h b/gen/ControllerLink.h
index c34d015d47defdaf8ee2e39bc2a4459a6098f630..8b8d597a323736b59f8544e84f7f4f7b2543f363 100644
--- a/gen/ControllerLink.h
+++ b/gen/ControllerLink.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiInterpolator;
diff --git a/gen/Footer.cpp b/gen/Footer.cpp
index 9082395c087788b30c3496efedfd98c8f64d3aba..d0ee5465a59c8f48209754f41732a943cc36beff 100644
--- a/gen/Footer.cpp
+++ b/gen/Footer.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "Footer.h"
 #include "../obj/NiAVObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 Footer::Footer() : numRoots((uint)0) {};
diff --git a/gen/Footer.h b/gen/Footer.h
index 66c1d8244ae89f0dd4b138b5d788852dfb5858ef..3b9233c6e9a51ea534d93646fd8ff5298b15b8a5 100644
--- a/gen/Footer.h
+++ b/gen/Footer.h
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiAVObject;
diff --git a/gen/FurniturePosition.cpp b/gen/FurniturePosition.cpp
index 356e5bc7c6c671511a9ba49787fb0b680fcfca61..e4b418b4c4ccea4d196683a4c4e825c874794f42 100644
--- a/gen/FurniturePosition.cpp
+++ b/gen/FurniturePosition.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "FurniturePosition.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 FurniturePosition::FurniturePosition() : orientation((ushort)0), positionRef1((byte)0), positionRef2((byte)0) {};
diff --git a/gen/FurniturePosition.h b/gen/FurniturePosition.h
index 10d9c6f8698f39742ef1fe5e2de869a006264f2f..a4042ee9e8eba3461721917101b2d6de3fa648f7 100644
--- a/gen/FurniturePosition.h
+++ b/gen/FurniturePosition.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/Header.cpp b/gen/Header.cpp
index 0ff4ed5af0e3e3756688d5031ae8419ad0fca8eb..c0bbdf68da4195a29963003d319b4086c71467d1 100644
--- a/gen/Header.cpp
+++ b/gen/Header.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "ShortString.h"
 #include "ShortString.h"
 #include "ShortString.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 Header::Header() : version((uint)0x04000002), endianType((byte)1), userVersion((uint)0), numBlocks((uint)0), unknownInt1((uint)0), unknownInt3((uint)0), numBlockTypes((ushort)0), unknownInt2((uint)0) {};
diff --git a/gen/Header.h b/gen/Header.h
index 3811853d2a5b16f8d549ea8b4c1a8651297eb701..1f484a11656c57f7af27cab4b8fd7a80781fbb9a 100644
--- a/gen/Header.h
+++ b/gen/Header.h
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "ShortString.h"
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/KeyGroup.h b/gen/KeyGroup.h
index 6d32ecde2581eb802c1b5a9f535f0379003a0d7d..ff67b940550877df4f50d39bcb5d4f33c39342a4 100644
--- a/gen/KeyGroup.h
+++ b/gen/KeyGroup.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/LODRange.cpp b/gen/LODRange.cpp
index c3b3b69547ccbfac4cb84c5a581fb6f3fedc251e..7b449af5cff2eb088ac246ec2f350897a13583a8 100644
--- a/gen/LODRange.cpp
+++ b/gen/LODRange.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "LODRange.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 LODRange::LODRange() : near(0.0f), far(0.0f) {};
diff --git a/gen/LODRange.h b/gen/LODRange.h
index 678ccf7bf4c16311dd87fbac0a97c6523dc7771e..38f752e1eed74153753ad7d9408c828d4700f958 100644
--- a/gen/LODRange.h
+++ b/gen/LODRange.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/LimitedHingeDescriptor.cpp b/gen/LimitedHingeDescriptor.cpp
index 9c42628f387ba4c7a6267e89a13629d8e8c16718..a20dda48543a8423b1e9cfe4a487dbe055af721a 100644
--- a/gen/LimitedHingeDescriptor.cpp
+++ b/gen/LimitedHingeDescriptor.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "LimitedHingeDescriptor.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 LimitedHingeDescriptor::LimitedHingeDescriptor() : minAngle(0.0f), maxAngle(0.0f), maxFriction(0.0f) {};
diff --git a/gen/LimitedHingeDescriptor.h b/gen/LimitedHingeDescriptor.h
index 1302f8aa05fbaee3c84f706f1301aac79519dbf8..2ddd5724ce4a7d233cb52241c2b32597683ba3a8 100644
--- a/gen/LimitedHingeDescriptor.h
+++ b/gen/LimitedHingeDescriptor.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/MatchGroup.cpp b/gen/MatchGroup.cpp
index d6d46bb96daa2e370e0b981c6182ae33a4674f45..6f5d8955d6683b610f47d6732bd86c0709e12ace 100644
--- a/gen/MatchGroup.cpp
+++ b/gen/MatchGroup.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "MatchGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 MatchGroup::MatchGroup() : numVertices((ushort)0) {};
diff --git a/gen/MatchGroup.h b/gen/MatchGroup.h
index 5564c30eb8985b7ea8641d9de178b52704770d76..ab0b1504aa8a5b1a78adea655034e19855a31976 100644
--- a/gen/MatchGroup.h
+++ b/gen/MatchGroup.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/MipMap.cpp b/gen/MipMap.cpp
index d028fa89083f3055b492a3d017bc16c19ebd26fb..01169af3ce5342aa9e2967a26baf46da92defa3e 100644
--- a/gen/MipMap.cpp
+++ b/gen/MipMap.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "MipMap.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 MipMap::MipMap() : width((uint)0), height((uint)0), offset((uint)0) {};
diff --git a/gen/MipMap.h b/gen/MipMap.h
index 3076bb8e8fce9db2c8742a2f48d227f4ea5a05d9..d4febaf5cdb3120a54f0dd7d97788f5bede8cbb5 100644
--- a/gen/MipMap.h
+++ b/gen/MipMap.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/Morph.cpp b/gen/Morph.cpp
index ffd64610ed4e8fdef7a1b8e77b7fe8f4d5088800..6c698a7fb628d424825de8f15cf919ff254d6c6b 100644
--- a/gen/Morph.cpp
+++ b/gen/Morph.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "Morph.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 Morph::Morph() : numMorphKeys((uint)0), morphInterpolation((KeyType)0), unknownInt((uint)0) {};
diff --git a/gen/Morph.h b/gen/Morph.h
index 7b024dcd1900e84054ee204c72aac08029b7fe1e..9efeddbf898c5e4b91800bedb4feb76c1b0e327f 100644
--- a/gen/Morph.h
+++ b/gen/Morph.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/NodeGroup.cpp b/gen/NodeGroup.cpp
index 13f75fa4ec2651d6d74fbc325d0cb45e71476ec7..cf36491384e2870c2ce9e8b425e2dca9f0c068e1 100644
--- a/gen/NodeGroup.cpp
+++ b/gen/NodeGroup.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NodeGroup.h"
 #include "../obj/NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 NodeGroup::NodeGroup() : numNodes((uint)0) {};
diff --git a/gen/NodeGroup.h b/gen/NodeGroup.h
index c001ca36ac6a43cb68a101c483ef8b93f1eaddcb..ea55a26e25a8d2278727ecb00e88d33e90828bf9 100644
--- a/gen/NodeGroup.h
+++ b/gen/NodeGroup.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/gen/Particle.cpp b/gen/Particle.cpp
index 74f4e7998c26236df1ad3e2f1ce866a4ebe513f4..30d0a593e65094542be108d2aa699b278bc7b333 100644
--- a/gen/Particle.cpp
+++ b/gen/Particle.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "Particle.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 Particle::Particle() : lifetime(0.0f), lifespan(0.0f), timestamp(0.0f), unknownShort((ushort)0), vertexId((ushort)0) {};
diff --git a/gen/Particle.h b/gen/Particle.h
index f17e0b9f0a084de950d012eeb385ff6051b2b7df..e192f22ff83ea27898fa9f9b78c8d800f2aaea41 100644
--- a/gen/Particle.h
+++ b/gen/Particle.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/QuaternionXYZW.cpp b/gen/QuaternionXYZW.cpp
index aa3c6f9ff92da7388e97fabda4cfdc66148ddb90..3842b3672c0d6afcf00b26f444713dc74692e3cf 100644
--- a/gen/QuaternionXYZW.cpp
+++ b/gen/QuaternionXYZW.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "QuaternionXYZW.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 QuaternionXYZW::QuaternionXYZW() : x(0.0f), y(0.0f), z(0.0f), w(0.0f) {};
diff --git a/gen/QuaternionXYZW.h b/gen/QuaternionXYZW.h
index 85a25daa06bc505d663392b1c99b8e78cd4ddced..57333c6bf2d70e66d47d41a999d9da77b58a9d35 100644
--- a/gen/QuaternionXYZW.h
+++ b/gen/QuaternionXYZW.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/RagDollDescriptor.cpp b/gen/RagDollDescriptor.cpp
index 67d101636f842652ae5c48c5ad2ec5331c4706d3..ce6a1e8b29bcc05a07e8c807b484792b18988868 100644
--- a/gen/RagDollDescriptor.cpp
+++ b/gen/RagDollDescriptor.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "RagDollDescriptor.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 RagDollDescriptor::RagDollDescriptor() : coneMinAngle(0.0f), planeMinAngle(0.0f), planeMaxAngle(0.0f), twistMinAngle(0.0f), twistMaxAngle(0.0f), maxFriction(0.0f) {};
diff --git a/gen/RagDollDescriptor.h b/gen/RagDollDescriptor.h
index 829bd3aa825dfa6b598ea636da4f341439894f97..9d82af53391fe5e2272201811e72c192dfcc6458 100644
--- a/gen/RagDollDescriptor.h
+++ b/gen/RagDollDescriptor.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/RotationKeyArray.h b/gen/RotationKeyArray.h
index 7ca915ef309145f39aa16b454f3bca522080517b..fca73750ce739221d953e97d95271f8c0d2b3c97 100644
--- a/gen/RotationKeyArray.h
+++ b/gen/RotationKeyArray.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/ShaderTexDesc.cpp b/gen/ShaderTexDesc.cpp
index 213c583ae9603633a0dee13a1cf9f86620dc3420..bdee52d26f532c7d9f5dbe203a074b1696816e7c 100644
--- a/gen/ShaderTexDesc.cpp
+++ b/gen/ShaderTexDesc.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "ShaderTexDesc.h"
 #include "TexDesc.h"
 #include "../obj/NiSourceTexture.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 ShaderTexDesc::ShaderTexDesc() : isUsed(false), unknownInt((uint)0) {};
diff --git a/gen/ShaderTexDesc.h b/gen/ShaderTexDesc.h
index ff9ac0a896826c548c755e5643d43b79dbc0a0cc..c747bd71e814737825e41bcb76af63bc66937618 100644
--- a/gen/ShaderTexDesc.h
+++ b/gen/ShaderTexDesc.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "TexDesc.h"
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/ShortString.cpp b/gen/ShortString.cpp
index d0370af2407b35d4d35a20b19ad1420055398576..50d9735da2d655140e6b3b35fad8eab4497585fb 100644
--- a/gen/ShortString.cpp
+++ b/gen/ShortString.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "ShortString.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 ShortString::ShortString() : length((byte)0) {};
diff --git a/gen/ShortString.h b/gen/ShortString.h
index 107b9e34d23614ab1e2ccbe197fb9d4416ff34f0..0028f76c616488afeb5127b77f2080111f33f223 100644
--- a/gen/ShortString.h
+++ b/gen/ShortString.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/SkinData.cpp b/gen/SkinData.cpp
index ae0368ad06953a3d0ef799c79c85d4b25a8b3f04..540d1b34e6e5e165328c8db3734c6e7d76e75c53 100644
--- a/gen/SkinData.cpp
+++ b/gen/SkinData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "SkinData.h"
 #include "SkinWeight.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 SkinData::SkinData() : scale(0.0f), numVertices((ushort)0) {};
diff --git a/gen/SkinData.h b/gen/SkinData.h
index fa6f542c0b0e16c43576b66f7e4d392d3428ad45..f33f32b2182f6e7c4f838127592e7dae96e88c05 100644
--- a/gen/SkinData.h
+++ b/gen/SkinData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "SkinWeight.h"
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/SkinPartition.cpp b/gen/SkinPartition.cpp
index b93d183390a2e51239b1b47f5b169440d4815260..c9828b05e024f17baa319a3b29568a9c48c154fb 100644
--- a/gen/SkinPartition.cpp
+++ b/gen/SkinPartition.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "SkinPartition.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 SkinPartition::SkinPartition() : numVertices((ushort)0), numTriangles((ushort)0), numBones((ushort)0), numStrips((ushort)0), numWeightsPerVertex((ushort)0), hasVertexMap(false), hasVertexWeights(false), hasStrips(false), hasBoneIndices(false) {};
diff --git a/gen/SkinPartition.h b/gen/SkinPartition.h
index e51926bba6043be185cbe946f574cbe5cff14cc0..35384f1fd3a303e98d2d002f715732678c233e63 100644
--- a/gen/SkinPartition.h
+++ b/gen/SkinPartition.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/SkinShape.cpp b/gen/SkinShape.cpp
index 663d9ba6af5ae2ab16bb5da7b1b7a7f388bfabe2..89e160011d0228dcf33e68547de27e5ff58f0278 100644
--- a/gen/SkinShape.cpp
+++ b/gen/SkinShape.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "SkinShape.h"
 #include "../obj/NiTriShape.h"
 #include "../obj/NiSkinInstance.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 SkinShape::SkinShape() : shape(NULL), skinInstance(NULL) {};
diff --git a/gen/SkinShape.h b/gen/SkinShape.h
index 4f00d9d9cb59e127eb05e74bbb411271a3634139..ce3e0d7b83ff20efb8c8ae723c2ae0d090a78288 100644
--- a/gen/SkinShape.h
+++ b/gen/SkinShape.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiTriShape;
diff --git a/gen/SkinShapeGroup.cpp b/gen/SkinShapeGroup.cpp
index cbddd7ab2c5af79a38f0f4bb67fa49904c63bbff..235ac487e4492c426fcaed63c23dc624a3b9bdc8 100644
--- a/gen/SkinShapeGroup.cpp
+++ b/gen/SkinShapeGroup.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "SkinShape.h"
 #include "../obj/NiTriShape.h"
 #include "../obj/NiSkinInstance.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 SkinShapeGroup::SkinShapeGroup() : numLinkPairs((uint)0) {};
diff --git a/gen/SkinShapeGroup.h b/gen/SkinShapeGroup.h
index 6108f0dfc9950d9a846ef566be6a87d2b1bc879b..fb0c363a575a8dee6e8da8a0de4efd48c0330975 100644
--- a/gen/SkinShapeGroup.h
+++ b/gen/SkinShapeGroup.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "SkinShape.h"
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/SkinWeight.cpp b/gen/SkinWeight.cpp
index 2cd6a05a8cff9c5c1787f76252ef967454871b2d..0a8af68d90b3dd0b959c26985eadc7272c27c4aa 100644
--- a/gen/SkinWeight.cpp
+++ b/gen/SkinWeight.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "SkinWeight.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 SkinWeight::SkinWeight() : index((ushort)0), weight(0.0f) {};
diff --git a/gen/SkinWeight.h b/gen/SkinWeight.h
index 9dc0a2fe0a368759da9ff96bb35781f17ae96838..6a49949f10763d35f7b843dee2faa63cef91c4ac 100644
--- a/gen/SkinWeight.h
+++ b/gen/SkinWeight.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/StringPalette.cpp b/gen/StringPalette.cpp
index eb2005c69a926bd32f1b560d65939ba9cf10827f..4557174ac3b185802e0a5c14c63ebb97853a6142 100644
--- a/gen/StringPalette.cpp
+++ b/gen/StringPalette.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "StringPalette.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 StringPalette::StringPalette() : length((uint)0) {};
diff --git a/gen/StringPalette.h b/gen/StringPalette.h
index 18b616f2782f484ac5c2bc5d5295c3b335e05dce..903488efefd625767fecfbbabc5d44aad0e16074 100644
--- a/gen/StringPalette.h
+++ b/gen/StringPalette.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/TBC.cpp b/gen/TBC.cpp
index 79bbdf72ff08a29e63c3f6ba90b922253e297f81..2ecbb94e11ac5cf8b4355deeac9d6f4a1b48d091 100644
--- a/gen/TBC.cpp
+++ b/gen/TBC.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "TBC.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 TBC::TBC() : t(0.0f), b(0.0f), c(0.0f) {};
diff --git a/gen/TBC.h b/gen/TBC.h
index 634e7a8dc6c3b4bb58dec5bf000a12fdb9c35afd..7f9d17d9170cd9f54cad0accde972eaa5b7a2546 100644
--- a/gen/TBC.h
+++ b/gen/TBC.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/TexDesc.cpp b/gen/TexDesc.cpp
index d7cf5fc9db08a02161f7adcf8e9086212cd7ef1b..1bb38454392c9c4d7ebcf4cec5cf8be94ca17beb 100644
--- a/gen/TexDesc.cpp
+++ b/gen/TexDesc.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "TexDesc.h"
 #include "../obj/NiSourceTexture.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 TexDesc::TexDesc() : source(NULL), clampMode((TexClampMode)WRAP_S_WRAP_T), filterMode((TexFilterMode)FILTER_TRILERP), textureSet((uint)0), ps2L((ushort)0), ps2K((ushort)0xFFB5), unknown1((ushort)0), hasTextureTransform(false), wRotation(0.0f), transformType_((uint)0) {};
diff --git a/gen/TexDesc.h b/gen/TexDesc.h
index 9ae45c6d8217a9b68c16b26468c4660985ebbf71..7204854b1ebc8577b6515b1cd64267281b6096e5 100644
--- a/gen/TexDesc.h
+++ b/gen/TexDesc.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiSourceTexture;
diff --git a/gen/TexSource.cpp b/gen/TexSource.cpp
index b16cc28f081e55365595b637b027c1d93c102460..3e756907a81721783870940eda60356d8a84794f 100644
--- a/gen/TexSource.cpp
+++ b/gen/TexSource.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "TexSource.h"
 #include "../obj/NiObject.h"
 #include "../obj/NiPixelData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 TexSource::TexSource() : useExternal((byte)0), unknownLink(NULL), unknownByte((byte)0), pixelData(NULL) {};
diff --git a/gen/TexSource.h b/gen/TexSource.h
index 1476e8c72e91f9a4daa43c700a428249a09d7251..bd9e75ecffadb3127aa34860adef39d1dbecd38d 100644
--- a/gen/TexSource.h
+++ b/gen/TexSource.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/gen/hkTriangle.cpp b/gen/hkTriangle.cpp
index aea75ad15ece81655136e61064aed544989b1e19..f17cecfb03493f28dad8e3ea4c24fe3d4107ed0b 100644
--- a/gen/hkTriangle.cpp
+++ b/gen/hkTriangle.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "hkTriangle.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Constructor
 hkTriangle::hkTriangle() : unknownShort((ushort)0) {};
diff --git a/gen/hkTriangle.h b/gen/hkTriangle.h
index cf42c433c63d697511e4a1affe1d9f04c1640b45..0946ce75a50705d6175fe7cea42818b434992f6b 100644
--- a/gen/hkTriangle.h
+++ b/gen/hkTriangle.h
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "../NIF_IO.h"
 
-namespace NifLib {
+namespace Niflib {
 
 
 /*!
diff --git a/gen/obj_factories.cpp b/gen/obj_factories.cpp
index f36112c6c305187c8974ec71a00e8d435d9fafbd..f373730e4be6b140fcfdaa5cee1d84538dd77f21 100644
--- a/gen/obj_factories.cpp
+++ b/gen/obj_factories.cpp
@@ -2,9 +2,9 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "../obj/NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 using namespace std;
-namespace NifLib {
+namespace Niflib {
 typedef NiObject*(*blk_factory_func)();
 extern map<string, blk_factory_func> global_block_map;
 }
@@ -370,7 +370,7 @@ NiObject * CreateNiZBufferProperty() { return new NiZBufferProperty; }
 #include "../obj/RootCollisionNode.h"
 NiObject * CreateRootCollisionNode() { return new RootCollisionNode; }
 
-namespace NifLib {
+namespace Niflib {
 //This function registers the factory functions with global_block_map which is used by CreateBlock
 void RegisterBlockFactories() {
 	global_block_map["bhkBlendCollisionObject"] = CreatebhkBlendCollisionObject;
diff --git a/gen/obj_impl.cpp b/gen/obj_impl.cpp
index 780d71e62fc7bc634c710d79ac09adf55ec9e9f0..ac066b7384f729f2b4ed8e52a79bdad0843532fe 100644
--- a/gen/obj_impl.cpp
+++ b/gen/obj_impl.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "../obj/NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 using namespace std;
 
 #include "../obj/bhkBlendCollisionObject.h"
diff --git a/nif_math.cpp b/nif_math.cpp
index 592991d2591e49a02e2f14ec8646fcaf478e6ee2..28995d50bd8908aa9128de195dd32b050510371c 100644
--- a/nif_math.cpp
+++ b/nif_math.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "nif_math.h"
 #include <iomanip>
-using namespace NifLib;
+using namespace Niflib;
 
 //Constants
 
@@ -475,7 +475,7 @@ Matrix33 Quaternion::AsMatrix() {
 /*
  * ostream functions for printing with cout
  */
-namespace NifLib {
+namespace Niflib {
 ostream & operator<<( ostream & out, TexCoord const & val ) {
 	return out << "(" << setw(6) << val.u << "," << setw(6) << val.v << ")";
 }
diff --git a/nif_math.h b/nif_math.h
index 162d803930bc1f91dbe2092f5700c7693100677f..3811d18bffaeb0597df99b120d344b19ac20da1a 100644
--- a/nif_math.h
+++ b/nif_math.h
@@ -10,7 +10,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "dll_export.h"
 
 using namespace std;
-namespace NifLib {
+namespace Niflib {
 
 #ifndef PI
 #define PI 3.14159265358979323846f  //Probably more accurate than a float can be, but it will just be rounded off anyway
diff --git a/niflib.cpp b/niflib.cpp
index db21ebc9e5452de2054515907d2d35255f63b05c..d007c3a3cf56a09886e4dfb629e672fce7c095a1 100644
--- a/niflib.cpp
+++ b/niflib.cpp
@@ -11,7 +11,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "obj/NiNode.h"
 #include "obj/NiTextKeyExtraData.h"
 #include "gen/header.h"
-namespace NifLib {
+namespace Niflib {
 
 //Stores the mapping between block names and factory function pointers to create them
 typedef IBlock * (*blk_factory_func)();
@@ -608,6 +608,7 @@ list<NiObjectRef> GetAllObjectsByType( NiObjectRef const & root, const Type & ty
 //	return result;
 //};
 
+//TODO:  This was written by Amorilia.  Figure out how to fix it.
 /*!
  * Helper function to split off animation from a nif tree. If no animation groups are defined, then both xnif_root and xkf_root will be null blocks.
  * \param root_block The root block of the full tree.
@@ -616,130 +617,132 @@ list<NiObjectRef> GetAllObjectsByType( NiObjectRef const & root, const Type & ty
  * \param kfm The KFM structure (if required by style).
  * \param kf_type What type of keyframe tree to write (Morrowind style, DAoC style, ...).
  */
-void SplitNifTree( NiObjectRef const & root_block, NiObjectRef & xnif_root, NiObjectRef & xkf_root, Kfm & kfm, int kf_type ) {
-	// Do we have animation groups (a NiTextKeyExtraData block)?
-	// If so, create XNif and XKf trees.
-	NiObjectRef txtkey_block = GetObjectByType( root_block, NiTextKeyExtraData::TypeConst() ); 
-	if ( txtkey_block != NULL ) {
-		if ( kf_type == KF_MW ) {
-			// Construct the XNif file...
-			// We are lazy. (TODO: clone & remove keyframe controllers & keyframe data)
-			xnif_root = root_block;
-			
-			// Now the XKf file...
-			// Create xkf root header.
-			xkf_root = CreateBlock("NiSequenceStreamHelper");
-			
-			// Add a copy of the NiTextKeyExtraData block to the XKf header.
-			NiObjectRef xkf_txtkey_block = CreateBlock("NiTextKeyExtraData");
-			//TODO: Have Amorilia fix this
-			//xkf_root["Extra Data"] = xkf_txtkey_block;
-			
-			/*ITextKeyExtraData const *itxtkey_block = QueryTextKeyExtraData(txtkey_block);
-			ITextKeyExtraData *ixkf_txtkey_block = QueryTextKeyExtraData(xkf_txtkey_block);
-			ixkf_txtkey_block->SetKeys(itxtkey_block->GetKeys());*/
-			
-			// Append NiNodes with a NiKeyFrameController as NiStringExtraData blocks.
-			list<NiObjectRef> nodes = GetAllObjectsByType( root_block, NiNode::TypeConst() );
-			for ( list<NiObjectRef>::iterator it = nodes.begin(); it != nodes.end(); ) {
-				//TODO: Have Amorilia Fix this
-				/*if ( (*it)->GetAttr("Controller")->asLink().is_null() || (*it)->GetAttr("Controller")->asLink()->GetBlockType() != "NiKeyframeController" )
-					it = nodes.erase( it );
-				else
-					it++;*/
-			};
-			
-			NiObjectRef last_block = xkf_txtkey_block;
-			for ( list<NiObjectRef>::const_iterator it = nodes.begin(); it != nodes.end(); ++it ) {
-				NiObjectRef nodextra = CreateBlock("NiStringExtraData");
-				//TODO: Implement NiStringEtraData along with functions/member variables to cover these data items
-				//nodextra["String Data"] = (*it)["Name"]->asString();
-				//last_block["Next Extra Data"] = nodextra;
-				last_block = nodextra;
-			};
-			
-			// Add controllers & controller data.
-			last_block = xkf_root;
-			for ( list<NiObjectRef>::const_iterator it = nodes.begin(); it != nodes.end(); ++it ) {
-				//TODO:  Implement NiTimeController class functions/variables
-				//NiObjectRef controller = (*it)->GetAttr("Controller")->asLink();
-				//NiObjectRef xkf_controller = CreateBlock("NiKeyframeController");
-				//xkf_controller["Flags"] = controller["Flags"]->asInt();
-				//xkf_controller["Frequency"] = controller["Frequency"]->asFloat();
-				//xkf_controller["Phase"] = controller["Phase"]->asFloat();
-				//xkf_controller["Start Time"] = controller["Start Time"]->asFloat();
-				//xkf_controller["Stop Time"] = controller["Stop Time"]->asFloat();
-				//
-				//NiObjectRef xkf_data = CreateBlock("NiKeyframeData");
-				//xkf_controller["Data"] = xkf_data;
-				//IKeyframeData const *ikfdata = QueryKeyframeData(controller["Data"]->asLink());
-				//IKeyframeData *ixkfdata = QueryKeyframeData(xkf_data);
-				//ixkfdata->SetRotateType(ikfdata->GetRotateType());
-				//ixkfdata->SetTranslateType(ikfdata->GetTranslateType());
-				//ixkfdata->SetScaleType(ikfdata->GetScaleType());
-				//ixkfdata->SetRotateKeys(ikfdata->GetRotateKeys());
-				//ixkfdata->SetTranslateKeys(ikfdata->GetTranslateKeys());
-				//ixkfdata->SetScaleKeys(ikfdata->GetScaleKeys());
-	
-				//if ( last_block == xkf_root ) {
-				//	if ( ! last_block["Controller"]->asLink().is_null() )
-				//		throw runtime_error("Cannot create .kf file for multicontrolled nodes."); // not sure 'bout this one...
-				//	last_block["Controller"] = xkf_controller;
-				//} else {
-				//	if ( ! last_block["Next Controller"]->asLink().is_null() )
-				//		throw runtime_error("Cannot create .kf file for multicontrolled nodes."); // not sure 'bout this one...
-				//	last_block["Next Controller"] = xkf_controller;
-				//};
-				//last_block = xkf_controller;
-				//// note: targets are automatically calculated, we don't need to reset them
-			};
-		} else // TODO other games
-			throw runtime_error("Not yet implemented.");
-	} else {
-		// no animation groups: nothing to do
-		xnif_root = NULL;
-		xkf_root = NULL;
-	};
-}
+//void SplitNifTree( NiObjectRef const & root_block, NiObjectRef & xnif_root, NiObjectRef & xkf_root, Kfm & kfm, int kf_type ) {
+//	// Do we have animation groups (a NiTextKeyExtraData block)?
+//	// If so, create XNif and XKf trees.
+//	NiObjectRef txtkey_block = GetObjectByType( root_block, NiTextKeyExtraData::TypeConst() ); 
+//	if ( txtkey_block != NULL ) {
+//		if ( kf_type == KF_MW ) {
+//			// Construct the XNif file...
+//			// We are lazy. (TODO: clone & remove keyframe controllers & keyframe data)
+//			xnif_root = root_block;
+//			
+//			// Now the XKf file...
+//			// Create xkf root header.
+//			xkf_root = CreateBlock("NiSequenceStreamHelper");
+//			
+//			// Add a copy of the NiTextKeyExtraData block to the XKf header.
+//			NiObjectRef xkf_txtkey_block = CreateBlock("NiTextKeyExtraData");
+//			//TODO: Have Amorilia fix this
+//			//xkf_root["Extra Data"] = xkf_txtkey_block;
+//			
+//			/*ITextKeyExtraData const *itxtkey_block = QueryTextKeyExtraData(txtkey_block);
+//			ITextKeyExtraData *ixkf_txtkey_block = QueryTextKeyExtraData(xkf_txtkey_block);
+//			ixkf_txtkey_block->SetKeys(itxtkey_block->GetKeys());*/
+//			
+//			// Append NiNodes with a NiKeyFrameController as NiStringExtraData blocks.
+//			list<NiObjectRef> nodes = GetAllObjectsByType( root_block, NiNode::TypeConst() );
+//			for ( list<NiObjectRef>::iterator it = nodes.begin(); it != nodes.end(); ) {
+//				//TODO: Have Amorilia Fix this
+//				/*if ( (*it)->GetAttr("Controller")->asLink().is_null() || (*it)->GetAttr("Controller")->asLink()->GetBlockType() != "NiKeyframeController" )
+//					it = nodes.erase( it );
+//				else
+//					it++;*/
+//			};
+//			
+//			NiObjectRef last_block = xkf_txtkey_block;
+//			for ( list<NiObjectRef>::const_iterator it = nodes.begin(); it != nodes.end(); ++it ) {
+//				NiObjectRef nodextra = CreateBlock("NiStringExtraData");
+//				//TODO: Implement NiStringEtraData along with functions/member variables to cover these data items
+//				//nodextra["String Data"] = (*it)["Name"]->asString();
+//				//last_block["Next Extra Data"] = nodextra;
+//				last_block = nodextra;
+//			};
+//			
+//			// Add controllers & controller data.
+//			last_block = xkf_root;
+//			for ( list<NiObjectRef>::const_iterator it = nodes.begin(); it != nodes.end(); ++it ) {
+//				//TODO:  Implement NiTimeController class functions/variables
+//				//NiObjectRef controller = (*it)->GetAttr("Controller")->asLink();
+//				//NiObjectRef xkf_controller = CreateBlock("NiKeyframeController");
+//				//xkf_controller["Flags"] = controller["Flags"]->asInt();
+//				//xkf_controller["Frequency"] = controller["Frequency"]->asFloat();
+//				//xkf_controller["Phase"] = controller["Phase"]->asFloat();
+//				//xkf_controller["Start Time"] = controller["Start Time"]->asFloat();
+//				//xkf_controller["Stop Time"] = controller["Stop Time"]->asFloat();
+//				//
+//				//NiObjectRef xkf_data = CreateBlock("NiKeyframeData");
+//				//xkf_controller["Data"] = xkf_data;
+//				//IKeyframeData const *ikfdata = QueryKeyframeData(controller["Data"]->asLink());
+//				//IKeyframeData *ixkfdata = QueryKeyframeData(xkf_data);
+//				//ixkfdata->SetRotateType(ikfdata->GetRotateType());
+//				//ixkfdata->SetTranslateType(ikfdata->GetTranslateType());
+//				//ixkfdata->SetScaleType(ikfdata->GetScaleType());
+//				//ixkfdata->SetRotateKeys(ikfdata->GetRotateKeys());
+//				//ixkfdata->SetTranslateKeys(ikfdata->GetTranslateKeys());
+//				//ixkfdata->SetScaleKeys(ikfdata->GetScaleKeys());
+//	
+//				//if ( last_block == xkf_root ) {
+//				//	if ( ! last_block["Controller"]->asLink().is_null() )
+//				//		throw runtime_error("Cannot create .kf file for multicontrolled nodes."); // not sure 'bout this one...
+//				//	last_block["Controller"] = xkf_controller;
+//				//} else {
+//				//	if ( ! last_block["Next Controller"]->asLink().is_null() )
+//				//		throw runtime_error("Cannot create .kf file for multicontrolled nodes."); // not sure 'bout this one...
+//				//	last_block["Next Controller"] = xkf_controller;
+//				//};
+//				//last_block = xkf_controller;
+//				//// note: targets are automatically calculated, we don't need to reset them
+//			};
+//		} else // TODO other games
+//			throw runtime_error("Not yet implemented.");
+//	} else {
+//		// no animation groups: nothing to do
+//		xnif_root = NULL;
+//		xkf_root = NULL;
+//	};
+//}
 
-/*!
- * Helper function to split an animation tree into multiple animation trees (one per animation group) and a kfm block.
- * \param root_block The root block of the full tree.
- * \param kf Vector of root blocks of the new animation trees.
- */
-void SplitKfTree( NiObjectRef const & root_block, vector<NiObjectRef> & kf ) {
-	throw runtime_error("Not yet implemented.");
-};
+//TODO:  This was written by Amorilia.  Figure out how to fix it.
+///*!
+// * Helper function to split an animation tree into multiple animation trees (one per animation group) and a kfm block.
+// * \param root_block The root block of the full tree.
+// * \param kf Vector of root blocks of the new animation trees.
+// */
+//void SplitKfTree( NiObjectRef const & root_block, vector<NiObjectRef> & kf ) {
+//	throw runtime_error("Not yet implemented.");
+//};
 
-void WriteFileGroup( string const & file_name, NiObjectRef const & root_block, unsigned int version, unsigned int export_files, unsigned int kf_type ) {
-	// Get base filename.
-	uint file_name_slash = uint(file_name.rfind("\\") + 1);
-	string file_name_path = file_name.substr(0, file_name_slash);
-	string file_name_base = file_name.substr(file_name_slash, file_name.length());
-	uint file_name_dot = uint(file_name_base.rfind("."));
-	file_name_base = file_name_base.substr(0, file_name_dot);
-	
-	// Deal with the simple case first
-	if ( export_files == EXPORT_NIF )
-		WriteNifTree( file_name_path + file_name_base + ".nif", root_block, version ); // simply export the NIF file!
-	// Now consider all other cases
-	else if ( kf_type == KF_MW ) {
-		if ( export_files == EXPORT_NIF_KF ) {
-			// for Morrowind we must also write the full NIF file
-			WriteNifTree( file_name_path + file_name_base + ".nif", root_block, version ); // simply export the NIF file!
-			NiObjectRef xnif_root;
-			NiObjectRef xkf_root;
-			Kfm kfm; // dummy
-			SplitNifTree( root_block, xnif_root, xkf_root, kfm, KF_MW );
-			if ( xnif_root != NULL ) {
-				WriteNifTree( file_name_path + "x" + file_name_base + ".nif", xnif_root, version );
-				WriteNifTree( file_name_path + "x" + file_name_base + ".kf", xkf_root, version );
-			};
-		} else
-			throw runtime_error("Invalid export option.");
-	} else
-		throw runtime_error("Not yet implemented.");
-};
+//TODO:  This was written by Amorilia.  Figure out how to fix it.
+//void WriteFileGroup( string const & file_name, NiObjectRef const & root_block, unsigned int version, unsigned int export_files, unsigned int kf_type ) {
+//	// Get base filename.
+//	uint file_name_slash = uint(file_name.rfind("\\") + 1);
+//	string file_name_path = file_name.substr(0, file_name_slash);
+//	string file_name_base = file_name.substr(file_name_slash, file_name.length());
+//	uint file_name_dot = uint(file_name_base.rfind("."));
+//	file_name_base = file_name_base.substr(0, file_name_dot);
+//	
+//	// Deal with the simple case first
+//	if ( export_files == EXPORT_NIF )
+//		WriteNifTree( file_name_path + file_name_base + ".nif", root_block, version ); // simply export the NIF file!
+//	// Now consider all other cases
+//	else if ( kf_type == KF_MW ) {
+//		if ( export_files == EXPORT_NIF_KF ) {
+//			// for Morrowind we must also write the full NIF file
+//			WriteNifTree( file_name_path + file_name_base + ".nif", root_block, version ); // simply export the NIF file!
+//			NiObjectRef xnif_root;
+//			NiObjectRef xkf_root;
+//			Kfm kfm; // dummy
+//			SplitNifTree( root_block, xnif_root, xkf_root, kfm, KF_MW );
+//			if ( xnif_root != NULL ) {
+//				WriteNifTree( file_name_path + "x" + file_name_base + ".nif", xnif_root, version );
+//				WriteNifTree( file_name_path + "x" + file_name_base + ".kf", xkf_root, version );
+//			};
+//		} else
+//			throw runtime_error("Invalid export option.");
+//	} else
+//		throw runtime_error("Not yet implemented.");
+//};
 
 
 //Returns the total number of blocks in memory
diff --git a/niflib.h b/niflib.h
index aa861b2fdb1102a252035d0d03c1978b6c07b402..faecac065b7c5429c3ba75046ddb833fe83a95f7 100644
--- a/niflib.h
+++ b/niflib.h
@@ -54,10 +54,10 @@ POSSIBILITY OF SUCH DAMAGE. */
 #include "obj/NiNode.h"
 #include "obj/NiAVObject.h"
 //#include "gen/obj_defines.h"
-#include "kfm.h"
+//#include "kfm.h"
 
 using namespace std;
-namespace NifLib {
+namespace Niflib {
 
 #ifndef NULL
 #define NULL 0  /*!< Definition used to detect null pointers. */ 
@@ -180,16 +180,18 @@ NIFLIB_API void WriteNifTree( string const & file_name, NiObjectRef const & root
  */
 NIFLIB_API void WriteNifTree( ostream & stream, NiObjectRef const & root, unsigned int version = VER_4_0_0_2, unsigned int user_version = 0 );
 
-/*!
- * Writes a bunch of files given a base file name, and a pointer to the root block of the Nif file tree.
- * \param file_name The desired file name for the base NIF file. This name serves as the basis for the names of any Kf files and Kfm files as well.  The path is relative to the working directory unless a full path is specified.
- * \param root The root block to start from when writing out the NIF file.
- * \param version The version of the NIF format to use when writing a file.
- * \param export_files What files to write: NIF, NIF + KF + KFM, NIF + KF's + KFM, KF only, KF's only
- * \param kf_type The KF type (Morrowind style, DAoC style, CivIV style, ...)
- */
-NIFLIB_API void WriteFileGroup( string const & file_name, NiObjectRef const & root, unsigned int version, unsigned int export_files, unsigned int kf_type );
-
+//TODO:  This was written by Amorilia.  Figure out how to fix it.
+///*!
+// * Writes a bunch of files given a base file name, and a pointer to the root block of the Nif file tree.
+// * \param file_name The desired file name for the base NIF file. This name serves as the basis for the names of any Kf files and Kfm files as well.  The path is relative to the working directory unless a full path is specified.
+// * \param root The root block to start from when writing out the NIF file.
+// * \param version The version of the NIF format to use when writing a file.
+// * \param export_files What files to write: NIF, NIF + KF + KFM, NIF + KF's + KFM, KF only, KF's only
+// * \param kf_type The KF type (Morrowind style, DAoC style, CivIV style, ...)
+// */
+//NIFLIB_API void WriteFileGroup( string const & file_name, NiObjectRef const & root, unsigned int version, unsigned int export_files, unsigned int kf_type );
+
+//TODO:  Figure out how to fix this to work with the new system
 /*!
  * Merges two Nif trees into one.  For standard Nif files, any blocks with the same name are merged.  For Kf files, blocks are attatched to those that match the name specified in the KF root block.  The data stored in a NIF file varies from version to version.  Usually you are safe with the default option (the highest availiable version) but you may need to use an earlier version if you need to clone an obsolete piece of information.
  * \param target The root block of the first Nif tree to merge.
@@ -238,7 +240,7 @@ NIFLIB_API bool IsVersionSupported(unsigned int ver);
  */
 NIFLIB_API unsigned int GetVersion(string version);
 
-
+//TODO:  This is planned functionality but is unfinished
 //struct ComplexVertex {
 //	ComplexVertex() : has_color(false), has_normal(false), vertex_index(0), normal_index(0), color_index(0) {}
 //	~ComplexVertex();
diff --git a/obj/ABoneLODController.cpp b/obj/ABoneLODController.cpp
index 04f2b14b7c52ab63660edcfcb1e45b10133aae36..a2d55ae591e9ecf11c0467c9effbf08e5778e050 100644
--- a/obj/ABoneLODController.cpp
+++ b/obj/ABoneLODController.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "ABoneLODController.h"
 #include "../gen/NodeGroup.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type ABoneLODController::TYPE("ABoneLODController", &A_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/ABoneLODController.h b/obj/ABoneLODController.h
index 68bf24a150b7cf63b57c62dcfb9c5cf9c80fc1cb..13d41dc75d83bbe678cbc74d27b11a0ed737f2c3 100644
--- a/obj/ABoneLODController.h
+++ b/obj/ABoneLODController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/NodeGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/AKeyedData.cpp b/obj/AKeyedData.cpp
index e82e0b6e75a82a705656ded2de7b9fa303fee5d2..c85cfbf6f2eb2522bdde866efbe762be36439f8c 100644
--- a/obj/AKeyedData.cpp
+++ b/obj/AKeyedData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "AKeyedData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type AKeyedData::TYPE("AKeyedData", &A_KEYED_DATA_PARENT::TypeConst() );
diff --git a/obj/AKeyedData.h b/obj/AKeyedData.h
index c3c1cc4d38fe99fa3fd2d126c5e6147190b0453b..f5de967126eefb8a64aea556ecf22f448e893b0e 100644
--- a/obj/AKeyedData.h
+++ b/obj/AKeyedData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _AKEYEDDATA_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/APSysCtlr.cpp b/obj/APSysCtlr.cpp
index 7f9219935a2f6c8b49d0ce2495d870a37135a5ec..a5874b11b51129e5a053b7f5696c2be6de911c53 100644
--- a/obj/APSysCtlr.cpp
+++ b/obj/APSysCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type APSysCtlr::TYPE("APSysCtlr", &A_P_SYS_CTLR_PARENT::TypeConst() );
diff --git a/obj/APSysCtlr.h b/obj/APSysCtlr.h
index 1d6209ea3bef08050c42d0851d30d0a0ff76195a..428114f37749857f78bcfdd8c6f0a8dd0e762023 100644
--- a/obj/APSysCtlr.h
+++ b/obj/APSysCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _APSYSCTLR_H_
 
 #include "NiSingleInterpolatorController.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/APSysData.cpp b/obj/APSysData.cpp
index 6d5f5630e00ae0267c4fc9e7b8e0ca66525905d1..d9f09ff58fa02ccf4beae7010e8942d8939515d5 100644
--- a/obj/APSysData.cpp
+++ b/obj/APSysData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "APSysData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type APSysData::TYPE("APSysData", &A_P_SYS_DATA_PARENT::TypeConst() );
diff --git a/obj/APSysData.h b/obj/APSysData.h
index 9fa50ae4543068bd88fd90d5e47fa8c862879946..577177776cf85b21bfbceb0b221132b785aad1a4 100644
--- a/obj/APSysData.h
+++ b/obj/APSysData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _APSYSDATA_H_
 
 #include "NiTriBasedGeomData.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/AParticleModifier.cpp b/obj/AParticleModifier.cpp
index 83809028af85578e6a398d4bf4ba4e71e4399e96..7fa23b95b802040419679e0a15aa808f00513cb7 100644
--- a/obj/AParticleModifier.cpp
+++ b/obj/AParticleModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AParticleModifier.h"
 #include "NiParticleSystemController.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type AParticleModifier::TYPE("AParticleModifier", &A_PARTICLE_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/AParticleModifier.h b/obj/AParticleModifier.h
index 2284bafec3fb5a9accc981807f2c3f2c774343d5..4f0e8ec936c7965ad941fee7aed357da7dfa3518 100644
--- a/obj/AParticleModifier.h
+++ b/obj/AParticleModifier.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiParticleSystemController;
diff --git a/obj/AbhkConstraint.cpp b/obj/AbhkConstraint.cpp
index cee306e0ee0b23f7e55a00c75f0d9b9449e556c5..9b0b72b29d149644ebcff65fa41d727c81ddd9b0 100644
--- a/obj/AbhkConstraint.cpp
+++ b/obj/AbhkConstraint.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkConstraint.h"
 #include "bhkShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type AbhkConstraint::TYPE("AbhkConstraint", &ABHK_CONSTRAINT_PARENT::TypeConst() );
diff --git a/obj/AbhkConstraint.h b/obj/AbhkConstraint.h
index d506d6e1a3a379166a1119ddb4f7c1252d6c8594..88349b6b813dd17cf6fd425aa09742c3287677fe 100644
--- a/obj/AbhkConstraint.h
+++ b/obj/AbhkConstraint.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _ABHKCONSTRAINT_H_
 
 #include "bhkSerializable.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class bhkShape;
diff --git a/obj/AbhkRagdollConstraint.cpp b/obj/AbhkRagdollConstraint.cpp
index 74e93679542520e0579d0ee0fd6b4b9c33b49c9f..3a5578efd0511b79cce8fee330502cea3838b848 100644
--- a/obj/AbhkRagdollConstraint.cpp
+++ b/obj/AbhkRagdollConstraint.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkRagdollConstraint.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type AbhkRagdollConstraint::TYPE("AbhkRagdollConstraint", &ABHK_RAGDOLL_CONSTRAINT_PARENT::TypeConst() );
diff --git a/obj/AbhkRagdollConstraint.h b/obj/AbhkRagdollConstraint.h
index 467939a184dbcd6ea5bf48aa8901301143c474aa..c81cc70971dc142b0c47fdabc34372bda87ad20d 100644
--- a/obj/AbhkRagdollConstraint.h
+++ b/obj/AbhkRagdollConstraint.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _ABHKRAGDOLLCONSTRAINT_H_
 
 #include "AbhkConstraint.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/AbhkShapeCollection.cpp b/obj/AbhkShapeCollection.cpp
index 6a3055976c98cf66591990d12d7a0cad0383cc21..723ff37ba3266ebd9070c1af24ef7a1c4d51f1e1 100644
--- a/obj/AbhkShapeCollection.cpp
+++ b/obj/AbhkShapeCollection.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "AbhkShapeCollection.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type AbhkShapeCollection::TYPE("AbhkShapeCollection", &ABHK_SHAPE_COLLECTION_PARENT::TypeConst() );
diff --git a/obj/AbhkShapeCollection.h b/obj/AbhkShapeCollection.h
index d5b8e916f0ad3c6e84b6bf57a106d827fdc646f7..b45f0a9b2c67c8e2de107ef3f4c46fb5c5f5fcb6 100644
--- a/obj/AbhkShapeCollection.h
+++ b/obj/AbhkShapeCollection.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _ABHKSHAPECOLLECTION_H_
 
 #include "bhkShape.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/AvoidNode.cpp b/obj/AvoidNode.cpp
index fc6ae11c389bae90198bb9937a4aa80d368142a2..4ba8165ede1b271a795d325d4aa76aca8ad25f7d 100644
--- a/obj/AvoidNode.cpp
+++ b/obj/AvoidNode.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "AvoidNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type AvoidNode::TYPE("AvoidNode", &AVOID_NODE_PARENT::TypeConst() );
diff --git a/obj/AvoidNode.h b/obj/AvoidNode.h
index f1804a76527037f4a1fe12ccaf2ebb52e4271b6d..908eb9b3302578ecc53221e3e09dfd7ce1912ece 100644
--- a/obj/AvoidNode.h
+++ b/obj/AvoidNode.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _AVOIDNODE_H_
 
 #include "NiNode.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/BSBound.cpp b/obj/BSBound.cpp
index bcaacabfeed8c05addca9cd2a5e465e3f002e6f4..4b3e2f894d72d32fa3fe8055cb4de83f2bc576b0 100644
--- a/obj/BSBound.cpp
+++ b/obj/BSBound.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "BSBound.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type BSBound::TYPE("BSBound", &B_S_BOUND_PARENT::TypeConst() );
diff --git a/obj/BSBound.h b/obj/BSBound.h
index 7756eb8214180035ed8c7cb6daae2a3e67010b73..8c318e31ddb21d885b3ed32a7cc25e1272346ec5 100644
--- a/obj/BSBound.h
+++ b/obj/BSBound.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BSBOUND_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/BSFurnitureMarker.cpp b/obj/BSFurnitureMarker.cpp
index 732aadeda306d45a8a8c7b0eef1ed1f13fe0ae2e..f0c4fd9e5e519a3ca2e64120bc969c5fa505a18f 100644
--- a/obj/BSFurnitureMarker.cpp
+++ b/obj/BSFurnitureMarker.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "BSFurnitureMarker.h"
 #include "../gen/FurniturePosition.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type BSFurnitureMarker::TYPE("BSFurnitureMarker", &B_S_FURNITURE_MARKER_PARENT::TypeConst() );
diff --git a/obj/BSFurnitureMarker.h b/obj/BSFurnitureMarker.h
index 8cd7ecaf749991c513f359182257fc0ced5aefe8..1784abcf2af4a26d2095502455419eff0b121828 100644
--- a/obj/BSFurnitureMarker.h
+++ b/obj/BSFurnitureMarker.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/FurniturePosition.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/BSKeyframeController.cpp b/obj/BSKeyframeController.cpp
index 3ba64ef8cfa3ea42837e3059c66c1d77ed5cca7e..0a88a4d6bd5505853d1c6442d7382272e6a0b852 100644
--- a/obj/BSKeyframeController.cpp
+++ b/obj/BSKeyframeController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "BSKeyframeController.h"
 #include "NiKeyframeData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type BSKeyframeController::TYPE("BSKeyframeController", &B_S_KEYFRAME_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/BSKeyframeController.h b/obj/BSKeyframeController.h
index ea096a392196fe200c9f1785fa09a227d2b11f8e..18781c5e447b9ec549cd48a05b30fd871fc763d6 100644
--- a/obj/BSKeyframeController.h
+++ b/obj/BSKeyframeController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiKeyframeData;
diff --git a/obj/BSPSysArrayEmitter.cpp b/obj/BSPSysArrayEmitter.cpp
index dabd8ffb408a5a299c909c02e50b035f3e879e8f..e09b57011dfcbcc91edab8184415c38742b4fade 100644
--- a/obj/BSPSysArrayEmitter.cpp
+++ b/obj/BSPSysArrayEmitter.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "BSPSysArrayEmitter.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type BSPSysArrayEmitter::TYPE("BSPSysArrayEmitter", &B_S_P_SYS_ARRAY_EMITTER_PARENT::TypeConst() );
diff --git a/obj/BSPSysArrayEmitter.h b/obj/BSPSysArrayEmitter.h
index ff5142da745986d9e4b91fcecb0032b3c7680082..be6cb4bf4c706f6715ddddcb5d8ac384a2378e29 100644
--- a/obj/BSPSysArrayEmitter.h
+++ b/obj/BSPSysArrayEmitter.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BSPSYSARRAYEMITTER_H_
 
 #include "NiPSysVolumeEmitter.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/BSParentVelocityModifier.cpp b/obj/BSParentVelocityModifier.cpp
index 2008cd80e5c5f64b68a8a77518858f3db7482730..8a95f2160c6cd7f42f73efb3a3eb4f78d88f5c06 100644
--- a/obj/BSParentVelocityModifier.cpp
+++ b/obj/BSParentVelocityModifier.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "BSParentVelocityModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type BSParentVelocityModifier::TYPE("BSParentVelocityModifier", &B_S_PARENT_VELOCITY_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/BSParentVelocityModifier.h b/obj/BSParentVelocityModifier.h
index 1e09728ba2116c9bbfd0f2b9af124f5de079c1a4..0fe839bfc73ec2927da4267ec47fe875aade9a2d 100644
--- a/obj/BSParentVelocityModifier.h
+++ b/obj/BSParentVelocityModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BSPARENTVELOCITYMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/BSXFlags.cpp b/obj/BSXFlags.cpp
index d372e030eab961ef5100cf4a125f638779c728b5..a6a32bf03612b09f1922d5e634e718df28016a44 100644
--- a/obj/BSXFlags.cpp
+++ b/obj/BSXFlags.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "BSXFlags.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type BSXFlags::TYPE("BSXFlags", &B_S_X_FLAGS_PARENT::TypeConst() );
diff --git a/obj/BSXFlags.h b/obj/BSXFlags.h
index 6607b9eda64b9c67058a892e73a23b899c25ae71..7d0bebe1c9a248c9a0dfb333d7504e1982e6c508 100644
--- a/obj/BSXFlags.h
+++ b/obj/BSXFlags.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BSXFLAGS_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/FxButton.cpp b/obj/FxButton.cpp
index d6bca43b44f889217eb06076a4fe7a41b30ca2bf..761bbc1d55bc61a543883e29d0171f206a8c7324 100644
--- a/obj/FxButton.cpp
+++ b/obj/FxButton.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "FxButton.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type FxButton::TYPE("FxButton", &FX_BUTTON_PARENT::TypeConst() );
diff --git a/obj/FxButton.h b/obj/FxButton.h
index b33f98a9eb81d95e4f46da0fce24ba051db35e0d..6759d48cfed8ee707adc40fe4bad6ae720d43242 100644
--- a/obj/FxButton.h
+++ b/obj/FxButton.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _FXBUTTON_H_
 
 #include "FxWidget.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/FxRadioButton.cpp b/obj/FxRadioButton.cpp
index abd48ef5635637c9ad14fd1273c485b1efb15af4..ff5cbebf92034be92d3ecb09ad69ab6d6a7ed86d 100644
--- a/obj/FxRadioButton.cpp
+++ b/obj/FxRadioButton.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "FxRadioButton.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type FxRadioButton::TYPE("FxRadioButton", &FX_RADIO_BUTTON_PARENT::TypeConst() );
diff --git a/obj/FxRadioButton.h b/obj/FxRadioButton.h
index db515e8d12516abcf4ed6fe1e867f031f5344f57..82c1084c993d79cea0c6e923fabbf89b28113f1d 100644
--- a/obj/FxRadioButton.h
+++ b/obj/FxRadioButton.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/obj/FxWidget.cpp b/obj/FxWidget.cpp
index 8c6564f7ad70588313a1ccf76c8689c212bc71ff..a07b05b3536b1383382cfc79b55db3cc9f324de1 100644
--- a/obj/FxWidget.cpp
+++ b/obj/FxWidget.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "FxWidget.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type FxWidget::TYPE("FxWidget", &FX_WIDGET_PARENT::TypeConst() );
diff --git a/obj/FxWidget.h b/obj/FxWidget.h
index 6f9077e9422f4736c8d639c4ac8a899abb4fe59a..8808c1ed45e8944e4ba2db09e67656bf51ff7de9 100644
--- a/obj/FxWidget.h
+++ b/obj/FxWidget.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _FXWIDGET_H_
 
 #include "NiNode.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiAVObject.cpp b/obj/NiAVObject.cpp
index 66df202db205e381f8237173e6238532be87a7a8..b5df531fc39a0f0efc5d60a8943f6203ca2a6aa9 100644
--- a/obj/NiAVObject.cpp
+++ b/obj/NiAVObject.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiProperty.h"
 #include "NiCollisionData.h"
 #include "NiCollisionObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiAVObject::TYPE("NiAVObject", &NI_A_V_OBJECT_PARENT::TypeConst() );
diff --git a/obj/NiAVObject.h b/obj/NiAVObject.h
index d0a1723a9f0993a29d0e193978bd17f72aae8556..1849750e57e6e0993088171a4b4eec75d94bb09a 100644
--- a/obj/NiAVObject.h
+++ b/obj/NiAVObject.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../gen/BoundingBox.h"
 #include "../gen/obj_defines.h"
 #include NI_A_V_OBJECT_INCLUDE
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiProperty;
diff --git a/obj/NiAlphaController.cpp b/obj/NiAlphaController.cpp
index e9f16f01d6d3c7578ddf08e636d499d8f0c4f38e..b05637deb4b1c042acf8ef929388d49842f3549c 100644
--- a/obj/NiAlphaController.cpp
+++ b/obj/NiAlphaController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiAlphaController.h"
 #include "NiFloatData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiAlphaController::TYPE("NiAlphaController", &NI_ALPHA_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiAlphaController.h b/obj/NiAlphaController.h
index e406314a1b2a8332ebf0454b8acfc44ffc6d2f6a..0f9ac268d9e3ea95d0d05607fdad699890c571a0 100644
--- a/obj/NiAlphaController.h
+++ b/obj/NiAlphaController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiFloatData;
diff --git a/obj/NiAlphaProperty.cpp b/obj/NiAlphaProperty.cpp
index d86a605c58b865d175a6bcd645f78a20820df9c5..b8b3c7215c0a426725c8f034555c119d0a89ad4c 100644
--- a/obj/NiAlphaProperty.cpp
+++ b/obj/NiAlphaProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiAlphaProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiAlphaProperty::TYPE("NiAlphaProperty", &NI_ALPHA_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiAlphaProperty.h b/obj/NiAlphaProperty.h
index 9f65030294b042e0661d3174a5d88b0878c2ce61..6780ede1e20b3ef2da3087837742911d3fbb86be 100644
--- a/obj/NiAlphaProperty.h
+++ b/obj/NiAlphaProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIALPHAPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiAmbientLight.cpp b/obj/NiAmbientLight.cpp
index 7758d2c7a17eff460d6f6ecdce4dafe76084f88c..af9ff5a7f4697c86c10d4d8c1c6796623b70b472 100644
--- a/obj/NiAmbientLight.cpp
+++ b/obj/NiAmbientLight.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiAmbientLight.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiAmbientLight::TYPE("NiAmbientLight", &NI_AMBIENT_LIGHT_PARENT::TypeConst() );
diff --git a/obj/NiAmbientLight.h b/obj/NiAmbientLight.h
index a822b02a6e88a0181aa551213f3cb31e0135946f..7cbbd5feb971356293c7aebd1e9241f255cc2896 100644
--- a/obj/NiAmbientLight.h
+++ b/obj/NiAmbientLight.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIAMBIENTLIGHT_H_
 
 #include "NiLight.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiAutoNormalParticles.cpp b/obj/NiAutoNormalParticles.cpp
index f3579b4cda553075c71d53c78cbf279b63c8bad5..d1c25823dd044900df9d65a66f3b28575f3859c7 100644
--- a/obj/NiAutoNormalParticles.cpp
+++ b/obj/NiAutoNormalParticles.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiAutoNormalParticles.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiAutoNormalParticles::TYPE("NiAutoNormalParticles", &NI_AUTO_NORMAL_PARTICLES_PARENT::TypeConst() );
diff --git a/obj/NiAutoNormalParticles.h b/obj/NiAutoNormalParticles.h
index 5e420d30c60021453e8a74ee6c5fb3a4ebdbe688..d5d180690040f35651b901f087e4248680fdd402 100644
--- a/obj/NiAutoNormalParticles.h
+++ b/obj/NiAutoNormalParticles.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIAUTONORMALPARTICLES_H_
 
 #include "NiParticles.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiAutoNormalParticlesData.cpp b/obj/NiAutoNormalParticlesData.cpp
index 45aded21911932eae2f6c56f6418aea0c38b8b07..cd795233d277c45d2cc4fe3204fda38ee95e49ec 100644
--- a/obj/NiAutoNormalParticlesData.cpp
+++ b/obj/NiAutoNormalParticlesData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiAutoNormalParticlesData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiAutoNormalParticlesData::TYPE("NiAutoNormalParticlesData", &NI_AUTO_NORMAL_PARTICLES_DATA_PARENT::TypeConst() );
diff --git a/obj/NiAutoNormalParticlesData.h b/obj/NiAutoNormalParticlesData.h
index 34ae640b0e21580da81fb1e45a96dc0e6831e940..ef93fe2c0c3e58f1049b174bc1fb17c7938de462 100644
--- a/obj/NiAutoNormalParticlesData.h
+++ b/obj/NiAutoNormalParticlesData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIAUTONORMALPARTICLESDATA_H_
 
 #include "NiTriBasedGeomData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiBSAnimationNode.cpp b/obj/NiBSAnimationNode.cpp
index e1012acac48aa912ab922fcccb74e5f1f9ac59b3..815a96d54d3c82c682074c0a9b510471ffcdc4a8 100644
--- a/obj/NiBSAnimationNode.cpp
+++ b/obj/NiBSAnimationNode.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSAnimationNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSAnimationNode::TYPE("NiBSAnimationNode", &NI_B_S_ANIMATION_NODE_PARENT::TypeConst() );
diff --git a/obj/NiBSAnimationNode.h b/obj/NiBSAnimationNode.h
index 3f3fa9bb4f2cea4e912f372f157f7a7a7103e6ab..46be0bf571e1744f69738978c0d00a908ab358db 100644
--- a/obj/NiBSAnimationNode.h
+++ b/obj/NiBSAnimationNode.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBSANIMATIONNODE_H_
 
 #include "NiNode.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBSBoneLODController.cpp b/obj/NiBSBoneLODController.cpp
index aa108132e180f921c214bff2f1bf29b034fe1b82..7a95326980ea976c337a1865a53b9245ca6f0fb8 100644
--- a/obj/NiBSBoneLODController.cpp
+++ b/obj/NiBSBoneLODController.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSBoneLODController.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSBoneLODController::TYPE("NiBSBoneLODController", &NI_B_S_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiBSBoneLODController.h b/obj/NiBSBoneLODController.h
index c77092ef43979b2306e7d35ee77619a1f2b3930e..a9e77fd6cfcdcfdf23ce7897a2d5adcebbd9059b 100644
--- a/obj/NiBSBoneLODController.h
+++ b/obj/NiBSBoneLODController.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBSBONELODCONTROLLER_H_
 
 #include "ABoneLODController.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBSPArrayController.cpp b/obj/NiBSPArrayController.cpp
index d469cc051b6cb5a2e612f8ffb2ba559f2f67a9c3..a1a2df754633ce57196ec5beb41b0fa73b1a6daa 100644
--- a/obj/NiBSPArrayController.cpp
+++ b/obj/NiBSPArrayController.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSPArrayController.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSPArrayController::TYPE("NiBSPArrayController", &NI_B_S_P_ARRAY_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiBSPArrayController.h b/obj/NiBSPArrayController.h
index a48cd05cc054c64dbe2752675012051dfe33f2a1..21f06db0cfefeb18f850bb34551c518b9772c64f 100644
--- a/obj/NiBSPArrayController.h
+++ b/obj/NiBSPArrayController.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBSPARRAYCONTROLLER_H_
 
 #include "NiParticleSystemController.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBSParticleNode.cpp b/obj/NiBSParticleNode.cpp
index b740cf7d06c037bd27855964c310eb10aa4cb696..319711cb3f6d5c73cca87750f5d8746df00c1e10 100644
--- a/obj/NiBSParticleNode.cpp
+++ b/obj/NiBSParticleNode.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSParticleNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSParticleNode::TYPE("NiBSParticleNode", &NI_B_S_PARTICLE_NODE_PARENT::TypeConst() );
diff --git a/obj/NiBSParticleNode.h b/obj/NiBSParticleNode.h
index 9cb8d1c29efd903f3998d1bef2a236cc130daee4..f59b29bbe0aea6864105ff9ff68fc76827842913 100644
--- a/obj/NiBSParticleNode.h
+++ b/obj/NiBSParticleNode.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBSPARTICLENODE_H_
 
 #include "NiNode.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBSplineBasisData.cpp b/obj/NiBSplineBasisData.cpp
index fc5e83f52501447526fc961f8f03c0e0de183673..d3af49cbda07551dc6366ade2499d4169b2b1f73 100644
--- a/obj/NiBSplineBasisData.cpp
+++ b/obj/NiBSplineBasisData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSplineBasisData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSplineBasisData::TYPE("NiBSplineBasisData", &NI_B_SPLINE_BASIS_DATA_PARENT::TypeConst() );
diff --git a/obj/NiBSplineBasisData.h b/obj/NiBSplineBasisData.h
index f30f5d56000c0804aa274bf1e2b26be7f4ed7be8..ee99bff4958f548ce95bea93646c38ea32888c64 100644
--- a/obj/NiBSplineBasisData.h
+++ b/obj/NiBSplineBasisData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBSPLINEBASISDATA_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBSplineCompFloatInterpolator.cpp b/obj/NiBSplineCompFloatInterpolator.cpp
index d30421f78aa7bde5892379cded657cb7f62cf96d..abe1fa6eb971d8476f0d319877d989578692f9ee 100644
--- a/obj/NiBSplineCompFloatInterpolator.cpp
+++ b/obj/NiBSplineCompFloatInterpolator.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSplineCompFloatInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSplineCompFloatInterpolator::TYPE("NiBSplineCompFloatInterpolator", &NI_B_SPLINE_COMP_FLOAT_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBSplineCompFloatInterpolator.h b/obj/NiBSplineCompFloatInterpolator.h
index a6b02d7bdacb0426fc05c8af809bd2498e24f442..0308d7fdae1f4ffebe012ca8e9a66074f642f824 100644
--- a/obj/NiBSplineCompFloatInterpolator.h
+++ b/obj/NiBSplineCompFloatInterpolator.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBSPLINECOMPFLOATINTERPOLATOR_H_
 
 #include "NiBSplineInterpolator.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBSplineCompPoint3Interpolator.cpp b/obj/NiBSplineCompPoint3Interpolator.cpp
index b9f056df8c9e8ab9a371b963300722765948d303..8306991af1fd1db8ef4a47880724e5815e103cc4 100644
--- a/obj/NiBSplineCompPoint3Interpolator.cpp
+++ b/obj/NiBSplineCompPoint3Interpolator.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiBSplineCompPoint3Interpolator.h"
 #include "NiBSplineData.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSplineCompPoint3Interpolator::TYPE("NiBSplineCompPoint3Interpolator", &NI_B_SPLINE_COMP_POINT3_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBSplineCompPoint3Interpolator.h b/obj/NiBSplineCompPoint3Interpolator.h
index c7516f88c5dd325b3e1b46eb20bc3a7adeb7f893..0c45a30d9603c3f54054f4de063d587a4af0a039 100644
--- a/obj/NiBSplineCompPoint3Interpolator.h
+++ b/obj/NiBSplineCompPoint3Interpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiBSplineData;
diff --git a/obj/NiBSplineCompTransformInterpolator.cpp b/obj/NiBSplineCompTransformInterpolator.cpp
index 83148da5d32a5cd9acd4c34d30f674dee9a75eda..89ad7c040959621a465b6098791af54927a87f7e 100644
--- a/obj/NiBSplineCompTransformInterpolator.cpp
+++ b/obj/NiBSplineCompTransformInterpolator.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiBSplineCompTransformInterpolator.h"
 #include "NiBSplineData.h"
 #include "NiBSplineBasisData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSplineCompTransformInterpolator::TYPE("NiBSplineCompTransformInterpolator", &NI_B_SPLINE_COMP_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBSplineCompTransformInterpolator.h b/obj/NiBSplineCompTransformInterpolator.h
index bdc5d3a7e9b45fe7f3e83ff1832cbc65098821ac..a39de11be15b1d49c91b56237ec4b408e7c50695 100644
--- a/obj/NiBSplineCompTransformInterpolator.h
+++ b/obj/NiBSplineCompTransformInterpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiBSplineData;
diff --git a/obj/NiBSplineData.cpp b/obj/NiBSplineData.cpp
index 0ac937f82363e97cbe16f30c72984b883792dda7..9f6decdea2a2b73d60d259025cc571d482a062a9 100644
--- a/obj/NiBSplineData.cpp
+++ b/obj/NiBSplineData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSplineData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSplineData::TYPE("NiBSplineData", &NI_B_SPLINE_DATA_PARENT::TypeConst() );
diff --git a/obj/NiBSplineData.h b/obj/NiBSplineData.h
index 109bbf55c215e51a01a57ffd80c6bdea94eec1d8..1d8bfa4d908ec2bc30ff3cb06cbcf65d44d3f93e 100644
--- a/obj/NiBSplineData.h
+++ b/obj/NiBSplineData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBSPLINEDATA_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBSplineInterpolator.cpp b/obj/NiBSplineInterpolator.cpp
index 4b00e6d4e4863c3d3c36f63e034f69b8ba73e2cf..029c4195984602562a76262f15f5424fa49a68fb 100644
--- a/obj/NiBSplineInterpolator.cpp
+++ b/obj/NiBSplineInterpolator.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBSplineInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBSplineInterpolator::TYPE("NiBSplineInterpolator", &NI_B_SPLINE_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBSplineInterpolator.h b/obj/NiBSplineInterpolator.h
index 3961d3e4e08cc54831bb203dbcb0122150dbc80f..523ffa5ff38f5e76429ee12c43cb99dae56c616e 100644
--- a/obj/NiBSplineInterpolator.h
+++ b/obj/NiBSplineInterpolator.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBSPLINEINTERPOLATOR_H_
 
 #include "NiInterpolator.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiBillboardNode.cpp b/obj/NiBillboardNode.cpp
index 93a16e95bbe2971ae23c5222aed476a892666fe7..860aec54654f70a07898565b8efff6dba390c1c3 100644
--- a/obj/NiBillboardNode.cpp
+++ b/obj/NiBillboardNode.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBillboardNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBillboardNode::TYPE("NiBillboardNode", &NI_BILLBOARD_NODE_PARENT::TypeConst() );
diff --git a/obj/NiBillboardNode.h b/obj/NiBillboardNode.h
index acf7d90d24d09899c1cd604d10151e6bc4da13c7..ddda835f382571afef0bcf5a84bccfd12b41f70e 100644
--- a/obj/NiBillboardNode.h
+++ b/obj/NiBillboardNode.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBILLBOARDNODE_H_
 
 #include "NiNode.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiBinaryExtraData.cpp b/obj/NiBinaryExtraData.cpp
index 7f541a88569ededbd536d9076d21ea583e82c7a9..3ac3982e17ecb3d74afdfbf81d45470754830f1e 100644
--- a/obj/NiBinaryExtraData.cpp
+++ b/obj/NiBinaryExtraData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBinaryExtraData.h"
 #include "../gen/ByteArray.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBinaryExtraData::TYPE("NiBinaryExtraData", &NI_BINARY_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiBinaryExtraData.h b/obj/NiBinaryExtraData.h
index 24aaff0ed9cc4dbb88ba2ddce73685c094f2edba..d941b6e030d60f25a7bc77d80c471b4c60c3d1c4 100644
--- a/obj/NiBinaryExtraData.h
+++ b/obj/NiBinaryExtraData.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiExtraData.h"
 // Include structures
 #include "../gen/ByteArray.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBlendBoolInterpolator.cpp b/obj/NiBlendBoolInterpolator.cpp
index e38539676c6a3dd62733287eb21616550bfce30c..3d5c9ddfb2697e347d2e120889be24120b8eb1f8 100644
--- a/obj/NiBlendBoolInterpolator.cpp
+++ b/obj/NiBlendBoolInterpolator.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendBoolInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBlendBoolInterpolator::TYPE("NiBlendBoolInterpolator", &NI_BLEND_BOOL_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBlendBoolInterpolator.h b/obj/NiBlendBoolInterpolator.h
index f248236cd75863514b0d921128b64026ed051ab9..96472fa6a8f3c8563ed8fb43e629ef35594cfeeb 100644
--- a/obj/NiBlendBoolInterpolator.h
+++ b/obj/NiBlendBoolInterpolator.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBLENDBOOLINTERPOLATOR_H_
 
 #include "NiBlendInterpolator.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiBlendFloatInterpolator.cpp b/obj/NiBlendFloatInterpolator.cpp
index 68b858da8ae9c5688793d1471ad188394a1436be..c59b1d07a99fbda3f7e6cfab69138ba5e794d5ad 100644
--- a/obj/NiBlendFloatInterpolator.cpp
+++ b/obj/NiBlendFloatInterpolator.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendFloatInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBlendFloatInterpolator::TYPE("NiBlendFloatInterpolator", &NI_BLEND_FLOAT_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBlendFloatInterpolator.h b/obj/NiBlendFloatInterpolator.h
index c06a9b71f57cbbc53a90da7b9899bf7c8e5f34f9..9ad6919189078da8dc33a592ce21d997698b77db 100644
--- a/obj/NiBlendFloatInterpolator.h
+++ b/obj/NiBlendFloatInterpolator.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBLENDFLOATINTERPOLATOR_H_
 
 #include "NiBlendInterpolator.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiBlendInterpolator.cpp b/obj/NiBlendInterpolator.cpp
index b273cfb2cc7ffe28af22dec88664e339bb4beda1..38a796fc217ce40a5a11ab79983c64b47bd2c9c5 100644
--- a/obj/NiBlendInterpolator.cpp
+++ b/obj/NiBlendInterpolator.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBlendInterpolator::TYPE("NiBlendInterpolator", &NI_BLEND_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBlendInterpolator.h b/obj/NiBlendInterpolator.h
index f17b9fa5a971cce098f2657bba3d86be6ab9003c..e7d08a48f004a48bd525dce5d2412f910f1e3948 100644
--- a/obj/NiBlendInterpolator.h
+++ b/obj/NiBlendInterpolator.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBLENDINTERPOLATOR_H_
 
 #include "NiInterpolator.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBlendPoint3Interpolator.cpp b/obj/NiBlendPoint3Interpolator.cpp
index 1f357b587d0109c2e5dfbc41b18c631811668d61..4b506d848ddca12a7792282fb2aa12e84577f11a 100644
--- a/obj/NiBlendPoint3Interpolator.cpp
+++ b/obj/NiBlendPoint3Interpolator.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendPoint3Interpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBlendPoint3Interpolator::TYPE("NiBlendPoint3Interpolator", &NI_BLEND_POINT3_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBlendPoint3Interpolator.h b/obj/NiBlendPoint3Interpolator.h
index 3c4de36b0532ef971ee48f5e65c32741fed08d27..68f88f0c0365dccb2fee2b516e41efe51400ed34 100644
--- a/obj/NiBlendPoint3Interpolator.h
+++ b/obj/NiBlendPoint3Interpolator.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBLENDPOINT3INTERPOLATOR_H_
 
 #include "NiBlendInterpolator.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiBlendTransformInterpolator.cpp b/obj/NiBlendTransformInterpolator.cpp
index 5728d994f60f621b98a0d053d51332592872d32c..888e6fbf551d0552101a8eae8fa525d034398045 100644
--- a/obj/NiBlendTransformInterpolator.cpp
+++ b/obj/NiBlendTransformInterpolator.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBlendTransformInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBlendTransformInterpolator::TYPE("NiBlendTransformInterpolator", &NI_BLEND_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBlendTransformInterpolator.h b/obj/NiBlendTransformInterpolator.h
index d39fc7039d5b33f0c5f93b7c46400722350fee90..6915e53277d0cf8b5cb7895f2ba6da9193aaba9b 100644
--- a/obj/NiBlendTransformInterpolator.h
+++ b/obj/NiBlendTransformInterpolator.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBLENDTRANSFORMINTERPOLATOR_H_
 
 #include "NiBlendInterpolator.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBoneLODController.cpp b/obj/NiBoneLODController.cpp
index c15dd13a7b0561ee841633a9bb6d65ce4bad250b..8f25c4d11dd9fe3a670ab46b4eae1f4de232b3de 100644
--- a/obj/NiBoneLODController.cpp
+++ b/obj/NiBoneLODController.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTriShape.h"
 #include "NiSkinInstance.h"
 #include "NiTriShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBoneLODController::TYPE("NiBoneLODController", &NI_BONE_L_O_D_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiBoneLODController.h b/obj/NiBoneLODController.h
index 865d6e8e149b5150917e516cab648db9e022cfe0..8c8fdc9baa295334dfc5fa6ce7244eef2f276cfa 100644
--- a/obj/NiBoneLODController.h
+++ b/obj/NiBoneLODController.h
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 // Include structures
 #include "../gen/SkinShapeGroup.h"
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiTriShape;
diff --git a/obj/NiBoolData.cpp b/obj/NiBoolData.cpp
index ffc503b9a944b82281e1bd0afb78c2b5b1b57958..3696e6275f35590b383c506d697ea7a221210437 100644
--- a/obj/NiBoolData.cpp
+++ b/obj/NiBoolData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBoolData.h"
 #include "../gen/KeyGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBoolData::TYPE("NiBoolData", &NI_BOOL_DATA_PARENT::TypeConst() );
diff --git a/obj/NiBoolData.h b/obj/NiBoolData.h
index 9755bc334b7cbf1ec3dea8ee3d036df45d95cf55..20a5cd4efcf44b5a754cb361e1d939b4f114a8a1 100644
--- a/obj/NiBoolData.h
+++ b/obj/NiBoolData.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AKeyedData.h"
 // Include structures
 #include "../gen/KeyGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiBoolInterpolator.cpp b/obj/NiBoolInterpolator.cpp
index 047f46710f2a2d393fc7ddbcc6bfe7849f656910..faad436a457e34b48b38c0190a99d18da4665279 100644
--- a/obj/NiBoolInterpolator.cpp
+++ b/obj/NiBoolInterpolator.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBoolInterpolator.h"
 #include "NiBoolData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBoolInterpolator::TYPE("NiBoolInterpolator", &NI_BOOL_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBoolInterpolator.h b/obj/NiBoolInterpolator.h
index c159153d5c49e44d5ae68a1965d986c52454df4e..cfb4ffc7beab01769e9b364ad58e89799ff82ce3 100644
--- a/obj/NiBoolInterpolator.h
+++ b/obj/NiBoolInterpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiBoolData;
diff --git a/obj/NiBoolTimelineInterpolator.cpp b/obj/NiBoolTimelineInterpolator.cpp
index d988de3889c4f1d221088cc2ae8b08d2910604c7..eba08a8946f1db1cc3ebc2a2cf69868b3c0f1834 100644
--- a/obj/NiBoolTimelineInterpolator.cpp
+++ b/obj/NiBoolTimelineInterpolator.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBoolTimelineInterpolator.h"
 #include "NiBoolData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBoolTimelineInterpolator::TYPE("NiBoolTimelineInterpolator", &NI_BOOL_TIMELINE_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiBoolTimelineInterpolator.h b/obj/NiBoolTimelineInterpolator.h
index 56745cd402c2992f3abd654d293c78d1207d573d..6a42e47a24a73f02beb01285a39d749d14646915 100644
--- a/obj/NiBoolTimelineInterpolator.h
+++ b/obj/NiBoolTimelineInterpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiBoolData;
diff --git a/obj/NiBooleanExtraData.cpp b/obj/NiBooleanExtraData.cpp
index 1b986cc67e17577d3d7bace127c1fa0ad5ea0070..6dc96548d0a5528c515f909c12be34f109ecea80 100644
--- a/obj/NiBooleanExtraData.cpp
+++ b/obj/NiBooleanExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiBooleanExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiBooleanExtraData::TYPE("NiBooleanExtraData", &NI_BOOLEAN_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiBooleanExtraData.h b/obj/NiBooleanExtraData.h
index 0fcc339cb4fd263b34fd35d78fbda9a2b126283b..26c23a101f5e6517be844a175af775e5167226ee 100644
--- a/obj/NiBooleanExtraData.h
+++ b/obj/NiBooleanExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIBOOLEANEXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiCamera.cpp b/obj/NiCamera.cpp
index 84e53ed743165f3c62de39adf98dd1058286871c..3779470b74dc3eff252665f90734b9f35c7f3dc1 100644
--- a/obj/NiCamera.cpp
+++ b/obj/NiCamera.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiCamera.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiCamera::TYPE("NiCamera", &NI_CAMERA_PARENT::TypeConst() );
diff --git a/obj/NiCamera.h b/obj/NiCamera.h
index c7dfefb3d576a5ec2dcc41e23c1db6cfc8d885c6..fa44ef4048193c0558be8801b2701975d909b39e 100644
--- a/obj/NiCamera.h
+++ b/obj/NiCamera.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/obj/NiCollisionData.cpp b/obj/NiCollisionData.cpp
index 624e3ca7f09bf810a3941a245f63d10ecdbda358..23743da5d01c2bab925abb2331c9b571d8a5b267 100644
--- a/obj/NiCollisionData.cpp
+++ b/obj/NiCollisionData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiCollisionData.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiCollisionData::TYPE("NiCollisionData", &NI_COLLISION_DATA_PARENT::TypeConst() );
diff --git a/obj/NiCollisionData.h b/obj/NiCollisionData.h
index 665e1882043ca6ca1b3414a5004895a81a0e454e..808f78ceda2c2bc5a116ed3505b6a725eaab1fa5 100644
--- a/obj/NiCollisionData.h
+++ b/obj/NiCollisionData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NICOLLISIONDATA_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/obj/NiCollisionObject.cpp b/obj/NiCollisionObject.cpp
index b76e77fe7cbf2bcdfa9e928cd606942cbe2f0981..814b4c523f5ca32cdc7a32115b94d1d3369b3473 100644
--- a/obj/NiCollisionObject.cpp
+++ b/obj/NiCollisionObject.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiCollisionObject.h"
 #include "NiAVObject.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiCollisionObject::TYPE("NiCollisionObject", &NI_COLLISION_OBJECT_PARENT::TypeConst() );
diff --git a/obj/NiCollisionObject.h b/obj/NiCollisionObject.h
index 787e0b2b0c2f78225cf023a4e77f192a5412fdee..9332ea9d6a9e3548b6247affef7d6bc2f0de57e0 100644
--- a/obj/NiCollisionObject.h
+++ b/obj/NiCollisionObject.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiAVObject;
diff --git a/obj/NiColorData.cpp b/obj/NiColorData.cpp
index 4c190159fdb4a56a848a2c00577e94f3d192fc75..9dd50fcceae03c86a06a2dfae4e334d2a700a187 100644
--- a/obj/NiColorData.cpp
+++ b/obj/NiColorData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiColorData.h"
 #include "../gen/KeyGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiColorData::TYPE("NiColorData", &NI_COLOR_DATA_PARENT::TypeConst() );
diff --git a/obj/NiColorData.h b/obj/NiColorData.h
index a3288d2d4e3c42df92c70af1c2e177ba5744430b..26c1dde5e52b71443a2830778ee6deea2d9cafa2 100644
--- a/obj/NiColorData.h
+++ b/obj/NiColorData.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AKeyedData.h"
 // Include structures
 #include "../gen/KeyGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiColorExtraData.cpp b/obj/NiColorExtraData.cpp
index 5d6f1f403f28dd252ef8485fc9cd006af7845667..96de744a424b367e503b7c44994cfa3c38df5f7c 100644
--- a/obj/NiColorExtraData.cpp
+++ b/obj/NiColorExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiColorExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiColorExtraData::TYPE("NiColorExtraData", &NI_COLOR_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiColorExtraData.h b/obj/NiColorExtraData.h
index ad936422fc40fd657fce87fb1abdba3009d485a3..32864d8d9d03bdb852ad1d5f7d2847153315c86c 100644
--- a/obj/NiColorExtraData.h
+++ b/obj/NiColorExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NICOLOREXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiControllerManager.cpp b/obj/NiControllerManager.cpp
index ae4e62a487fc63c1ccb5a5a9a4b2c68493032bd6..c2304cc26798b3050326ac58af3d2cab0a0be3df 100644
--- a/obj/NiControllerManager.cpp
+++ b/obj/NiControllerManager.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiControllerManager.h"
 #include "NiControllerSequence.h"
 #include "NiDefaultAVObjectPalette.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiControllerManager::TYPE("NiControllerManager", &NI_CONTROLLER_MANAGER_PARENT::TypeConst() );
diff --git a/obj/NiControllerManager.h b/obj/NiControllerManager.h
index 180d1aae4777866cff125142660fd291073f6b92..1fb91e6400fa6ecfab9cd070b26fec0c9c23c6e7 100644
--- a/obj/NiControllerManager.h
+++ b/obj/NiControllerManager.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiControllerSequence;
diff --git a/obj/NiControllerSequence.cpp b/obj/NiControllerSequence.cpp
index a988b766073e4af3de760706e7fba181d4d14d11..3479699c5a2d5f7ac299d0a1936b727248dabd49 100644
--- a/obj/NiControllerSequence.cpp
+++ b/obj/NiControllerSequence.cpp
@@ -14,7 +14,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiControllerManager.h"
 #include "NiStringPalette.h"
 #include "NiTimeController.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiControllerSequence::TYPE("NiControllerSequence", &NI_CONTROLLER_SEQUENCE_PARENT::TypeConst() );
diff --git a/obj/NiControllerSequence.h b/obj/NiControllerSequence.h
index 241d79c70ddf0e51c5f3bf40435e01e8a27e64fe..75fed2cc500523d1f88e475f6c37d49cef11dea1 100644
--- a/obj/NiControllerSequence.h
+++ b/obj/NiControllerSequence.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 // Include structures
 #include "../gen/ControllerLink.h"
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiTextKeyExtraData;
diff --git a/obj/NiDefaultAVObjectPalette.cpp b/obj/NiDefaultAVObjectPalette.cpp
index 26b3a1cf4526153945d0b69121365367b4b863e4..8d0679f41bbbd78650645e7b3a2604f962cf12e8 100644
--- a/obj/NiDefaultAVObjectPalette.cpp
+++ b/obj/NiDefaultAVObjectPalette.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiDefaultAVObjectPalette.h"
 #include "../gen/AVObject.h"
 #include "NiAVObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiDefaultAVObjectPalette::TYPE("NiDefaultAVObjectPalette", &NI_DEFAULT_A_V_OBJECT_PALETTE_PARENT::TypeConst() );
diff --git a/obj/NiDefaultAVObjectPalette.h b/obj/NiDefaultAVObjectPalette.h
index 07deca0b39ea9630a4dda04d645d6ccd9cbb8fc4..1d72351d9ddb5ce372715e3daa29428ad1e9e439 100644
--- a/obj/NiDefaultAVObjectPalette.h
+++ b/obj/NiDefaultAVObjectPalette.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/AVObject.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiDirectionalLight.cpp b/obj/NiDirectionalLight.cpp
index a128eb2401893d0e063cff01591a01e7cfcd8353..bf142a370d86f53eaad1ec27c2fa3d79e85b4d78 100644
--- a/obj/NiDirectionalLight.cpp
+++ b/obj/NiDirectionalLight.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiDirectionalLight.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiDirectionalLight::TYPE("NiDirectionalLight", &NI_DIRECTIONAL_LIGHT_PARENT::TypeConst() );
diff --git a/obj/NiDirectionalLight.h b/obj/NiDirectionalLight.h
index 5dc676126e62e1779337d9774f8069db9cfaefff..7dca6fe3931663388681676734947db3ab425f0c 100644
--- a/obj/NiDirectionalLight.h
+++ b/obj/NiDirectionalLight.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIDIRECTIONALLIGHT_H_
 
 #include "NiLight.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiDitherProperty.cpp b/obj/NiDitherProperty.cpp
index f6b549d7efa25ecbbf2dc2f166b57b9d1a3da1ac..f916c6b9e4215ad182716c43b3910d43e9ec00c0 100644
--- a/obj/NiDitherProperty.cpp
+++ b/obj/NiDitherProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiDitherProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiDitherProperty::TYPE("NiDitherProperty", &NI_DITHER_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiDitherProperty.h b/obj/NiDitherProperty.h
index 3f3ded8e93670d8e5255583352273ba985465e7b..550cce5ae03d2b3f445e502e771c5eaa3a359827 100644
--- a/obj/NiDitherProperty.h
+++ b/obj/NiDitherProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIDITHERPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiDynamicEffect.cpp b/obj/NiDynamicEffect.cpp
index 0d13631634498398a87e129859f3f2a0adf6fa24..0c44a32f9da30408f5ca087a72dd0bf1947c5eb9 100644
--- a/obj/NiDynamicEffect.cpp
+++ b/obj/NiDynamicEffect.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiDynamicEffect.h"
 #include "NiAVObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiDynamicEffect::TYPE("NiDynamicEffect", &NI_DYNAMIC_EFFECT_PARENT::TypeConst() );
diff --git a/obj/NiDynamicEffect.h b/obj/NiDynamicEffect.h
index 684f5c4287f95e4488503f1587cc9115164bcd42..5b4cdd15bcfa2f23ef126d07ac856d16f3aea65c 100644
--- a/obj/NiDynamicEffect.h
+++ b/obj/NiDynamicEffect.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiAVObject;
diff --git a/obj/NiExtraData.cpp b/obj/NiExtraData.cpp
index 43da28e799b40c38ae005e961a71c6f0c806c846..e1c68a804a3c726edacd7cf3517942d12ada4612 100644
--- a/obj/NiExtraData.cpp
+++ b/obj/NiExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiExtraData::TYPE("NiExtraData", &NI_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiExtraData.h b/obj/NiExtraData.h
index 3849bf2aeb894cd5fef2caeea000d1103f0316f2..4728763aef71a9650208620f2745cb28f709f08c 100644
--- a/obj/NiExtraData.h
+++ b/obj/NiExtraData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiFlipController.cpp b/obj/NiFlipController.cpp
index 8cb42f1eb0b6672b8146f0069d39b64c56f98e93..a752354e6a952e03138c512a274e1857d2e9e974 100644
--- a/obj/NiFlipController.cpp
+++ b/obj/NiFlipController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiFlipController.h"
 #include "NiSourceTexture.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiFlipController::TYPE("NiFlipController", &NI_FLIP_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiFlipController.h b/obj/NiFlipController.h
index 0202de6e6ee10594277e9378060c089e4881c2e2..676fc30645c3d7b96bd100e892016b2d1261b29c 100644
--- a/obj/NiFlipController.h
+++ b/obj/NiFlipController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiSourceTexture;
diff --git a/obj/NiFloatData.cpp b/obj/NiFloatData.cpp
index 101c74099bef2b977e2105ed0af0c3110cdfba50..1794575e8bae932f6e3a8895a09d3e5c453cefee 100644
--- a/obj/NiFloatData.cpp
+++ b/obj/NiFloatData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiFloatData.h"
 #include "../gen/KeyGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiFloatData::TYPE("NiFloatData", &NI_FLOAT_DATA_PARENT::TypeConst() );
diff --git a/obj/NiFloatData.h b/obj/NiFloatData.h
index 26a5135a4b340dbb1cf2896cc02e14556c1e2e15..fe8833a0c2e1f66618e7c71508ad11d247dd98f1 100644
--- a/obj/NiFloatData.h
+++ b/obj/NiFloatData.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AKeyedData.h"
 // Include structures
 #include "../gen/KeyGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiFloatExtraData.cpp b/obj/NiFloatExtraData.cpp
index 07abe9579cc6935c418be5a49d3a502fff2dd4ea..adee50161f8d39a5a910b3bf925e122087cf9afe 100644
--- a/obj/NiFloatExtraData.cpp
+++ b/obj/NiFloatExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiFloatExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiFloatExtraData::TYPE("NiFloatExtraData", &NI_FLOAT_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiFloatExtraData.h b/obj/NiFloatExtraData.h
index a1022b4b5373d4f8bc5608b3ad5143fc5a955fd9..1369c7ecb516234ecdf879a884f7e9ac11f6057a 100644
--- a/obj/NiFloatExtraData.h
+++ b/obj/NiFloatExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIFLOATEXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiFloatExtraDataController.cpp b/obj/NiFloatExtraDataController.cpp
index 188afb6d3e3bc0379e1c01314b682cc0d93e30e1..73342244a4d7ec4fe49758d25f91db3bdd3f37cb 100644
--- a/obj/NiFloatExtraDataController.cpp
+++ b/obj/NiFloatExtraDataController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiFloatExtraDataController.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiFloatExtraDataController::TYPE("NiFloatExtraDataController", &NI_FLOAT_EXTRA_DATA_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiFloatExtraDataController.h b/obj/NiFloatExtraDataController.h
index bd717d4920f25bb658ca2208cc56d23f8e55b17a..d1a9aa9e7fa4fee10782ef168a800559abb06b5f 100644
--- a/obj/NiFloatExtraDataController.h
+++ b/obj/NiFloatExtraDataController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/obj/NiFloatInterpolator.cpp b/obj/NiFloatInterpolator.cpp
index cc4595fa45d221e65598801c88385dd72e59651d..7cf7f0a6bda6cad1ae8b4464e305baeaf52c6efe 100644
--- a/obj/NiFloatInterpolator.cpp
+++ b/obj/NiFloatInterpolator.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiFloatInterpolator.h"
 #include "NiFloatData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiFloatInterpolator::TYPE("NiFloatInterpolator", &NI_FLOAT_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiFloatInterpolator.h b/obj/NiFloatInterpolator.h
index 801174276e52a8470eedb36b937d37f52176c717..7d82a5f765d2fee4a0376cfa0a5ab6e91e64da10 100644
--- a/obj/NiFloatInterpolator.h
+++ b/obj/NiFloatInterpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiFloatData;
diff --git a/obj/NiFloatsExtraData.cpp b/obj/NiFloatsExtraData.cpp
index 34efb6be593c3b00a9cf25bf0cccfcde27e425a9..4d2c8080b09bd845c418d034c32f7eb047fdb3eb 100644
--- a/obj/NiFloatsExtraData.cpp
+++ b/obj/NiFloatsExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiFloatsExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiFloatsExtraData::TYPE("NiFloatsExtraData", &NI_FLOATS_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiFloatsExtraData.h b/obj/NiFloatsExtraData.h
index 3c0a76185e59aec74311cc64101b11547debdf2c..b1276ee9c14c84d7b310be1a1c3de31c080adc8b 100644
--- a/obj/NiFloatsExtraData.h
+++ b/obj/NiFloatsExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIFLOATSEXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiFogProperty.cpp b/obj/NiFogProperty.cpp
index d532f9f69e501a6f8164b2f685c5b8e88013d96d..a93c4cd84a2fb154c3c97e871b500b054903ccbf 100644
--- a/obj/NiFogProperty.cpp
+++ b/obj/NiFogProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiFogProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiFogProperty::TYPE("NiFogProperty", &NI_FOG_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiFogProperty.h b/obj/NiFogProperty.h
index 602439343cf358c5e825df4a27ca6e274561f2e6..47ee0d027bba95091bb287b4cc1dac73d363f455 100644
--- a/obj/NiFogProperty.h
+++ b/obj/NiFogProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIFOGPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiGeomMorpherController.cpp b/obj/NiGeomMorpherController.cpp
index cecc15048e98272f531c652797ca091a2398b650..740c2605ed31f4916a64d79365995f1d0daa34d6 100644
--- a/obj/NiGeomMorpherController.cpp
+++ b/obj/NiGeomMorpherController.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiGeomMorpherController.h"
 #include "NiMorphData.h"
 #include "NiInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiGeomMorpherController::TYPE("NiGeomMorpherController", &NI_GEOM_MORPHER_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiGeomMorpherController.h b/obj/NiGeomMorpherController.h
index c986e29f76242a4ac21c0275c4991833f5bf7021..503f49d088df5d6505ad0c1ee1eabeb64cff63bd 100644
--- a/obj/NiGeomMorpherController.h
+++ b/obj/NiGeomMorpherController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiMorphData;
diff --git a/obj/NiGravity.cpp b/obj/NiGravity.cpp
index bd719addfb7a95f1cc2bb547605138918c116749..491fae86e179c6ed4e5b429ee01f3e531724c987 100644
--- a/obj/NiGravity.cpp
+++ b/obj/NiGravity.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiGravity.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiGravity::TYPE("NiGravity", &NI_GRAVITY_PARENT::TypeConst() );
diff --git a/obj/NiGravity.h b/obj/NiGravity.h
index 3b72ae15ca5070c1c8153ddfb9cad013db408d01..190a175effa7272bc582587b6c4585bb10ad082e 100644
--- a/obj/NiGravity.h
+++ b/obj/NiGravity.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIGRAVITY_H_
 
 #include "AParticleModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiIntegerExtraData.cpp b/obj/NiIntegerExtraData.cpp
index 4d8329517418cf7471937ec46494f584addcadef..7876cc199afa8ef788079003da5c47f2984d16f4 100644
--- a/obj/NiIntegerExtraData.cpp
+++ b/obj/NiIntegerExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiIntegerExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiIntegerExtraData::TYPE("NiIntegerExtraData", &NI_INTEGER_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiIntegerExtraData.h b/obj/NiIntegerExtraData.h
index 167dcf7b5ac7b7e3dc69209aeba8cead84b98e73..5489096bc69b7f42ea7005db4c5a5c647584e305 100644
--- a/obj/NiIntegerExtraData.h
+++ b/obj/NiIntegerExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIINTEGEREXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiIntegersExtraData.cpp b/obj/NiIntegersExtraData.cpp
index 45352fdec91b744748955b374f56a25fd7cf6166..555d0ebc8cb886bd3371feeeb9256bcac579af65 100644
--- a/obj/NiIntegersExtraData.cpp
+++ b/obj/NiIntegersExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiIntegersExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiIntegersExtraData::TYPE("NiIntegersExtraData", &NI_INTEGERS_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiIntegersExtraData.h b/obj/NiIntegersExtraData.h
index 745ec7ae9b8342ee990c4d77f9251eba696e6050..1a2cb6da31b3ccd8ff8eb59d534dd46956382de7 100644
--- a/obj/NiIntegersExtraData.h
+++ b/obj/NiIntegersExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIINTEGERSEXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiInterpolator.cpp b/obj/NiInterpolator.cpp
index cc8adf944625a731241ba7e569ced7337263e01a..a8cf80bff774348129d535216dcdea3f191c4f5c 100644
--- a/obj/NiInterpolator.cpp
+++ b/obj/NiInterpolator.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiInterpolator::TYPE("NiInterpolator", &NI_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiInterpolator.h b/obj/NiInterpolator.h
index 14eac07f8da078a73941df9f7ebaa018209f52a3..b4ffd76ae4540d98a98efba6aba3325f27410b80 100644
--- a/obj/NiInterpolator.h
+++ b/obj/NiInterpolator.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIINTERPOLATOR_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiKeyframeController.cpp b/obj/NiKeyframeController.cpp
index 3bed1b02698827c208fd31579a1965e2a4c72902..d079e6e2ea8c0dbd95bb4732ce7549e1104b9cd9 100644
--- a/obj/NiKeyframeController.cpp
+++ b/obj/NiKeyframeController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiKeyframeController.h"
 #include "NiKeyframeData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiKeyframeController::TYPE("NiKeyframeController", &NI_KEYFRAME_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiKeyframeController.h b/obj/NiKeyframeController.h
index 4775d4b71e95de204bd470412622bb9a5169d9af..a0a8bd3ec8797f3f72b3cef6eca6ea6709bf2d78 100644
--- a/obj/NiKeyframeController.h
+++ b/obj/NiKeyframeController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiKeyframeData;
diff --git a/obj/NiKeyframeData.cpp b/obj/NiKeyframeData.cpp
index 0f83d0198fa7fc2656dc58347580f1978680a62e..c042799e0f5b0686e2867f1680491e57b4da954f 100644
--- a/obj/NiKeyframeData.cpp
+++ b/obj/NiKeyframeData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../gen/KeyGroup.h"
 #include "../gen/KeyGroup.h"
 #include "../gen/KeyGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiKeyframeData::TYPE("NiKeyframeData", &NI_KEYFRAME_DATA_PARENT::TypeConst() );
diff --git a/obj/NiKeyframeData.h b/obj/NiKeyframeData.h
index e50731b61d268ba4f5aabd45068ce413850d3a38..403b785ba67e885eebf86f966c4b262a132ddaaf 100644
--- a/obj/NiKeyframeData.h
+++ b/obj/NiKeyframeData.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AKeyedData.h"
 // Include structures
 #include "../gen/KeyGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiLODNode.cpp b/obj/NiLODNode.cpp
index 6578240fa306557870deeb7557e69af0e9d119f1..31ce01b0fd5ac466b4db39569fcd19eb36e201f9 100644
--- a/obj/NiLODNode.cpp
+++ b/obj/NiLODNode.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiLODNode.h"
 #include "../gen/LODRange.h"
 #include "NiRangeLODData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiLODNode::TYPE("NiLODNode", &NI_L_O_D_NODE_PARENT::TypeConst() );
diff --git a/obj/NiLODNode.h b/obj/NiLODNode.h
index 1a7fc1c692775c7a5464f3989a7d517f93d7b237..bdca6955fd317b4b820bc1ce61171ae83234f8bb 100644
--- a/obj/NiLODNode.h
+++ b/obj/NiLODNode.h
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 // Include structures
 #include "../gen/LODRange.h"
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiRangeLODData;
diff --git a/obj/NiLight.cpp b/obj/NiLight.cpp
index db96b2b85e3ca191f767f9397315b50d027c306a..012fe6681989b520a5924ae9255ae9fed28c35c9 100644
--- a/obj/NiLight.cpp
+++ b/obj/NiLight.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiLight.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiLight::TYPE("NiLight", &NI_LIGHT_PARENT::TypeConst() );
diff --git a/obj/NiLight.h b/obj/NiLight.h
index 1efd6fbc25d3a818ab5e45f17232739a8500429b..49da5baf7ed3567291f78f1f2cf31465a106ccf5 100644
--- a/obj/NiLight.h
+++ b/obj/NiLight.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NILIGHT_H_
 
 #include "NiDynamicEffect.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiLightColorController.cpp b/obj/NiLightColorController.cpp
index 74cbea24b2a1787782051f8f1546290da4d1edf5..891c47411a2e8e8c2813896056d4dc37f7bfe075 100644
--- a/obj/NiLightColorController.cpp
+++ b/obj/NiLightColorController.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiLightColorController.h"
 #include "NiPosData.h"
 #include "NiPoint3Interpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiLightColorController::TYPE("NiLightColorController", &NI_LIGHT_COLOR_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiLightColorController.h b/obj/NiLightColorController.h
index d02fbc90827349068b78b61f93c46b8962f7b58b..151ca969bf130e46156c530c119a59f42c536e66 100644
--- a/obj/NiLightColorController.h
+++ b/obj/NiLightColorController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPosData;
diff --git a/obj/NiLightDimmerController.cpp b/obj/NiLightDimmerController.cpp
index 771efcf7f67a824763f04d1178bb72b26f3460a6..b6bbf7e9975f542586f08ae4fda81400efe4d65f 100644
--- a/obj/NiLightDimmerController.cpp
+++ b/obj/NiLightDimmerController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiLightDimmerController.h"
 #include "NiInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiLightDimmerController::TYPE("NiLightDimmerController", &NI_LIGHT_DIMMER_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiLightDimmerController.h b/obj/NiLightDimmerController.h
index 79aac07201b01bdaf493f0447abe2320b1bff9fc..5c352c0a5cd3d34aafa33425644736ce034d23e1 100644
--- a/obj/NiLightDimmerController.h
+++ b/obj/NiLightDimmerController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiInterpolator;
diff --git a/obj/NiLookAtController.cpp b/obj/NiLookAtController.cpp
index e00191a107b6111e6ea11ef5e5942d6b2499c713..81cc4d72f7ac8f935b4a4547d74b3ffb710a21e4 100644
--- a/obj/NiLookAtController.cpp
+++ b/obj/NiLookAtController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiLookAtController.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiLookAtController::TYPE("NiLookAtController", &NI_LOOK_AT_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiLookAtController.h b/obj/NiLookAtController.h
index 3dd0a551e3178de1b1f854f04e80cc6a96dfd885..0e4bd6268fd4e9e6b69497ce24e15b487060ffa8 100644
--- a/obj/NiLookAtController.h
+++ b/obj/NiLookAtController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/obj/NiLookAtInterpolator.cpp b/obj/NiLookAtInterpolator.cpp
index 74295dd21b25769c8d34f3424917ceb0b010aa6e..06d2662128e3e5de9ee1553b0bde7ccd85fee2fe 100644
--- a/obj/NiLookAtInterpolator.cpp
+++ b/obj/NiLookAtInterpolator.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiNode.h"
 #include "NiPoint3Interpolator.h"
 #include "NiFloatInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiLookAtInterpolator::TYPE("NiLookAtInterpolator", &NI_LOOK_AT_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiLookAtInterpolator.h b/obj/NiLookAtInterpolator.h
index fbaa69da6baa53be9dc1289cc058d85f07d2f8a1..ff502eaa4787613c08234ec0ec7c8912be2348f4 100644
--- a/obj/NiLookAtInterpolator.h
+++ b/obj/NiLookAtInterpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/obj/NiMaterialColorController.cpp b/obj/NiMaterialColorController.cpp
index e82f3b41c7a979594b2dedd1093f239db7fdd16e..67c00271f6fd0cf473da639e4a9a0a66c8f95a12 100644
--- a/obj/NiMaterialColorController.cpp
+++ b/obj/NiMaterialColorController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiMaterialColorController.h"
 #include "NiPosData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiMaterialColorController::TYPE("NiMaterialColorController", &NI_MATERIAL_COLOR_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiMaterialColorController.h b/obj/NiMaterialColorController.h
index e00b713fa834d49e3de5a7df2cbb966bc901c300..99fcd03d617d3a00961b290a6da9bbbd8e9e20e5 100644
--- a/obj/NiMaterialColorController.h
+++ b/obj/NiMaterialColorController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPosData;
diff --git a/obj/NiMaterialProperty.cpp b/obj/NiMaterialProperty.cpp
index c01ecb56978c6deaca3fbff20840ac11e9ccb758..96d3ab490ac33bdc8481a7770c1ff107be6f1b7b 100644
--- a/obj/NiMaterialProperty.cpp
+++ b/obj/NiMaterialProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiMaterialProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiMaterialProperty::TYPE("NiMaterialProperty", &NI_MATERIAL_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiMaterialProperty.h b/obj/NiMaterialProperty.h
index c838cbb9b0fb3991edf6f9fac1c7d049833606b6..0ca66c1c2ed379199def1329d4e871f2a7fa7837 100644
--- a/obj/NiMaterialProperty.h
+++ b/obj/NiMaterialProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIMATERIALPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiMeshPSysData.cpp b/obj/NiMeshPSysData.cpp
index 002d9c9a0c624c33d0a898c224eb06e7b22305a4..e907c48253817ba08bf61c00f62bda60a0ef9a72 100644
--- a/obj/NiMeshPSysData.cpp
+++ b/obj/NiMeshPSysData.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiMeshPSysData.h"
 #include "NiPSysModifier.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiMeshPSysData::TYPE("NiMeshPSysData", &NI_MESH_P_SYS_DATA_PARENT::TypeConst() );
diff --git a/obj/NiMeshPSysData.h b/obj/NiMeshPSysData.h
index 4fd87756c328d57f429e865a854d8ed2ae02d941..9d0e14fba8253577bf6cb17171c5b68fec1cbda0 100644
--- a/obj/NiMeshPSysData.h
+++ b/obj/NiMeshPSysData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPSysModifier;
diff --git a/obj/NiMeshParticleSystem.cpp b/obj/NiMeshParticleSystem.cpp
index 115e67d507a481a335c4b6d6b953bbee6ac3e949..25862bc3eccb08aa68699a7879e89a19d3c6b288 100644
--- a/obj/NiMeshParticleSystem.cpp
+++ b/obj/NiMeshParticleSystem.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiMeshParticleSystem.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiMeshParticleSystem::TYPE("NiMeshParticleSystem", &NI_MESH_PARTICLE_SYSTEM_PARENT::TypeConst() );
diff --git a/obj/NiMeshParticleSystem.h b/obj/NiMeshParticleSystem.h
index 2d45765cf7c3909f1f27bff3a8cb531e2a45e213..230bab72b69efc03c8af710beb8ac44d4e52f8f6 100644
--- a/obj/NiMeshParticleSystem.h
+++ b/obj/NiMeshParticleSystem.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIMESHPARTICLESYSTEM_H_
 
 #include "NiParticleSystem.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiMorphData.cpp b/obj/NiMorphData.cpp
index e675e7223d97675e0e295ab115fea08c81dff8c3..4a762dd237316944a1f8121db93dd1616e5e3da8 100644
--- a/obj/NiMorphData.cpp
+++ b/obj/NiMorphData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiMorphData.h"
 #include "../gen/Morph.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiMorphData::TYPE("NiMorphData", &NI_MORPH_DATA_PARENT::TypeConst() );
diff --git a/obj/NiMorphData.h b/obj/NiMorphData.h
index b013db158962caf68b6b6a703d53a902c96b5c6d..32f4fa78920dc1f67689e1e3e1be2dd97efa7d4a 100644
--- a/obj/NiMorphData.h
+++ b/obj/NiMorphData.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 // Include structures
 #include "../gen/Morph.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiMultiTargetTransformController.cpp b/obj/NiMultiTargetTransformController.cpp
index 81aa0f08986a3ee765bb149760c5de4d0f48a5ab..ba57b9c4b876be5ad7db5013324f239d5bdcda97 100644
--- a/obj/NiMultiTargetTransformController.cpp
+++ b/obj/NiMultiTargetTransformController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiMultiTargetTransformController.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiMultiTargetTransformController::TYPE("NiMultiTargetTransformController", &NI_MULTI_TARGET_TRANSFORM_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiMultiTargetTransformController.h b/obj/NiMultiTargetTransformController.h
index 413f7e4659d8f61eefd185c0d3f6ffa842140fb6..69e5ccbf3f88dffb962ff4859a81f097dc185a44 100644
--- a/obj/NiMultiTargetTransformController.h
+++ b/obj/NiMultiTargetTransformController.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIMULTITARGETTRANSFORMCONTROLLER_H_
 
 #include "NiTimeController.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/obj/NiNode.cpp b/obj/NiNode.cpp
index 52bf1ca4d5ca4aa3adcbac89241523ef6247a956..1b0bfadbc6061be7a812456f91d1cb9edaebd5a2 100644
--- a/obj/NiNode.cpp
+++ b/obj/NiNode.cpp
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiSkinInstance.h"
 #include "NiSkinData.h"
 #include "NiTriBasedGeom.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiNode::TYPE("NiNode", &NI_NODE_PARENT::TypeConst() );
diff --git a/obj/NiNode.h b/obj/NiNode.h
index 99f9624b7f496b920c3ccd25a97cd69dc1477969..ef282a8814a0f0149665f88c62a05c8fb9f7c509 100644
--- a/obj/NiNode.h
+++ b/obj/NiNode.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiAVObject;
diff --git a/obj/NiObject.cpp b/obj/NiObject.cpp
index 69d39436684b101ca3efb57f59044a4a17d8836e..5a392431ecc0e3ca2e4fa2c62a6c58a24ad5c255 100644
--- a/obj/NiObject.cpp
+++ b/obj/NiObject.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiObject::TYPE("NiObject", NULL );
diff --git a/obj/NiObject.h b/obj/NiObject.h
index 6413557c0f50c88ff307540c92e39484d3a3d5d2..2298994d31e8c2fb0c47c36bcfd67c9941dd95d4 100644
--- a/obj/NiObject.h
+++ b/obj/NiObject.h
@@ -16,7 +16,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../Ref.h"
 #include "../Type.h"
 #include "../gen/obj_defines.h"
-namespace NifLib {
+namespace Niflib {
 
 using namespace std;
 
diff --git a/obj/NiObjectNET.cpp b/obj/NiObjectNET.cpp
index 15e2555c32ec523acd9057b5d7ac2a7cdc34dbdd..6dec8f8c3136beabb3807383fc7e5e1aba5a999c 100644
--- a/obj/NiObjectNET.cpp
+++ b/obj/NiObjectNET.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObjectNET.h"
 #include "NiExtraData.h"
 #include "NiTimeController.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiObjectNET::TYPE("NiObjectNET", &NI_OBJECT_N_E_T_PARENT::TypeConst() );
diff --git a/obj/NiObjectNET.h b/obj/NiObjectNET.h
index dfafc40e3ea4488bf0e72aeaf238deeacc555e15..268db450f746baaf456f3674c78ef2bbded5f7a2 100644
--- a/obj/NiObjectNET.h
+++ b/obj/NiObjectNET.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiObject.h"
 
 #include NI_OBJECT_N_E_T_INCLUDE
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiExtraData;
diff --git a/obj/NiPSysAgeDeathModifier.cpp b/obj/NiPSysAgeDeathModifier.cpp
index c2b9b55865e938477beaf3a8536885f8373665e2..fb0805420e2ddd52c33e8c9c1ee01692d0e6cf80 100644
--- a/obj/NiPSysAgeDeathModifier.cpp
+++ b/obj/NiPSysAgeDeathModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysAgeDeathModifier.h"
 #include "NiPSysSpawnModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysAgeDeathModifier::TYPE("NiPSysAgeDeathModifier", &NI_P_SYS_AGE_DEATH_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysAgeDeathModifier.h b/obj/NiPSysAgeDeathModifier.h
index f3c8943703c3010730624c823026f5ff72d3bfdc..af71a02930fc3666007b27418476d7c6deeaf7b7 100644
--- a/obj/NiPSysAgeDeathModifier.h
+++ b/obj/NiPSysAgeDeathModifier.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPSysSpawnModifier;
diff --git a/obj/NiPSysBombModifier.cpp b/obj/NiPSysBombModifier.cpp
index e7c9a185a041583ad731bba08018fd2eec2ee8e0..42343ad5fb173abb8938d79babebd3cfd8142120 100644
--- a/obj/NiPSysBombModifier.cpp
+++ b/obj/NiPSysBombModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysBombModifier.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysBombModifier::TYPE("NiPSysBombModifier", &NI_P_SYS_BOMB_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysBombModifier.h b/obj/NiPSysBombModifier.h
index 621c53bfaea83230963fa5f465cb8494982fea88..1999540c0d58e8a097ec084865e539f5d4ef48af 100644
--- a/obj/NiPSysBombModifier.h
+++ b/obj/NiPSysBombModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSBOMBMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/obj/NiPSysBoundUpdateModifier.cpp b/obj/NiPSysBoundUpdateModifier.cpp
index ec05cc31f4e89f4982acc285c165d8d47d85dffb..94177a65ca995c6ff5dad37d01bd6c5695dca2ce 100644
--- a/obj/NiPSysBoundUpdateModifier.cpp
+++ b/obj/NiPSysBoundUpdateModifier.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysBoundUpdateModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysBoundUpdateModifier::TYPE("NiPSysBoundUpdateModifier", &NI_P_SYS_BOUND_UPDATE_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysBoundUpdateModifier.h b/obj/NiPSysBoundUpdateModifier.h
index d0562ff2f83da3b681efe6d8a47442ec6e762ab7..f85fbc177ba9a3f652353768bd264bb827fe83bc 100644
--- a/obj/NiPSysBoundUpdateModifier.h
+++ b/obj/NiPSysBoundUpdateModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSBOUNDUPDATEMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysBoxEmitter.cpp b/obj/NiPSysBoxEmitter.cpp
index bca9e8d92292c63a116b974bb74b9b5500f00dd5..a0ad435b5be3e0f778e19bd99520449c05b14456 100644
--- a/obj/NiPSysBoxEmitter.cpp
+++ b/obj/NiPSysBoxEmitter.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysBoxEmitter.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysBoxEmitter::TYPE("NiPSysBoxEmitter", &NI_P_SYS_BOX_EMITTER_PARENT::TypeConst() );
diff --git a/obj/NiPSysBoxEmitter.h b/obj/NiPSysBoxEmitter.h
index 48a351425c1601f05c5e7e57007f29b060b4ff16..02c5bc6abf93862155db814fe55ec34a32c00d24 100644
--- a/obj/NiPSysBoxEmitter.h
+++ b/obj/NiPSysBoxEmitter.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSBOXEMITTER_H_
 
 #include "NiPSysVolumeEmitter.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysColliderManager.cpp b/obj/NiPSysColliderManager.cpp
index d5f4d2b5144b475ab03e20c72dbe5c2029f31806..335a1c8cd040f490ecc31993726ad590b7476503 100644
--- a/obj/NiPSysColliderManager.cpp
+++ b/obj/NiPSysColliderManager.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysColliderManager.h"
 #include "NiPSysPlanarCollider.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysColliderManager::TYPE("NiPSysColliderManager", &NI_P_SYS_COLLIDER_MANAGER_PARENT::TypeConst() );
diff --git a/obj/NiPSysColliderManager.h b/obj/NiPSysColliderManager.h
index eb47897e1c9f0dacf2d2119b286bddb72043bc2e..0d426986f87b04352d1bb9c2102843fb2f0b84a6 100644
--- a/obj/NiPSysColliderManager.h
+++ b/obj/NiPSysColliderManager.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPSysPlanarCollider;
diff --git a/obj/NiPSysColorModifier.cpp b/obj/NiPSysColorModifier.cpp
index 7b23d476fb3e1bf0ae58b49a9a5834c4ee36819f..433a0c3fa8fe5d8d150280525d76f453d9823fd5 100644
--- a/obj/NiPSysColorModifier.cpp
+++ b/obj/NiPSysColorModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysColorModifier.h"
 #include "NiColorData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysColorModifier::TYPE("NiPSysColorModifier", &NI_P_SYS_COLOR_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysColorModifier.h b/obj/NiPSysColorModifier.h
index f619645f09314c728a20b4bf19b0d8d94d7455c9..2cd8218a6233ba9261108a36c5bc7342103cdc58 100644
--- a/obj/NiPSysColorModifier.h
+++ b/obj/NiPSysColorModifier.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiColorData;
diff --git a/obj/NiPSysCylinderEmitter.cpp b/obj/NiPSysCylinderEmitter.cpp
index 9e20b5182f2d55b67a809271e37d77f0416a9358..5b690b77052e8d63b9defa8c5d862235034a6fc8 100644
--- a/obj/NiPSysCylinderEmitter.cpp
+++ b/obj/NiPSysCylinderEmitter.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysCylinderEmitter.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysCylinderEmitter::TYPE("NiPSysCylinderEmitter", &NI_P_SYS_CYLINDER_EMITTER_PARENT::TypeConst() );
diff --git a/obj/NiPSysCylinderEmitter.h b/obj/NiPSysCylinderEmitter.h
index 03bbc5d9495be7923e2554a002f13eda5ce622a1..2b8d5623e90a919f910497a90c23000bfb083960 100644
--- a/obj/NiPSysCylinderEmitter.h
+++ b/obj/NiPSysCylinderEmitter.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSCYLINDEREMITTER_H_
 
 #include "NiPSysVolumeEmitter.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysData.cpp b/obj/NiPSysData.cpp
index 326e074cabde3c53ed59f872b061109710379b44..f862ceeb53505c6e10911add480073e54b3650de 100644
--- a/obj/NiPSysData.cpp
+++ b/obj/NiPSysData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysData::TYPE("NiPSysData", &NI_P_SYS_DATA_PARENT::TypeConst() );
diff --git a/obj/NiPSysData.h b/obj/NiPSysData.h
index e6baeaa1e6667c00e9bc006fc7f8f66fa58e6ad3..538b2968c4eea91dd3a43ff7c68359ec03cb0b72 100644
--- a/obj/NiPSysData.h
+++ b/obj/NiPSysData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSDATA_H_
 
 #include "APSysData.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysDragModifier.cpp b/obj/NiPSysDragModifier.cpp
index d129a689c48d4c7bb248d9143ecb97c09fef78e8..35c778543c9bed6aa4cdd1878140a494e5b6b813 100644
--- a/obj/NiPSysDragModifier.cpp
+++ b/obj/NiPSysDragModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysDragModifier.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysDragModifier::TYPE("NiPSysDragModifier", &NI_P_SYS_DRAG_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysDragModifier.h b/obj/NiPSysDragModifier.h
index bf879af26a7075d26031de89fd4a0635c9c3e165..c85d0be12738f64eae9b779d1a63a44b3ae9dd5e 100644
--- a/obj/NiPSysDragModifier.h
+++ b/obj/NiPSysDragModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSDRAGMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/obj/NiPSysEmitter.cpp b/obj/NiPSysEmitter.cpp
index 48eb2f38451d1d9db26f280ad4c3ca89bb81b124..714c00b394eba4f56ed5e10107d0f6ba89489df2 100644
--- a/obj/NiPSysEmitter.cpp
+++ b/obj/NiPSysEmitter.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysEmitter.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysEmitter::TYPE("NiPSysEmitter", &NI_P_SYS_EMITTER_PARENT::TypeConst() );
diff --git a/obj/NiPSysEmitter.h b/obj/NiPSysEmitter.h
index 704f364259251ecdef81a0bf154dd7f7ec58b4e0..28a1b79fd5dd4078ae3a3c7c40b8154d4aead30d 100644
--- a/obj/NiPSysEmitter.h
+++ b/obj/NiPSysEmitter.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSEMITTER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysEmitterCtlr.cpp b/obj/NiPSysEmitterCtlr.cpp
index a635746f2499f0e95a434843c2f4d6857578fa6a..cd00d8db6532c8795f0b492520ad4499b54f3408 100644
--- a/obj/NiPSysEmitterCtlr.cpp
+++ b/obj/NiPSysEmitterCtlr.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysEmitterCtlr.h"
 #include "NiPSysEmitterCtlrData.h"
 #include "NiInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysEmitterCtlr::TYPE("NiPSysEmitterCtlr", &NI_P_SYS_EMITTER_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysEmitterCtlr.h b/obj/NiPSysEmitterCtlr.h
index 138d71a36a0ea7da9939c31ef5656a3eb96fabf2..5f1b4d029f2f64a2669864a700c0e3b2e2752dc2 100644
--- a/obj/NiPSysEmitterCtlr.h
+++ b/obj/NiPSysEmitterCtlr.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPSysEmitterCtlrData;
diff --git a/obj/NiPSysEmitterCtlrData.cpp b/obj/NiPSysEmitterCtlrData.cpp
index 97c9d948433c0202421dfa21f640710bddf7a7a5..24980e263cd9ae957fd3c63284b68c1580ead6bd 100644
--- a/obj/NiPSysEmitterCtlrData.cpp
+++ b/obj/NiPSysEmitterCtlrData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysEmitterCtlrData.h"
 #include "../gen/KeyGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysEmitterCtlrData::TYPE("NiPSysEmitterCtlrData", &NI_P_SYS_EMITTER_CTLR_DATA_PARENT::TypeConst() );
diff --git a/obj/NiPSysEmitterCtlrData.h b/obj/NiPSysEmitterCtlrData.h
index 5497e2e3e16ffdc6eaeeeadf6969861330473610..b3f4e97a8cae7f5435de62381239c91177ec44ac 100644
--- a/obj/NiPSysEmitterCtlrData.h
+++ b/obj/NiPSysEmitterCtlrData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/KeyGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysEmitterDeclinationCtlr.cpp b/obj/NiPSysEmitterDeclinationCtlr.cpp
index 022fc68096bb94c92fcfcd40787e0c8fb082b984..1228b6e8908557853d943033300a2b49f73a6f15 100644
--- a/obj/NiPSysEmitterDeclinationCtlr.cpp
+++ b/obj/NiPSysEmitterDeclinationCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysEmitterDeclinationCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysEmitterDeclinationCtlr::TYPE("NiPSysEmitterDeclinationCtlr", &NI_P_SYS_EMITTER_DECLINATION_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysEmitterDeclinationCtlr.h b/obj/NiPSysEmitterDeclinationCtlr.h
index d69a41bd41b8e4ac2abce48c4e5371ad234cc84d..7b663a030d6dcca3f03260b559469afd6dd22886 100644
--- a/obj/NiPSysEmitterDeclinationCtlr.h
+++ b/obj/NiPSysEmitterDeclinationCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSEMITTERDECLINATIONCTLR_H_
 
 #include "APSysCtlr.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysEmitterDeclinationVarCtlr.cpp b/obj/NiPSysEmitterDeclinationVarCtlr.cpp
index 5fb5b46db9943fc974c3d4faa30f7e204a9d52bb..0a2fac849ee2bf64e090ea885d10fa5f22491aa2 100644
--- a/obj/NiPSysEmitterDeclinationVarCtlr.cpp
+++ b/obj/NiPSysEmitterDeclinationVarCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysEmitterDeclinationVarCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysEmitterDeclinationVarCtlr::TYPE("NiPSysEmitterDeclinationVarCtlr", &NI_P_SYS_EMITTER_DECLINATION_VAR_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysEmitterDeclinationVarCtlr.h b/obj/NiPSysEmitterDeclinationVarCtlr.h
index 0eb067334a713f03af6083bd563a4e331271cb28..a9d77d3f6cca5db9bf0483f7ff079fe732b5f5a9 100644
--- a/obj/NiPSysEmitterDeclinationVarCtlr.h
+++ b/obj/NiPSysEmitterDeclinationVarCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSEMITTERDECLINATIONVARCTLR_H_
 
 #include "APSysCtlr.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysEmitterInitialRadiusCtlr.cpp b/obj/NiPSysEmitterInitialRadiusCtlr.cpp
index 30b2bfd3e4a552e332cf0476ecde5b735ac7c712..216e0398aae8ee4db375a51baba95cc690ec0db9 100644
--- a/obj/NiPSysEmitterInitialRadiusCtlr.cpp
+++ b/obj/NiPSysEmitterInitialRadiusCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysEmitterInitialRadiusCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysEmitterInitialRadiusCtlr::TYPE("NiPSysEmitterInitialRadiusCtlr", &NI_P_SYS_EMITTER_INITIAL_RADIUS_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysEmitterInitialRadiusCtlr.h b/obj/NiPSysEmitterInitialRadiusCtlr.h
index 4d367de94db215dc76ada2adbd1db1bfa0f2b121..691108c5a293d222f212ebd8c253ac5be2f92cad 100644
--- a/obj/NiPSysEmitterInitialRadiusCtlr.h
+++ b/obj/NiPSysEmitterInitialRadiusCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSEMITTERINITIALRADIUSCTLR_H_
 
 #include "APSysCtlr.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysEmitterLifeSpanCtlr.cpp b/obj/NiPSysEmitterLifeSpanCtlr.cpp
index ba9ad3ad4534c7f29dd506ce0e92375a3ce87dab..baa85cfd475ecd0f65a307e4cf3fc3b7e1780987 100644
--- a/obj/NiPSysEmitterLifeSpanCtlr.cpp
+++ b/obj/NiPSysEmitterLifeSpanCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysEmitterLifeSpanCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysEmitterLifeSpanCtlr::TYPE("NiPSysEmitterLifeSpanCtlr", &NI_P_SYS_EMITTER_LIFE_SPAN_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysEmitterLifeSpanCtlr.h b/obj/NiPSysEmitterLifeSpanCtlr.h
index c690cf431d3a842af18eb703cf85e0f5e3e195a0..e238b647b49512fbce3eb88abf5fd58fafa93609 100644
--- a/obj/NiPSysEmitterLifeSpanCtlr.h
+++ b/obj/NiPSysEmitterLifeSpanCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSEMITTERLIFESPANCTLR_H_
 
 #include "APSysCtlr.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysEmitterSpeedCtlr.cpp b/obj/NiPSysEmitterSpeedCtlr.cpp
index 6267bf5f0bce5ca21816cf587895239d9241150d..af2281bd28f7ec2343475eede8c5986535308e0c 100644
--- a/obj/NiPSysEmitterSpeedCtlr.cpp
+++ b/obj/NiPSysEmitterSpeedCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysEmitterSpeedCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysEmitterSpeedCtlr::TYPE("NiPSysEmitterSpeedCtlr", &NI_P_SYS_EMITTER_SPEED_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysEmitterSpeedCtlr.h b/obj/NiPSysEmitterSpeedCtlr.h
index 8a255fe0fffa8d88990e88dc1392d8e0f4bd93e7..888799e4895f9ecb6f85d62f856966cbb8535d82 100644
--- a/obj/NiPSysEmitterSpeedCtlr.h
+++ b/obj/NiPSysEmitterSpeedCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSEMITTERSPEEDCTLR_H_
 
 #include "APSysCtlr.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysGravityModifier.cpp b/obj/NiPSysGravityModifier.cpp
index c79de006c67c6d758172a4aa85888ae0dfc98f8c..cf497845bd5e0ce1d481b43fed9e93e60ebf7b30 100644
--- a/obj/NiPSysGravityModifier.cpp
+++ b/obj/NiPSysGravityModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysGravityModifier.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysGravityModifier::TYPE("NiPSysGravityModifier", &NI_P_SYS_GRAVITY_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysGravityModifier.h b/obj/NiPSysGravityModifier.h
index dbdccfebe548f8c869d552383cd2ad652158f745..faa92381467a9eb74743a9b7edae5dfea497d32e 100644
--- a/obj/NiPSysGravityModifier.h
+++ b/obj/NiPSysGravityModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSGRAVITYMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/obj/NiPSysGravityStrengthCtlr.cpp b/obj/NiPSysGravityStrengthCtlr.cpp
index ffa1ee625e5f9aa04e4c43d18d8c20c3ab3144cc..b0f827fd64ed967b60308d6079e749a4f0872c2a 100644
--- a/obj/NiPSysGravityStrengthCtlr.cpp
+++ b/obj/NiPSysGravityStrengthCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysGravityStrengthCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysGravityStrengthCtlr::TYPE("NiPSysGravityStrengthCtlr", &NI_P_SYS_GRAVITY_STRENGTH_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysGravityStrengthCtlr.h b/obj/NiPSysGravityStrengthCtlr.h
index 41f7bc071e10ca94528a44639d736217986f9386..91b9472ccfa73996776eb665cb6a86dc1a1586b0 100644
--- a/obj/NiPSysGravityStrengthCtlr.h
+++ b/obj/NiPSysGravityStrengthCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSGRAVITYSTRENGTHCTLR_H_
 
 #include "APSysCtlr.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysGrowFadeModifier.cpp b/obj/NiPSysGrowFadeModifier.cpp
index 946a83001c1f36c59b4e834fd9d4d497ec83ac26..056aec1e8dcc312357f515dd5354f79f6a7727f3 100644
--- a/obj/NiPSysGrowFadeModifier.cpp
+++ b/obj/NiPSysGrowFadeModifier.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysGrowFadeModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysGrowFadeModifier::TYPE("NiPSysGrowFadeModifier", &NI_P_SYS_GROW_FADE_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysGrowFadeModifier.h b/obj/NiPSysGrowFadeModifier.h
index ab0ea60869bd473db4149792e4f7e801c26017f0..f738498c54c1072788fd3c27c39a9b3de84449e0 100644
--- a/obj/NiPSysGrowFadeModifier.h
+++ b/obj/NiPSysGrowFadeModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSGROWFADEMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysMeshEmitter.cpp b/obj/NiPSysMeshEmitter.cpp
index c374356eb60203ec545ff1f31a7532b758fa3d9c..8db935b6c00b4015536549c458af8a7cde8d4779 100644
--- a/obj/NiPSysMeshEmitter.cpp
+++ b/obj/NiPSysMeshEmitter.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysMeshEmitter.h"
 #include "NiTriBasedGeom.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysMeshEmitter::TYPE("NiPSysMeshEmitter", &NI_P_SYS_MESH_EMITTER_PARENT::TypeConst() );
diff --git a/obj/NiPSysMeshEmitter.h b/obj/NiPSysMeshEmitter.h
index ab2417e00ae89a5b98d93136804cf6e554d0a087..e576aaba0dacbf3fb5611c3afcc4faf3aa5fc343 100644
--- a/obj/NiPSysMeshEmitter.h
+++ b/obj/NiPSysMeshEmitter.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiTriBasedGeom;
diff --git a/obj/NiPSysMeshUpdateModifier.cpp b/obj/NiPSysMeshUpdateModifier.cpp
index cba516aee1170eefefbffcf1e2aeb3bdd451e57f..08f9cb127af80a9961fba4c4a986d603d2a71d80 100644
--- a/obj/NiPSysMeshUpdateModifier.cpp
+++ b/obj/NiPSysMeshUpdateModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysMeshUpdateModifier.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysMeshUpdateModifier::TYPE("NiPSysMeshUpdateModifier", &NI_P_SYS_MESH_UPDATE_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysMeshUpdateModifier.h b/obj/NiPSysMeshUpdateModifier.h
index 745035ef4aad2ac1e264bd842c55c64d8975a51f..975c81890b6de101f03760fe3b9ffca08aee7a63 100644
--- a/obj/NiPSysMeshUpdateModifier.h
+++ b/obj/NiPSysMeshUpdateModifier.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/obj/NiPSysModifier.cpp b/obj/NiPSysModifier.cpp
index 6c904efd244e414bd6e47e33ef34c10f11876326..afe39a244fb4a64d3ee0dec3cd5d40a6531c161e 100644
--- a/obj/NiPSysModifier.cpp
+++ b/obj/NiPSysModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifier.h"
 #include "NiParticleSystem.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysModifier::TYPE("NiPSysModifier", &NI_P_SYS_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysModifier.h b/obj/NiPSysModifier.h
index e79c59c0f9209290d19c5b2555783f16626dc421..a3108d1cc593ffa35ea70d70d1ef0bc8e91292d0 100644
--- a/obj/NiPSysModifier.h
+++ b/obj/NiPSysModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSMODIFIER_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiParticleSystem;
diff --git a/obj/NiPSysModifierActiveCtlr.cpp b/obj/NiPSysModifierActiveCtlr.cpp
index eb95b71bfa562ee4a074e6df794fb2e653ee3aea..e62d482575cbce6f8811b7fdafe2f2d85b02444b 100644
--- a/obj/NiPSysModifierActiveCtlr.cpp
+++ b/obj/NiPSysModifierActiveCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysModifierActiveCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysModifierActiveCtlr::TYPE("NiPSysModifierActiveCtlr", &NI_P_SYS_MODIFIER_ACTIVE_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysModifierActiveCtlr.h b/obj/NiPSysModifierActiveCtlr.h
index fd81d68676e907ed4fbe7c19c9c2041f69c833dd..ffae138a228bb83203d90a16b627f2207455b5ee 100644
--- a/obj/NiPSysModifierActiveCtlr.h
+++ b/obj/NiPSysModifierActiveCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSMODIFIERACTIVECTLR_H_
 
 #include "APSysCtlr.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysPlanarCollider.cpp b/obj/NiPSysPlanarCollider.cpp
index f252d0651727a2dc62a704014205e1f36fd2800d..89b71dc37f558569b9eff4fd635eab1b5756a860 100644
--- a/obj/NiPSysPlanarCollider.cpp
+++ b/obj/NiPSysPlanarCollider.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPSysSpawnModifier.h"
 #include "NiObject.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysPlanarCollider::TYPE("NiPSysPlanarCollider", &NI_P_SYS_PLANAR_COLLIDER_PARENT::TypeConst() );
diff --git a/obj/NiPSysPlanarCollider.h b/obj/NiPSysPlanarCollider.h
index 717ea3474140b06595478e52234a13f508d4db58..04fc744e1fdc7af73be6a2d4cdc76255b4b2d2c1 100644
--- a/obj/NiPSysPlanarCollider.h
+++ b/obj/NiPSysPlanarCollider.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPSysSpawnModifier;
diff --git a/obj/NiPSysPositionModifier.cpp b/obj/NiPSysPositionModifier.cpp
index a1d5fc3123ef46c4967fe11a76b4031ba6917fa0..f45aea3225a47a5af893eea1f09f220be3f95bd5 100644
--- a/obj/NiPSysPositionModifier.cpp
+++ b/obj/NiPSysPositionModifier.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysPositionModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysPositionModifier::TYPE("NiPSysPositionModifier", &NI_P_SYS_POSITION_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysPositionModifier.h b/obj/NiPSysPositionModifier.h
index 863f4b0464325c41c7269cc4963232675b464023..d57e265b23e58432918b21c4d3f5a7176447c1cf 100644
--- a/obj/NiPSysPositionModifier.h
+++ b/obj/NiPSysPositionModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSPOSITIONMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysResetOnLoopCtlr.cpp b/obj/NiPSysResetOnLoopCtlr.cpp
index 586fd82ae426bd99ecc993fa6f9d933912e620c4..6880c46e52cb6827921bc027a7591c5167b61b0b 100644
--- a/obj/NiPSysResetOnLoopCtlr.cpp
+++ b/obj/NiPSysResetOnLoopCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysResetOnLoopCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysResetOnLoopCtlr::TYPE("NiPSysResetOnLoopCtlr", &NI_P_SYS_RESET_ON_LOOP_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysResetOnLoopCtlr.h b/obj/NiPSysResetOnLoopCtlr.h
index 7538fe0d19489f05ee8f7f3d979c682ff8683dbb..101f1a3d7b2e521a40d5918faffeb03340ae6b4b 100644
--- a/obj/NiPSysResetOnLoopCtlr.h
+++ b/obj/NiPSysResetOnLoopCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSRESETONLOOPCTLR_H_
 
 #include "NiTimeController.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysRotationModifier.cpp b/obj/NiPSysRotationModifier.cpp
index 9848b2cc1de45c2dfb8729951824ffa3dd9458dd..5c3b9d013c08672bc35e3e56925b67a05f637072 100644
--- a/obj/NiPSysRotationModifier.cpp
+++ b/obj/NiPSysRotationModifier.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysRotationModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysRotationModifier::TYPE("NiPSysRotationModifier", &NI_P_SYS_ROTATION_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysRotationModifier.h b/obj/NiPSysRotationModifier.h
index 2cfc3ce4390623f28aed8e554ea698cfae8ed25d..c7af7d9e0f2c4596b11a5eacd9eecc80c0ede6b1 100644
--- a/obj/NiPSysRotationModifier.h
+++ b/obj/NiPSysRotationModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSROTATIONMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysSpawnModifier.cpp b/obj/NiPSysSpawnModifier.cpp
index 55ded02d5b18acbe0c9a5992f931174796cff27f..b6f762f10499d344ae7a48c576916fb4372a02f7 100644
--- a/obj/NiPSysSpawnModifier.cpp
+++ b/obj/NiPSysSpawnModifier.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysSpawnModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysSpawnModifier::TYPE("NiPSysSpawnModifier", &NI_P_SYS_SPAWN_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiPSysSpawnModifier.h b/obj/NiPSysSpawnModifier.h
index 13e0c1a021ebae41770194408fa892b739d8c350..b72592ddd838fd493314b9cc4f8832e327e44841 100644
--- a/obj/NiPSysSpawnModifier.h
+++ b/obj/NiPSysSpawnModifier.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSSPAWNMODIFIER_H_
 
 #include "NiPSysModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysSphereEmitter.cpp b/obj/NiPSysSphereEmitter.cpp
index 64f7843b2715cd2bdca9bbcd06cb443084184316..30e291332e353e0912c688c42edbd156fa27a4b8 100644
--- a/obj/NiPSysSphereEmitter.cpp
+++ b/obj/NiPSysSphereEmitter.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysSphereEmitter.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysSphereEmitter::TYPE("NiPSysSphereEmitter", &NI_P_SYS_SPHERE_EMITTER_PARENT::TypeConst() );
diff --git a/obj/NiPSysSphereEmitter.h b/obj/NiPSysSphereEmitter.h
index a3515f80d2a3dce7f890ef9ff07788abb612e1c5..037275ab11db17396bea6524d8538bc19ea3f719 100644
--- a/obj/NiPSysSphereEmitter.h
+++ b/obj/NiPSysSphereEmitter.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSSPHEREEMITTER_H_
 
 #include "NiPSysVolumeEmitter.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPSysUpdateCtlr.cpp b/obj/NiPSysUpdateCtlr.cpp
index bdc84fc08b197a41d50449bbed2780008f3c7473..09140e4bb0f3b909b69631d237f5ba0b4e0fa7a1 100644
--- a/obj/NiPSysUpdateCtlr.cpp
+++ b/obj/NiPSysUpdateCtlr.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysUpdateCtlr.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysUpdateCtlr::TYPE("NiPSysUpdateCtlr", &NI_P_SYS_UPDATE_CTLR_PARENT::TypeConst() );
diff --git a/obj/NiPSysUpdateCtlr.h b/obj/NiPSysUpdateCtlr.h
index 34a3e23f27f3420ce458cb0f2b7bd3446e0bac30..037bf13bd3d6589bf691538442afa13d940a5f92 100644
--- a/obj/NiPSysUpdateCtlr.h
+++ b/obj/NiPSysUpdateCtlr.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSUPDATECTLR_H_
 
 #include "NiTimeController.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPSysVolumeEmitter.cpp b/obj/NiPSysVolumeEmitter.cpp
index d3b3e5ad161dd37de3537df618a210a3b7cf3f1a..d791054660adb28ee4025805301b062191ebbcef 100644
--- a/obj/NiPSysVolumeEmitter.cpp
+++ b/obj/NiPSysVolumeEmitter.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPSysVolumeEmitter.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPSysVolumeEmitter::TYPE("NiPSysVolumeEmitter", &NI_P_SYS_VOLUME_EMITTER_PARENT::TypeConst() );
diff --git a/obj/NiPSysVolumeEmitter.h b/obj/NiPSysVolumeEmitter.h
index 4382777fb93ecfd7be6c73ddcb338f34289147e6..a706945fc4ddaa530c3a3e53eb0f651e0af6d7fa 100644
--- a/obj/NiPSysVolumeEmitter.h
+++ b/obj/NiPSysVolumeEmitter.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPSYSVOLUMEEMITTER_H_
 
 #include "NiPSysEmitter.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiNode;
diff --git a/obj/NiPalette.cpp b/obj/NiPalette.cpp
index 4079598b09229809f2b291e84ba7cc3694116f44..8d22a8112d5e455624b3f47e7420fde2210a5ef7 100644
--- a/obj/NiPalette.cpp
+++ b/obj/NiPalette.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPalette.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPalette::TYPE("NiPalette", &NI_PALETTE_PARENT::TypeConst() );
diff --git a/obj/NiPalette.h b/obj/NiPalette.h
index 50324c4e867d381f73d366dfe517f2fe1da145d8..9ababc3f27273d6122311397479193179fdbcb21 100644
--- a/obj/NiPalette.h
+++ b/obj/NiPalette.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPALETTE_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiParticleBomb.cpp b/obj/NiParticleBomb.cpp
index 73820e8cf64b815eb2365a07f219958d22be6a14..41eab7f552f9de1abc4e07ae5f423710493f9802 100644
--- a/obj/NiParticleBomb.cpp
+++ b/obj/NiParticleBomb.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleBomb.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleBomb::TYPE("NiParticleBomb", &NI_PARTICLE_BOMB_PARENT::TypeConst() );
diff --git a/obj/NiParticleBomb.h b/obj/NiParticleBomb.h
index 9074a99a3053eb32dc7049af8ddd8d16aa51337b..804c16bd3af93ed626673d5a2a31b79c69f2247b 100644
--- a/obj/NiParticleBomb.h
+++ b/obj/NiParticleBomb.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPARTICLEBOMB_H_
 
 #include "AParticleModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiParticleColorModifier.cpp b/obj/NiParticleColorModifier.cpp
index 110d17cecb6d3d55b83bbbff91cbce3ec203d37b..3ffda74454249d6ccb21e1179aca3ef2a6b3e19e 100644
--- a/obj/NiParticleColorModifier.cpp
+++ b/obj/NiParticleColorModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleColorModifier.h"
 #include "NiColorData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleColorModifier::TYPE("NiParticleColorModifier", &NI_PARTICLE_COLOR_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiParticleColorModifier.h b/obj/NiParticleColorModifier.h
index 3e23e9baaf2ae5eca3b0e38e253e0df8da912b82..ba06ed904166b840604461442071fb95972435ab 100644
--- a/obj/NiParticleColorModifier.h
+++ b/obj/NiParticleColorModifier.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiColorData;
diff --git a/obj/NiParticleGrowFade.cpp b/obj/NiParticleGrowFade.cpp
index b4fca3e5d88435e5ae121ccdecaa5b51577b6140..0b8be0213c77076f2bb007cf48030490394c5f19 100644
--- a/obj/NiParticleGrowFade.cpp
+++ b/obj/NiParticleGrowFade.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleGrowFade.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleGrowFade::TYPE("NiParticleGrowFade", &NI_PARTICLE_GROW_FADE_PARENT::TypeConst() );
diff --git a/obj/NiParticleGrowFade.h b/obj/NiParticleGrowFade.h
index 4de6afe98d5a11c5935cb8f3e7661c33e16447ba..fe70404f9998341f7b33a97fe53c43a64050682f 100644
--- a/obj/NiParticleGrowFade.h
+++ b/obj/NiParticleGrowFade.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPARTICLEGROWFADE_H_
 
 #include "AParticleModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiParticleMeshModifier.cpp b/obj/NiParticleMeshModifier.cpp
index 75cc8d0850da3f0a2129ab8120474b499027115a..49f30899a1ada3d0d9bcb51378bd44aa631b8ba4 100644
--- a/obj/NiParticleMeshModifier.cpp
+++ b/obj/NiParticleMeshModifier.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleMeshModifier.h"
 #include "NiAVObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleMeshModifier::TYPE("NiParticleMeshModifier", &NI_PARTICLE_MESH_MODIFIER_PARENT::TypeConst() );
diff --git a/obj/NiParticleMeshModifier.h b/obj/NiParticleMeshModifier.h
index 3ca99fd64a67853ed68a69570a89787386bb1300..a83932874e849f0c3bb7dede246bb767819b0841 100644
--- a/obj/NiParticleMeshModifier.h
+++ b/obj/NiParticleMeshModifier.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiAVObject;
diff --git a/obj/NiParticleMeshes.cpp b/obj/NiParticleMeshes.cpp
index de488ab0e27d58a4b1366dbd9e9b6ceba71c20d2..c7211558586a41d828da87c1f669bc7f932ec524 100644
--- a/obj/NiParticleMeshes.cpp
+++ b/obj/NiParticleMeshes.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleMeshes.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleMeshes::TYPE("NiParticleMeshes", &NI_PARTICLE_MESHES_PARENT::TypeConst() );
diff --git a/obj/NiParticleMeshes.h b/obj/NiParticleMeshes.h
index 14b3b7b83ea26ac654c12f73205799e0f7cfdd28..2e6f1b739afd0753ed8bdf994651753ab3a60fd1 100644
--- a/obj/NiParticleMeshes.h
+++ b/obj/NiParticleMeshes.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPARTICLEMESHES_H_
 
 #include "NiParticles.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiParticleMeshesData.cpp b/obj/NiParticleMeshesData.cpp
index 96678aa24de035b913cac3d65ab0782613353743..147d11a77e4466ce079bf42485ff11c1f301f67e 100644
--- a/obj/NiParticleMeshesData.cpp
+++ b/obj/NiParticleMeshesData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleMeshesData.h"
 #include "NiAVObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleMeshesData::TYPE("NiParticleMeshesData", &NI_PARTICLE_MESHES_DATA_PARENT::TypeConst() );
diff --git a/obj/NiParticleMeshesData.h b/obj/NiParticleMeshesData.h
index fb9b515443ce0cff523d1d567bb3de116283d4b9..17708a46cdabef9726d7bf4010e8c14a3e007dd8 100644
--- a/obj/NiParticleMeshesData.h
+++ b/obj/NiParticleMeshesData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiAVObject;
diff --git a/obj/NiParticleRotation.cpp b/obj/NiParticleRotation.cpp
index 034a2ceef5e98fcada0dc43d4b998d7a47cb5b82..04e8e10d711fa1dff6e921ae0078db2c1f437a37 100644
--- a/obj/NiParticleRotation.cpp
+++ b/obj/NiParticleRotation.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleRotation.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleRotation::TYPE("NiParticleRotation", &NI_PARTICLE_ROTATION_PARENT::TypeConst() );
diff --git a/obj/NiParticleRotation.h b/obj/NiParticleRotation.h
index e280c311be3b0971340124f19da7721073390309..b0f7a3fad5138cb1a047b068b0fb6506b6a60c13 100644
--- a/obj/NiParticleRotation.h
+++ b/obj/NiParticleRotation.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPARTICLEROTATION_H_
 
 #include "AParticleModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiParticleSystem.cpp b/obj/NiParticleSystem.cpp
index cdd10a9d9042bbf3171b08a7f146b48dccdae8d0..922102121b4817c4dfc00220fc07f0df358fe3e4 100644
--- a/obj/NiParticleSystem.cpp
+++ b/obj/NiParticleSystem.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticleSystem.h"
 #include "NiPSysModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleSystem::TYPE("NiParticleSystem", &NI_PARTICLE_SYSTEM_PARENT::TypeConst() );
diff --git a/obj/NiParticleSystem.h b/obj/NiParticleSystem.h
index 2576cf01e27eb03e3314fd4748889bf732cc4dfb..cf0f71e959b6661b55eb2530a164ab7c290c6149 100644
--- a/obj/NiParticleSystem.h
+++ b/obj/NiParticleSystem.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPSysModifier;
diff --git a/obj/NiParticleSystemController.cpp b/obj/NiParticleSystemController.cpp
index 79740b6c33d2c7ee8571324d19aba0baccaf3102..40c7542f8dea5fd37bfe4d60aae33157204a5336 100644
--- a/obj/NiParticleSystemController.cpp
+++ b/obj/NiParticleSystemController.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../gen/Particle.h"
 #include "NiObject.h"
 #include "AParticleModifier.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticleSystemController::TYPE("NiParticleSystemController", &NI_PARTICLE_SYSTEM_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiParticleSystemController.h b/obj/NiParticleSystemController.h
index e4818a9f5d810b1e70459e45be773520fc0c2a4f..c0febfde53e004fee9e0a1063cd80bee5d307f06 100644
--- a/obj/NiParticleSystemController.h
+++ b/obj/NiParticleSystemController.h
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 // Include structures
 #include "../Ref.h"
 #include "../gen/Particle.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/obj/NiParticles.cpp b/obj/NiParticles.cpp
index 8144df6b050086160f49dadeb4c07e5081138ea5..ad540b698894a8e2e74ae7d642090d75dc9da576 100644
--- a/obj/NiParticles.cpp
+++ b/obj/NiParticles.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticles.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticles::TYPE("NiParticles", &NI_PARTICLES_PARENT::TypeConst() );
diff --git a/obj/NiParticles.h b/obj/NiParticles.h
index 35c25b92da54887bb8d78da8019693ad2c264553..37cf037954e4735ff23830a322f272096b6960e6 100644
--- a/obj/NiParticles.h
+++ b/obj/NiParticles.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPARTICLES_H_
 
 #include "NiTriBasedGeom.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiParticlesData.cpp b/obj/NiParticlesData.cpp
index 96984f072ca51965e3bf6a49f454c29223ba2287..a64ef8d2960f8e8a207293411105dbabe037dc61 100644
--- a/obj/NiParticlesData.cpp
+++ b/obj/NiParticlesData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiParticlesData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiParticlesData::TYPE("NiParticlesData", &NI_PARTICLES_DATA_PARENT::TypeConst() );
diff --git a/obj/NiParticlesData.h b/obj/NiParticlesData.h
index 79eca8cc8e9e3f160fc43ebebfb584f471cf9a18..0a776b4d6b75a75fff72f2233c5d48e7c572086c 100644
--- a/obj/NiParticlesData.h
+++ b/obj/NiParticlesData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPARTICLESDATA_H_
 
 #include "NiAutoNormalParticlesData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPathController.cpp b/obj/NiPathController.cpp
index 42a449fd908cd964855f14464e0289eee783db3f..3d41547b15c75c013af27502d1e3c5126c472c76 100644
--- a/obj/NiPathController.cpp
+++ b/obj/NiPathController.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPathController.h"
 #include "NiPosData.h"
 #include "NiFloatData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPathController::TYPE("NiPathController", &NI_PATH_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiPathController.h b/obj/NiPathController.h
index ca11d23ca3b7763113d418f7a959c2abfa1b8910..ab738ca1397f80f9fa1d3475c68f0666f30fc516 100644
--- a/obj/NiPathController.h
+++ b/obj/NiPathController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPosData;
diff --git a/obj/NiPathInterpolator.cpp b/obj/NiPathInterpolator.cpp
index 62032713067f702a0ff1dacff8e9371d4fe59aa3..152371d1cd833748a0cc7f4edba83554d147a2de 100644
--- a/obj/NiPathInterpolator.cpp
+++ b/obj/NiPathInterpolator.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiPathInterpolator.h"
 #include "NiPosData.h"
 #include "NiFloatData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPathInterpolator::TYPE("NiPathInterpolator", &NI_PATH_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiPathInterpolator.h b/obj/NiPathInterpolator.h
index 4faa80f1a0d9a03937610d61f8191f613d4f8acd..3afde88b1715a83abbf2a35cd51f4677ca7af367 100644
--- a/obj/NiPathInterpolator.h
+++ b/obj/NiPathInterpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPosData;
diff --git a/obj/NiPixelData.cpp b/obj/NiPixelData.cpp
index 8bf1a3c601fb37cff522f42af19a5287e8632ddd..cae427a9ed282dfd3ac946a8cc41ed2356e227a2 100644
--- a/obj/NiPixelData.cpp
+++ b/obj/NiPixelData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../gen/MipMap.h"
 #include "../gen/ByteArray.h"
 #include "NiPalette.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPixelData::TYPE("NiPixelData", &NI_PIXEL_DATA_PARENT::TypeConst() );
diff --git a/obj/NiPixelData.h b/obj/NiPixelData.h
index 0d8b2aab90b9863907e408d66db579418fec5c9c..91f7854badb17c93821c684be17e5dd86d329878 100644
--- a/obj/NiPixelData.h
+++ b/obj/NiPixelData.h
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../Ref.h"
 #include "../gen/MipMap.h"
 #include "../gen/ByteArray.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPalette;
diff --git a/obj/NiPlanarCollider.cpp b/obj/NiPlanarCollider.cpp
index f5bbc79635827f636b4f9476fd266c254539e69d..760dd92c7a2ab6c03faf62f67ddb20e67634b538 100644
--- a/obj/NiPlanarCollider.cpp
+++ b/obj/NiPlanarCollider.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPlanarCollider.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPlanarCollider::TYPE("NiPlanarCollider", &NI_PLANAR_COLLIDER_PARENT::TypeConst() );
diff --git a/obj/NiPlanarCollider.h b/obj/NiPlanarCollider.h
index 358aa2e4e3b76edd940dc8e09f3c1e8ac10e6a6a..a2392b317cdbf6e4eb6bed4040fea37a6ca7bb76 100644
--- a/obj/NiPlanarCollider.h
+++ b/obj/NiPlanarCollider.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPLANARCOLLIDER_H_
 
 #include "AParticleModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiPoint3Interpolator.cpp b/obj/NiPoint3Interpolator.cpp
index d6cd84463c924ddf170ebf21b3371dc3de8e6187..8a11d98d798ea6d6448343c4325bb6a58561aee8 100644
--- a/obj/NiPoint3Interpolator.cpp
+++ b/obj/NiPoint3Interpolator.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPoint3Interpolator.h"
 #include "NiPosData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPoint3Interpolator::TYPE("NiPoint3Interpolator", &NI_POINT3_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiPoint3Interpolator.h b/obj/NiPoint3Interpolator.h
index 49cc6e8b1d08bd33e642ca2efb8db53baebe6ad5..ebd20e60fd8f90b1b642e27436cb78d6fef2db3b 100644
--- a/obj/NiPoint3Interpolator.h
+++ b/obj/NiPoint3Interpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiPosData;
diff --git a/obj/NiPointLight.cpp b/obj/NiPointLight.cpp
index 77390f8358746de83ae60d05f268c8e2b6ad64b8..b411748e8663dc0a28e75122dbb11a7fedd1c309 100644
--- a/obj/NiPointLight.cpp
+++ b/obj/NiPointLight.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPointLight.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPointLight::TYPE("NiPointLight", &NI_POINT_LIGHT_PARENT::TypeConst() );
diff --git a/obj/NiPointLight.h b/obj/NiPointLight.h
index 7941418dee579af66c9b9c78e620591ffadcccc4..ca14a109e8c7f2aeea7891dc336da29315333276 100644
--- a/obj/NiPointLight.h
+++ b/obj/NiPointLight.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPOINTLIGHT_H_
 
 #include "NiLight.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiPosData.cpp b/obj/NiPosData.cpp
index c542532d244cc011fe9e158d1389411034ca66a0..6a8776dfa0be434b96a95d9da28cd280e0513ea4 100644
--- a/obj/NiPosData.cpp
+++ b/obj/NiPosData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiPosData.h"
 #include "../gen/KeyGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiPosData::TYPE("NiPosData", &NI_POS_DATA_PARENT::TypeConst() );
diff --git a/obj/NiPosData.h b/obj/NiPosData.h
index 800aa7138fc29e7b35610c2ec32f96019393be90..98cd8465d5972959eae7af911fe2a457200bc60b 100644
--- a/obj/NiPosData.h
+++ b/obj/NiPosData.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "AKeyedData.h"
 // Include structures
 #include "../gen/KeyGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiProperty.cpp b/obj/NiProperty.cpp
index 3aeceb2cb45c83a8a116ca4dc47c20890a69bed2..40b54a20a1d70ef2cdde00a1f9c25b6fb7c13c57 100644
--- a/obj/NiProperty.cpp
+++ b/obj/NiProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiProperty::TYPE("NiProperty", &NI_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiProperty.h b/obj/NiProperty.h
index c69a6dd32754445d7af30c7515cfcd302b55de46..7a24dc70d205e3bfea0765b2a88e94516136bb8e 100644
--- a/obj/NiProperty.h
+++ b/obj/NiProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIPROPERTY_H_
 
 #include "NiObjectNET.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiRangeLODData.cpp b/obj/NiRangeLODData.cpp
index 6d9f9f193a1283bb0724e102374feddef692b478..6fcbd96b5c1538abdfe7ac419ce231ae7221adcf 100644
--- a/obj/NiRangeLODData.cpp
+++ b/obj/NiRangeLODData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiRangeLODData.h"
 #include "../gen/LODRange.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiRangeLODData::TYPE("NiRangeLODData", &NI_RANGE_L_O_D_DATA_PARENT::TypeConst() );
diff --git a/obj/NiRangeLODData.h b/obj/NiRangeLODData.h
index 968018801b0a7899bed599c8c3211c83f312f0a0..1462533db7a70df5bddaec093dc7913f0cb4d5ac 100644
--- a/obj/NiRangeLODData.h
+++ b/obj/NiRangeLODData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/LODRange.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiRotatingParticles.cpp b/obj/NiRotatingParticles.cpp
index 21675d2f78237674e73aed02b8d973d24858de57..53b677793bad14edfe93a47ee53259c90f76a493 100644
--- a/obj/NiRotatingParticles.cpp
+++ b/obj/NiRotatingParticles.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiRotatingParticles.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiRotatingParticles::TYPE("NiRotatingParticles", &NI_ROTATING_PARTICLES_PARENT::TypeConst() );
diff --git a/obj/NiRotatingParticles.h b/obj/NiRotatingParticles.h
index efaca6224e44789242148c5f8153a3ad0e3d4db8..f340c74efdd945fe7a49a870a9ca1e24da4eb4d5 100644
--- a/obj/NiRotatingParticles.h
+++ b/obj/NiRotatingParticles.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIROTATINGPARTICLES_H_
 
 #include "NiParticles.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiRotatingParticlesData.cpp b/obj/NiRotatingParticlesData.cpp
index 8cfe9d38758a8b570615482dc6b1c7e44cb2e6f2..2e2374ba9b77e1fef3e0af44933834b1e4d81630 100644
--- a/obj/NiRotatingParticlesData.cpp
+++ b/obj/NiRotatingParticlesData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiRotatingParticlesData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiRotatingParticlesData::TYPE("NiRotatingParticlesData", &NI_ROTATING_PARTICLES_DATA_PARENT::TypeConst() );
diff --git a/obj/NiRotatingParticlesData.h b/obj/NiRotatingParticlesData.h
index 95cec2c92c30508aad47ed6033ddcbce77eae3c9..affbb414e7cfdff4cb4beb4e783fcb44eff55333 100644
--- a/obj/NiRotatingParticlesData.h
+++ b/obj/NiRotatingParticlesData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIROTATINGPARTICLESDATA_H_
 
 #include "NiParticlesData.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiScreenLODData.cpp b/obj/NiScreenLODData.cpp
index 68a4a452921ca26fb43aaa2310055ab85882f6f7..779ac16ada8141c3d2bfdb26e3ac6ba1d892f586 100644
--- a/obj/NiScreenLODData.cpp
+++ b/obj/NiScreenLODData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiScreenLODData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiScreenLODData::TYPE("NiScreenLODData", &NI_SCREEN_L_O_D_DATA_PARENT::TypeConst() );
diff --git a/obj/NiScreenLODData.h b/obj/NiScreenLODData.h
index 2a3153785661e83886de577e2667c7a1cc0a19c3..fdef053653ce5b07bade3abf4b4e0ef77044d9f6 100644
--- a/obj/NiScreenLODData.h
+++ b/obj/NiScreenLODData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISCREENLODDATA_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiSequenceStreamHelper.cpp b/obj/NiSequenceStreamHelper.cpp
index 1173625eb6d7beee3cd448ea403f7a6606af8186..eba62af6c624e6862f5af31391fc69117724186f 100644
--- a/obj/NiSequenceStreamHelper.cpp
+++ b/obj/NiSequenceStreamHelper.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiSequenceStreamHelper.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSequenceStreamHelper::TYPE("NiSequenceStreamHelper", &NI_SEQUENCE_STREAM_HELPER_PARENT::TypeConst() );
diff --git a/obj/NiSequenceStreamHelper.h b/obj/NiSequenceStreamHelper.h
index bb3a1806584705062ea8ae1f2c0f157c40705146..6b985f0ceccbd48243337d3bf05499fb58215256 100644
--- a/obj/NiSequenceStreamHelper.h
+++ b/obj/NiSequenceStreamHelper.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISEQUENCESTREAMHELPER_H_
 
 #include "NiObjectNET.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiShadeProperty.cpp b/obj/NiShadeProperty.cpp
index 31daede6c43c871c1a43dffd3e7f8b9c21f2f07c..314a53a4eebfdaf1cdcd1a72bbf234b386044e28 100644
--- a/obj/NiShadeProperty.cpp
+++ b/obj/NiShadeProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiShadeProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiShadeProperty::TYPE("NiShadeProperty", &NI_SHADE_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiShadeProperty.h b/obj/NiShadeProperty.h
index 8c88cc341b8e36793fbb9b513aa718e76c257670..cec3e2a9b329643184ae93f95aa81bfbb0108311 100644
--- a/obj/NiShadeProperty.h
+++ b/obj/NiShadeProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISHADEPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiSingleInterpolatorController.cpp b/obj/NiSingleInterpolatorController.cpp
index 978acc11a9452600b86bd02e5b3ec0ff1244b904..5280f10aa86488f834e2703893600c398a60e0ea 100644
--- a/obj/NiSingleInterpolatorController.cpp
+++ b/obj/NiSingleInterpolatorController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiSingleInterpolatorController.h"
 #include "NiInterpolator.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSingleInterpolatorController::TYPE("NiSingleInterpolatorController", &NI_SINGLE_INTERPOLATOR_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiSingleInterpolatorController.h b/obj/NiSingleInterpolatorController.h
index 8b58f302fff460d7216f9ec66dbda9d3f4a2aa6f..d9c272aae8fd316ba7864247581161a6a66c2951 100644
--- a/obj/NiSingleInterpolatorController.h
+++ b/obj/NiSingleInterpolatorController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiInterpolator;
diff --git a/obj/NiSkinData.cpp b/obj/NiSkinData.cpp
index c8d836cf208f373ab2a4c936a5bfb1cd1a7956e7..fa252e0395e17ffa5885e9e3cfeadbede542096a 100644
--- a/obj/NiSkinData.cpp
+++ b/obj/NiSkinData.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../gen/SkinData.h"
 #include "../gen/SkinWeight.h"
 #include "NiSkinPartition.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSkinData::TYPE("NiSkinData", &NI_SKIN_DATA_PARENT::TypeConst() );
diff --git a/obj/NiSkinData.h b/obj/NiSkinData.h
index 617bdf456e9bca61055ae3a8c3f528d85bc6fc79..b08f3d171efbbcd4c3da719cfed13e7aaf5d52bb 100644
--- a/obj/NiSkinData.h
+++ b/obj/NiSkinData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 // Include structures
 #include "../Ref.h"
 #include "../gen/SkinData.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiSkinPartition;
diff --git a/obj/NiSkinInstance.cpp b/obj/NiSkinInstance.cpp
index d3b3ef12dda8cc5a4eface469b943945d4b3d3cb..ed286738be7639fd3628d4497e4997b85d667a67 100644
--- a/obj/NiSkinInstance.cpp
+++ b/obj/NiSkinInstance.cpp
@@ -6,7 +6,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiSkinData.h"
 #include "NiSkinPartition.h"
 #include "NiNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSkinInstance::TYPE("NiSkinInstance", &NI_SKIN_INSTANCE_PARENT::TypeConst() );
diff --git a/obj/NiSkinInstance.h b/obj/NiSkinInstance.h
index 505b46f141fc4429b072c1eadd4661b7a0689932..7f987936062a7d76f709a118ab652c58c3880f2c 100644
--- a/obj/NiSkinInstance.h
+++ b/obj/NiSkinInstance.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiSkinData;
diff --git a/obj/NiSkinPartition.cpp b/obj/NiSkinPartition.cpp
index 1ea2a51bda68fc283bd9df1e9cc3c2ae9970c9ea..58e9daf2a2a8271610d64544478bdbc9d8ad4afd 100644
--- a/obj/NiSkinPartition.cpp
+++ b/obj/NiSkinPartition.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiSkinPartition.h"
 #include "../gen/SkinPartition.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSkinPartition::TYPE("NiSkinPartition", &NI_SKIN_PARTITION_PARENT::TypeConst() );
diff --git a/obj/NiSkinPartition.h b/obj/NiSkinPartition.h
index 34d2683024f17e6e426360f4af4628a3f4d0f10c..e78de6bb5e81cd12f25a137009fb3df5335ef789 100644
--- a/obj/NiSkinPartition.h
+++ b/obj/NiSkinPartition.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/SkinPartition.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiSourceTexture.cpp b/obj/NiSourceTexture.cpp
index 1dff2968cd608638e91c0f70421e895d55a3a5be..e2b0a699ba32cc26e2072992aa50fe66cf84d700 100644
--- a/obj/NiSourceTexture.cpp
+++ b/obj/NiSourceTexture.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiSourceTexture.h"
 #include "NiObject.h"
 #include "NiPixelData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSourceTexture::TYPE("NiSourceTexture", &NI_SOURCE_TEXTURE_PARENT::TypeConst() );
diff --git a/obj/NiSourceTexture.h b/obj/NiSourceTexture.h
index 949abc9a1d5f668d2e005a3c0dea1a751060462c..004cc68fa3e8259d0668e5f0f027b3cfe687eb8e 100644
--- a/obj/NiSourceTexture.h
+++ b/obj/NiSourceTexture.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/obj/NiSpecularProperty.cpp b/obj/NiSpecularProperty.cpp
index 08c75fe28803047b7fd78aab4538586dc9c7ff04..c101f7035bd11a024fc019e49155d7d7d0b17ec4 100644
--- a/obj/NiSpecularProperty.cpp
+++ b/obj/NiSpecularProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiSpecularProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSpecularProperty::TYPE("NiSpecularProperty", &NI_SPECULAR_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiSpecularProperty.h b/obj/NiSpecularProperty.h
index 6570344f19a42bcac25d12109353348ceabeee76..7152e0a6ab5faff67ff01d9d7b86470f500deb55 100644
--- a/obj/NiSpecularProperty.h
+++ b/obj/NiSpecularProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISPECULARPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiSphericalCollider.cpp b/obj/NiSphericalCollider.cpp
index c970da86e0e5392f33ca1c99f80a5ca66770ee81..be7cb337c246ce42de0747e0fe76ee805f276604 100644
--- a/obj/NiSphericalCollider.cpp
+++ b/obj/NiSphericalCollider.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiSphericalCollider.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSphericalCollider::TYPE("NiSphericalCollider", &NI_SPHERICAL_COLLIDER_PARENT::TypeConst() );
diff --git a/obj/NiSphericalCollider.h b/obj/NiSphericalCollider.h
index 4669ef48d0d97a953dbb79ecc2d19f094fdf2438..03f8a904611744ddfa152c9d99512d4e98ed3ff9 100644
--- a/obj/NiSphericalCollider.h
+++ b/obj/NiSphericalCollider.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISPHERICALCOLLIDER_H_
 
 #include "AParticleModifier.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiSpotLight.cpp b/obj/NiSpotLight.cpp
index 3ecfadf2c16a61dfdf9afda13c6459d62b1583ed..d0a5740b92089ed14120f46beaa38ef54cd882e3 100644
--- a/obj/NiSpotLight.cpp
+++ b/obj/NiSpotLight.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiSpotLight.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiSpotLight::TYPE("NiSpotLight", &NI_SPOT_LIGHT_PARENT::TypeConst() );
diff --git a/obj/NiSpotLight.h b/obj/NiSpotLight.h
index ffaa12c79aef295a947f46743e73e99268d5bad2..00b47d28ae75074937c1a67707b494c9999a7c8b 100644
--- a/obj/NiSpotLight.h
+++ b/obj/NiSpotLight.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISPOTLIGHT_H_
 
 #include "NiPointLight.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiStencilProperty.cpp b/obj/NiStencilProperty.cpp
index 56f667b62670c4e95fc41fdedce4b526a57759f0..876122f85e28699f2422fb5fd9e95889aebfe10a 100644
--- a/obj/NiStencilProperty.cpp
+++ b/obj/NiStencilProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiStencilProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiStencilProperty::TYPE("NiStencilProperty", &NI_STENCIL_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiStencilProperty.h b/obj/NiStencilProperty.h
index ff5c92d7398cb8dccc49fe1446c64b213bfd35c8..a0af351a8c60e88fbf29159e5dae8ef0249e4480 100644
--- a/obj/NiStencilProperty.h
+++ b/obj/NiStencilProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISTENCILPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiStringExtraData.cpp b/obj/NiStringExtraData.cpp
index 91b29c5715b91343daa1e2a9780263eae777149e..71ef07a4a4ffa2113a3f841441515ea6208a3b79 100644
--- a/obj/NiStringExtraData.cpp
+++ b/obj/NiStringExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiStringExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiStringExtraData::TYPE("NiStringExtraData", &NI_STRING_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiStringExtraData.h b/obj/NiStringExtraData.h
index 5e88d0c87eeb33352b810988374cf93e5f0351f7..6f379b2ad03b43d4a8ed5e96016e59ddbd1830ca 100644
--- a/obj/NiStringExtraData.h
+++ b/obj/NiStringExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISTRINGEXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiStringPalette.cpp b/obj/NiStringPalette.cpp
index 3d0e42300682e6d249b332b980dce259814b67b3..e56baf2696c2f212877cc3525aa5a6ff71441eab 100644
--- a/obj/NiStringPalette.cpp
+++ b/obj/NiStringPalette.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiStringPalette.h"
 #include "../gen/StringPalette.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiStringPalette::TYPE("NiStringPalette", &NI_STRING_PALETTE_PARENT::TypeConst() );
diff --git a/obj/NiStringPalette.h b/obj/NiStringPalette.h
index c84b999e647ceb36e19cf5c484a2e10b511fa65a..628f0a472bcab3bd090545e0a87c255539085610 100644
--- a/obj/NiStringPalette.h
+++ b/obj/NiStringPalette.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/StringPalette.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiStringsExtraData.cpp b/obj/NiStringsExtraData.cpp
index 6686da5679677ca8209557f019d414944e516b8d..4bca39178026c8b8bfb79f2a67453b1b2a27b37b 100644
--- a/obj/NiStringsExtraData.cpp
+++ b/obj/NiStringsExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiStringsExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiStringsExtraData::TYPE("NiStringsExtraData", &NI_STRINGS_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiStringsExtraData.h b/obj/NiStringsExtraData.h
index cab7795e4ff7dcd037221403761d370ac6b472ad..07131e1b8dd295672080121011c421da9f0336f2 100644
--- a/obj/NiStringsExtraData.h
+++ b/obj/NiStringsExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NISTRINGSEXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiTextKeyExtraData.cpp b/obj/NiTextKeyExtraData.cpp
index 71f743d12a6bf99d8244cecea457680434826bc3..1330e89977b99762e3a1131795e69ac38ab6b840 100644
--- a/obj/NiTextKeyExtraData.cpp
+++ b/obj/NiTextKeyExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTextKeyExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTextKeyExtraData::TYPE("NiTextKeyExtraData", &NI_TEXT_KEY_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiTextKeyExtraData.h b/obj/NiTextKeyExtraData.h
index ddeab50d2bbffc660fc9f932b77be97ba776c8a5..69c309d80dd76287bf9509469ad97a073fa2fa91 100644
--- a/obj/NiTextKeyExtraData.h
+++ b/obj/NiTextKeyExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NITEXTKEYEXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiTextureEffect.cpp b/obj/NiTextureEffect.cpp
index 1da9ca111ab9fbd8808d588b6ff77fbe883d8a30..89700ab02f88bab9e2f4cb61a5d86943e533a4b7 100644
--- a/obj/NiTextureEffect.cpp
+++ b/obj/NiTextureEffect.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTextureEffect.h"
 #include "NiSourceTexture.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTextureEffect::TYPE("NiTextureEffect", &NI_TEXTURE_EFFECT_PARENT::TypeConst() );
diff --git a/obj/NiTextureEffect.h b/obj/NiTextureEffect.h
index e6698f4fcb8bf79b8ecd2982344d52fefc478154..a9e39093606c2a482fb36752bf39ec64d780c1b5 100644
--- a/obj/NiTextureEffect.h
+++ b/obj/NiTextureEffect.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiSourceTexture;
diff --git a/obj/NiTextureTransformController.cpp b/obj/NiTextureTransformController.cpp
index 9b0fc734de0b94bc30182d32a8e41cdd8039f7f3..9e29d019b9be85dadfd5e8cf0d5e38296bd61870 100644
--- a/obj/NiTextureTransformController.cpp
+++ b/obj/NiTextureTransformController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTextureTransformController.h"
 #include "NiFloatData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTextureTransformController::TYPE("NiTextureTransformController", &NI_TEXTURE_TRANSFORM_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiTextureTransformController.h b/obj/NiTextureTransformController.h
index 440bbd7640b2a9522e47ea2b6a97d9ca2d459354..dd6c72277095fbb5deb1c99eef9cf704d035e743 100644
--- a/obj/NiTextureTransformController.h
+++ b/obj/NiTextureTransformController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiFloatData;
diff --git a/obj/NiTexturingProperty.cpp b/obj/NiTexturingProperty.cpp
index 857381d9f08c7e9fb0e86ab473adc7f4a8c6b928..584dee3060b20deaef6b93814dc39990a2b7b905 100644
--- a/obj/NiTexturingProperty.cpp
+++ b/obj/NiTexturingProperty.cpp
@@ -21,7 +21,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../gen/ShaderTexDesc.h"
 #include "../gen/TexDesc.h"
 #include "NiSourceTexture.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTexturingProperty::TYPE("NiTexturingProperty", &NI_TEXTURING_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiTexturingProperty.h b/obj/NiTexturingProperty.h
index 0b270e8c2c7739ec60ab0c22ae782ab736da3126..21e75bece8f67b75ee2364fe7108963b675a939a 100644
--- a/obj/NiTexturingProperty.h
+++ b/obj/NiTexturingProperty.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 // Include structures
 #include "../gen/TexDesc.h"
 #include "../gen/ShaderTexDesc.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiTimeController.cpp b/obj/NiTimeController.cpp
index d3594a552ea7d8e127febc42bf56f523612fdbc2..b3380ddd09fab76d0c07fae1f84ba547d3cb99cb 100644
--- a/obj/NiTimeController.cpp
+++ b/obj/NiTimeController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTimeController.h"
 #include "NiObjectNET.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTimeController::TYPE("NiTimeController", &NI_TIME_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiTimeController.h b/obj/NiTimeController.h
index 77aa610167b9d8770976cda5ab9714610aa8ea25..b4c8386384b9eeec7806c42769e63b2e105f2cac 100644
--- a/obj/NiTimeController.h
+++ b/obj/NiTimeController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 class NiObject;
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiTransformController.cpp b/obj/NiTransformController.cpp
index 064fa05b544dcafd35d2d8aac8a1c8570861af2d..873bf3309ab8f0d7eb95574dd1ee166ff22aa794 100644
--- a/obj/NiTransformController.cpp
+++ b/obj/NiTransformController.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTransformController.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTransformController::TYPE("NiTransformController", &NI_TRANSFORM_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiTransformController.h b/obj/NiTransformController.h
index 8bdf73c2042f80c9420426893db23c46b261ebeb..ffe96b05f401eba9a7c824c229b5df9a12ee7b5d 100644
--- a/obj/NiTransformController.h
+++ b/obj/NiTransformController.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NITRANSFORMCONTROLLER_H_
 
 #include "NiSingleInterpolatorController.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiTransformData.cpp b/obj/NiTransformData.cpp
index 1c90141cffbc8d7efad1a5f16e4162e0fc4ecd14..a0d20afb771defd0cc51d14c0eeebb331a93a923 100644
--- a/obj/NiTransformData.cpp
+++ b/obj/NiTransformData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTransformData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTransformData::TYPE("NiTransformData", &NI_TRANSFORM_DATA_PARENT::TypeConst() );
diff --git a/obj/NiTransformData.h b/obj/NiTransformData.h
index 8675dd078faa31e5879f8b1a13c83ca1cb56600d..59570cf3b9fb681fc7929db71917b34dceb19a43 100644
--- a/obj/NiTransformData.h
+++ b/obj/NiTransformData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NITRANSFORMDATA_H_
 
 #include "NiKeyframeData.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiTransformInterpolator.cpp b/obj/NiTransformInterpolator.cpp
index 494d3ba1a867aae3919dc32a6eadff951e5f713e..5ca0076990b78d4cc36361311191f38c0f35d864 100644
--- a/obj/NiTransformInterpolator.cpp
+++ b/obj/NiTransformInterpolator.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTransformInterpolator.h"
 #include "NiTransformData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTransformInterpolator::TYPE("NiTransformInterpolator", &NI_TRANSFORM_INTERPOLATOR_PARENT::TypeConst() );
diff --git a/obj/NiTransformInterpolator.h b/obj/NiTransformInterpolator.h
index e1a54d1dd412cbeb4fd307608d5c8adaae09db25..746207ad74acdebb71b507bdcd53582d17696a3b 100644
--- a/obj/NiTransformInterpolator.h
+++ b/obj/NiTransformInterpolator.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiTransformData;
diff --git a/obj/NiTriBasedGeom.cpp b/obj/NiTriBasedGeom.cpp
index 2df124d32ec9fe5df99e571e5a13e25e6d1b99d0..b31a87a9a55128f6cd39403d7e0a86d808eb5984 100644
--- a/obj/NiTriBasedGeom.cpp
+++ b/obj/NiTriBasedGeom.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTriBasedGeomData.h"
 #include "NiSkinInstance.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTriBasedGeom::TYPE("NiTriBasedGeom", &NI_TRI_BASED_GEOM_PARENT::TypeConst() );
diff --git a/obj/NiTriBasedGeom.h b/obj/NiTriBasedGeom.h
index f3be77db25123193e9dd69c8218cb23c053d9d73..5a94c1fde15c8209d26086f59b6efdacdae70b2b 100644
--- a/obj/NiTriBasedGeom.h
+++ b/obj/NiTriBasedGeom.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiTriBasedGeomData;
diff --git a/obj/NiTriBasedGeomData.cpp b/obj/NiTriBasedGeomData.cpp
index 563e5a06b503cade49f244ca6bc90c47a964dce2..4fb0a720f6d307e14d4d9b482382448485e1064b 100644
--- a/obj/NiTriBasedGeomData.cpp
+++ b/obj/NiTriBasedGeomData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriBasedGeomData.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTriBasedGeomData::TYPE("NiTriBasedGeomData", &NI_TRI_BASED_GEOM_DATA_PARENT::TypeConst() );
diff --git a/obj/NiTriBasedGeomData.h b/obj/NiTriBasedGeomData.h
index 159101773d0c2e8d48841e61d00a1dc75b66cd58..686b2910a5af2e9cec77da691807aae67eed7230 100644
--- a/obj/NiTriBasedGeomData.h
+++ b/obj/NiTriBasedGeomData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/obj/NiTriShape.cpp b/obj/NiTriShape.cpp
index 88f941cca0dd04ce4387e0424a00f11f70f04202..534dc1b79e816017314914c09f96c3d04d360ce5 100644
--- a/obj/NiTriShape.cpp
+++ b/obj/NiTriShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTriShape::TYPE("NiTriShape", &NI_TRI_SHAPE_PARENT::TypeConst() );
diff --git a/obj/NiTriShape.h b/obj/NiTriShape.h
index 1b9b6654783e9e0702b197056c4237b3ffc82895..59ed973ab6a7fb6910bc680d3118e97a2231f90c 100644
--- a/obj/NiTriShape.h
+++ b/obj/NiTriShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NITRISHAPE_H_
 
 #include "NiTriBasedGeom.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiTriShapeData.cpp b/obj/NiTriShapeData.cpp
index 3fc8df77589e4af299dadc3c5a49b9e30bcd56d0..5071c47a05a21eafbc62e9939f87299200b2fd83 100644
--- a/obj/NiTriShapeData.cpp
+++ b/obj/NiTriShapeData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriShapeData.h"
 #include "../gen/MatchGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTriShapeData::TYPE("NiTriShapeData", &NI_TRI_SHAPE_DATA_PARENT::TypeConst() );
diff --git a/obj/NiTriShapeData.h b/obj/NiTriShapeData.h
index b07221cffb29cd169180bcf5e28d4e8e41cd1041..2fbe11f9f53cd226c75d30ee6937eec85b92f0ba 100644
--- a/obj/NiTriShapeData.h
+++ b/obj/NiTriShapeData.h
@@ -7,7 +7,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "NiTriBasedGeomData.h"
 // Include structures
 #include "../gen/MatchGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiTriStrips.cpp b/obj/NiTriStrips.cpp
index eb8b16d28d5f61dadd68893e46df8a22b349178b..7f1be51add23e13f83529270349486e6327ee1e0 100644
--- a/obj/NiTriStrips.cpp
+++ b/obj/NiTriStrips.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriStrips.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTriStrips::TYPE("NiTriStrips", &NI_TRI_STRIPS_PARENT::TypeConst() );
diff --git a/obj/NiTriStrips.h b/obj/NiTriStrips.h
index 5491e4dc4ee5c7881efd366d8b83b78feba03bab..881327a240e13aae421655293d745b521ed27c0a 100644
--- a/obj/NiTriStrips.h
+++ b/obj/NiTriStrips.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NITRISTRIPS_H_
 
 #include "NiTriBasedGeom.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiTriStripsData.cpp b/obj/NiTriStripsData.cpp
index 39bdc12c9b7a9b270c23a41b7454d6ee6cdb1a74..9f37affa9cd01b42380f9f5caa9c333e6aa0b2e3 100644
--- a/obj/NiTriStripsData.cpp
+++ b/obj/NiTriStripsData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiTriStripsData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiTriStripsData::TYPE("NiTriStripsData", &NI_TRI_STRIPS_DATA_PARENT::TypeConst() );
diff --git a/obj/NiTriStripsData.h b/obj/NiTriStripsData.h
index eb200c83b816b9ea2de9addfcb4d837cc99b88ad..76f33a93361b9fe6d50e0e152276fed97d8d3e79 100644
--- a/obj/NiTriStripsData.h
+++ b/obj/NiTriStripsData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NITRISTRIPSDATA_H_
 
 #include "NiTriBasedGeomData.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiUVController.cpp b/obj/NiUVController.cpp
index 789610d0637ced16ddea6c695341a81459cee41d..26fab006b2aeaac4733047fd2d7d74f173bb170e 100644
--- a/obj/NiUVController.cpp
+++ b/obj/NiUVController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiUVController.h"
 #include "NiUVData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiUVController::TYPE("NiUVController", &NI_U_V_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiUVController.h b/obj/NiUVController.h
index e067abc1be1e6dfd32a36bc2e6c3d7df3d42e978..3f2f868f8c3c077bade221f7ab176f2f4fce88e7 100644
--- a/obj/NiUVController.h
+++ b/obj/NiUVController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiUVData;
diff --git a/obj/NiUVData.cpp b/obj/NiUVData.cpp
index 63d1d4bf16c8b1561f318c6215a300abf126590b..d12497bfec7d5b955478b52a34cdefb8a00f0f0c 100644
--- a/obj/NiUVData.cpp
+++ b/obj/NiUVData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiUVData.h"
 #include "../gen/KeyGroup.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiUVData::TYPE("NiUVData", &NI_U_V_DATA_PARENT::TypeConst() );
diff --git a/obj/NiUVData.h b/obj/NiUVData.h
index 71edba3e0df946128bfc6821d621ead619ba2635..7861801076499daf3fe2ec973c5e3fd0cf9eee24 100644
--- a/obj/NiUVData.h
+++ b/obj/NiUVData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/KeyGroup.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/NiVectorExtraData.cpp b/obj/NiVectorExtraData.cpp
index f66da2925523693af0614d773efeae0968267d17..c93a0d1ad409cc2c3d236a1033c686a8f0bdde85 100644
--- a/obj/NiVectorExtraData.cpp
+++ b/obj/NiVectorExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiVectorExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiVectorExtraData::TYPE("NiVectorExtraData", &NI_VECTOR_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiVectorExtraData.h b/obj/NiVectorExtraData.h
index 63143d66524c0f09204302691d23796a393d7172..a68b8cd82346d914cdd819e16ec0e4142e869d45 100644
--- a/obj/NiVectorExtraData.h
+++ b/obj/NiVectorExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIVECTOREXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiVertWeightsExtraData.cpp b/obj/NiVertWeightsExtraData.cpp
index d729fb2a5fd6fcc54a4930e6a2636c76369357bc..315a56f2fa4d22e855ce03e310b25abbc01505f6 100644
--- a/obj/NiVertWeightsExtraData.cpp
+++ b/obj/NiVertWeightsExtraData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiVertWeightsExtraData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiVertWeightsExtraData::TYPE("NiVertWeightsExtraData", &NI_VERT_WEIGHTS_EXTRA_DATA_PARENT::TypeConst() );
diff --git a/obj/NiVertWeightsExtraData.h b/obj/NiVertWeightsExtraData.h
index 03b9976c4c4c6a859f83285af50e8b63d43f1b58..e8bf76824f63c98667cce945e13424e0e2f56450 100644
--- a/obj/NiVertWeightsExtraData.h
+++ b/obj/NiVertWeightsExtraData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIVERTWEIGHTSEXTRADATA_H_
 
 #include "NiExtraData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiVertexColorProperty.cpp b/obj/NiVertexColorProperty.cpp
index 92150e6292ce20be96ea08c2e912725de5c26560..93f1fe166c32c42428d6fd2bfd274b4d40d73ad5 100644
--- a/obj/NiVertexColorProperty.cpp
+++ b/obj/NiVertexColorProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiVertexColorProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiVertexColorProperty::TYPE("NiVertexColorProperty", &NI_VERTEX_COLOR_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiVertexColorProperty.h b/obj/NiVertexColorProperty.h
index cf92dac722a2595d222884d3aba1affdba19e53e..8d8847fba5bdf906a8913569c755e9fbffaa423b 100644
--- a/obj/NiVertexColorProperty.h
+++ b/obj/NiVertexColorProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIVERTEXCOLORPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiVisController.cpp b/obj/NiVisController.cpp
index f8021234403a1bbf5814cf558883648960265d76..1c476b60753a65150e04313851656b4529f5b3d9 100644
--- a/obj/NiVisController.cpp
+++ b/obj/NiVisController.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiVisController.h"
 #include "NiVisData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiVisController::TYPE("NiVisController", &NI_VIS_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/NiVisController.h b/obj/NiVisController.h
index 4ada2a09a8c757bc51ad4d29fde28e6807c538d5..cf2d07d74d4c6a92a41e20c5f477028b56cf84c4 100644
--- a/obj/NiVisController.h
+++ b/obj/NiVisController.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiVisData;
diff --git a/obj/NiVisData.cpp b/obj/NiVisData.cpp
index 4ead3db73c53ed072f3ea24ff06d8dc4e808e08e..0269926280d1b234765b6412beb474f745268e94 100644
--- a/obj/NiVisData.cpp
+++ b/obj/NiVisData.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiVisData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiVisData::TYPE("NiVisData", &NI_VIS_DATA_PARENT::TypeConst() );
diff --git a/obj/NiVisData.h b/obj/NiVisData.h
index 65503d5f4fdf1f9662bb0c3fa0d4c87e7a3ee7ea..79b8a0c870239995e04a59b566ac02e3910cbadd 100644
--- a/obj/NiVisData.h
+++ b/obj/NiVisData.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIVISDATA_H_
 
 #include "AKeyedData.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiWireframeProperty.cpp b/obj/NiWireframeProperty.cpp
index 4ba168bcb381e29c64930330c9f55b46f1667f1e..b546644e30f4c22b2fbccd9cf40d5331f43a4ca0 100644
--- a/obj/NiWireframeProperty.cpp
+++ b/obj/NiWireframeProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiWireframeProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiWireframeProperty::TYPE("NiWireframeProperty", &NI_WIREFRAME_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiWireframeProperty.h b/obj/NiWireframeProperty.h
index 8ccc94a117921f38c128888e2b5a7c3d01cc96fe..921ce33de23ab27853222904677c97b563c977af 100644
--- a/obj/NiWireframeProperty.h
+++ b/obj/NiWireframeProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIWIREFRAMEPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/NiZBufferProperty.cpp b/obj/NiZBufferProperty.cpp
index bf0f25d22e533fda564f73ec478c24d6c64b85e7..5e55f199d0750ecda2ad1b129fada033df46089f 100644
--- a/obj/NiZBufferProperty.cpp
+++ b/obj/NiZBufferProperty.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "NiZBufferProperty.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type NiZBufferProperty::TYPE("NiZBufferProperty", &NI_Z_BUFFER_PROPERTY_PARENT::TypeConst() );
diff --git a/obj/NiZBufferProperty.h b/obj/NiZBufferProperty.h
index 61fa23fb3c2fbda9c6adc3fcdb9b1095b1b154a5..3db123dd56ae0b844dbfecb5a81dea2e234a561f 100644
--- a/obj/NiZBufferProperty.h
+++ b/obj/NiZBufferProperty.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _NIZBUFFERPROPERTY_H_
 
 #include "NiProperty.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/RootCollisionNode.cpp b/obj/RootCollisionNode.cpp
index 8251858d78d4446b8d11ea506745ac0d04654636..c25f82a73a52ce713a69442716b911d4d2b250c8 100644
--- a/obj/RootCollisionNode.cpp
+++ b/obj/RootCollisionNode.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "RootCollisionNode.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type RootCollisionNode::TYPE("RootCollisionNode", &ROOT_COLLISION_NODE_PARENT::TypeConst() );
diff --git a/obj/RootCollisionNode.h b/obj/RootCollisionNode.h
index 5a7830e2542378d8fc6bd4310011861288172622..b452ae3201fe8b64b84fc3f64831ba2b7e2686dc 100644
--- a/obj/RootCollisionNode.h
+++ b/obj/RootCollisionNode.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _ROOTCOLLISIONNODE_H_
 
 #include "NiNode.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkBlendCollisionObject.cpp b/obj/bhkBlendCollisionObject.cpp
index d8c9fd7e60797f5ab977e1a7ec4c0b7e09894b06..af9667a879eae730b5fbe380976905b1d9ff0573 100644
--- a/obj/bhkBlendCollisionObject.cpp
+++ b/obj/bhkBlendCollisionObject.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkBlendCollisionObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkBlendCollisionObject::TYPE("bhkBlendCollisionObject", &BHK_BLEND_COLLISION_OBJECT_PARENT::TypeConst() );
diff --git a/obj/bhkBlendCollisionObject.h b/obj/bhkBlendCollisionObject.h
index cc20d7e729b0770d21ed8cae6a39219ea11132d0..aabb57288b82b115d1c5f9b480aa7b00166ca133 100644
--- a/obj/bhkBlendCollisionObject.h
+++ b/obj/bhkBlendCollisionObject.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKBLENDCOLLISIONOBJECT_H_
 
 #include "NiCollisionObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkBlendController.cpp b/obj/bhkBlendController.cpp
index a2e7a3363629796e2fbd608e29fde36d6c64164c..24f9802d0933d5cfd9def4c64ad4103541e96c69 100644
--- a/obj/bhkBlendController.cpp
+++ b/obj/bhkBlendController.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkBlendController.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkBlendController::TYPE("bhkBlendController", &BHK_BLEND_CONTROLLER_PARENT::TypeConst() );
diff --git a/obj/bhkBlendController.h b/obj/bhkBlendController.h
index c5de9d9e6504d712ffb92e8546a4409534fd610a..b7d2fa8b6ea9fe25112cbe99e48d56fe5d8d4dbe 100644
--- a/obj/bhkBlendController.h
+++ b/obj/bhkBlendController.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKBLENDCONTROLLER_H_
 
 #include "NiTimeController.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkBoxShape.cpp b/obj/bhkBoxShape.cpp
index 02a3600db283b706a35cd1bdaeb654cca02c7f72..9d6670e5f0b2ee4b6e3a27316e8f7c8f32a31ddc 100644
--- a/obj/bhkBoxShape.cpp
+++ b/obj/bhkBoxShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkBoxShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkBoxShape::TYPE("bhkBoxShape", &BHK_BOX_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkBoxShape.h b/obj/bhkBoxShape.h
index f3e30cfc2b0945379a9982730c9aee8e2745dab8..8bdea853d74d91f111592236ce57b698a119caa1 100644
--- a/obj/bhkBoxShape.h
+++ b/obj/bhkBoxShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKBOXSHAPE_H_
 
 #include "bhkConvexShape.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/bhkCapsuleShape.cpp b/obj/bhkCapsuleShape.cpp
index ab1fe776c960ad47507cc967e07d55cb4e24de6e..dc640016106e338fc44ba75bfb6637b0be252fd3 100644
--- a/obj/bhkCapsuleShape.cpp
+++ b/obj/bhkCapsuleShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkCapsuleShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkCapsuleShape::TYPE("bhkCapsuleShape", &BHK_CAPSULE_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkCapsuleShape.h b/obj/bhkCapsuleShape.h
index 293c410acc7ac06e3ccc55a48ab45f1f89c0722f..c8850e146654e2e8137f39da348990aa5c17bbea 100644
--- a/obj/bhkCapsuleShape.h
+++ b/obj/bhkCapsuleShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKCAPSULESHAPE_H_
 
 #include "bhkConvexShape.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/bhkCollisionObject.cpp b/obj/bhkCollisionObject.cpp
index 257e53bd3b4052238ff7af8f5152578a9a3a058b..73f35d53756a858b3620bc4715bc4a9fa3ea6e74 100644
--- a/obj/bhkCollisionObject.cpp
+++ b/obj/bhkCollisionObject.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkCollisionObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkCollisionObject::TYPE("bhkCollisionObject", &BHK_COLLISION_OBJECT_PARENT::TypeConst() );
diff --git a/obj/bhkCollisionObject.h b/obj/bhkCollisionObject.h
index 1fc349b7198f0fe64f7771192938659da66b6cd6..58dcbfd7e44e1ec1bcdffa774fb65e589964daee 100644
--- a/obj/bhkCollisionObject.h
+++ b/obj/bhkCollisionObject.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKCOLLISIONOBJECT_H_
 
 #include "NiCollisionObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkConvexShape.cpp b/obj/bhkConvexShape.cpp
index 49c9398ce0414e9468d2266673c33d1754ae2677..367a5c52f4f11e7bf6adc08526a46b3f0caed302 100644
--- a/obj/bhkConvexShape.cpp
+++ b/obj/bhkConvexShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkConvexShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkConvexShape::TYPE("bhkConvexShape", &BHK_CONVEX_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkConvexShape.h b/obj/bhkConvexShape.h
index eed56e669ae0d266cc8fffb1e28721477a05d2c2..dd9f70bb39beeedae7997bde0b3d8502b04ef7d1 100644
--- a/obj/bhkConvexShape.h
+++ b/obj/bhkConvexShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKCONVEXSHAPE_H_
 
 #include "bhkSphereRepShape.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkConvexTransformShape.cpp b/obj/bhkConvexTransformShape.cpp
index 8c5a32a5a50a5fe3d9754bcf31602610b2572f04..c5c26ffc51b11895324aa8f057f427eefd7703b6 100644
--- a/obj/bhkConvexTransformShape.cpp
+++ b/obj/bhkConvexTransformShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkConvexTransformShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkConvexTransformShape::TYPE("bhkConvexTransformShape", &BHK_CONVEX_TRANSFORM_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkConvexTransformShape.h b/obj/bhkConvexTransformShape.h
index ca96d565b9c889ad449e28990b39e7bf959d4381..075716179efd2b0fec7f408186c19c51d9798d17 100644
--- a/obj/bhkConvexTransformShape.h
+++ b/obj/bhkConvexTransformShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKCONVEXTRANSFORMSHAPE_H_
 
 #include "bhkTransformShape.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkConvexVerticesShape.cpp b/obj/bhkConvexVerticesShape.cpp
index 380923cef07684dc8f3b77fb3e9982240bc831c1..ad52851bed880d3dcd59455cf7ea4a8fa73ff288 100644
--- a/obj/bhkConvexVerticesShape.cpp
+++ b/obj/bhkConvexVerticesShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkConvexVerticesShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkConvexVerticesShape::TYPE("bhkConvexVerticesShape", &BHK_CONVEX_VERTICES_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkConvexVerticesShape.h b/obj/bhkConvexVerticesShape.h
index 710fc63801f938d51648f86dde29f4a6fa7d86ea..962a3a4016a729494b20bcaeb7faed373b7a0a56 100644
--- a/obj/bhkConvexVerticesShape.h
+++ b/obj/bhkConvexVerticesShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKCONVEXVERTICESSHAPE_H_
 
 #include "bhkSphereRepShape.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkEntity.cpp b/obj/bhkEntity.cpp
index acc9a21c82b2491da810c7190438d6fa373ed58a..b2463e4a5a8cb8bbff1beb9d708b9504e2cbcb23 100644
--- a/obj/bhkEntity.cpp
+++ b/obj/bhkEntity.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkEntity.h"
 #include "bhkShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkEntity::TYPE("bhkEntity", &BHK_ENTITY_PARENT::TypeConst() );
diff --git a/obj/bhkEntity.h b/obj/bhkEntity.h
index 6ded32d49bd37840259d602bb053c98acd95078e..339d31d6c80ff8add8f70e25e8d90dea93c74c8f 100644
--- a/obj/bhkEntity.h
+++ b/obj/bhkEntity.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class bhkShape;
diff --git a/obj/bhkHingeConstraint.cpp b/obj/bhkHingeConstraint.cpp
index 726f1b926479425372e516ade5ea19bb85b71b62..f71b19d0f470b3ac3de0eca15b6072407efda9db 100644
--- a/obj/bhkHingeConstraint.cpp
+++ b/obj/bhkHingeConstraint.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkHingeConstraint.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkHingeConstraint::TYPE("bhkHingeConstraint", &BHK_HINGE_CONSTRAINT_PARENT::TypeConst() );
diff --git a/obj/bhkHingeConstraint.h b/obj/bhkHingeConstraint.h
index f59c33fe8a7dca74e75a230782f2248e3e24eea5..e55558bb766d45f5706c7bf40375fd4d1178cc69 100644
--- a/obj/bhkHingeConstraint.h
+++ b/obj/bhkHingeConstraint.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKHINGECONSTRAINT_H_
 
 #include "AbhkConstraint.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkLimitedHingeConstraint.cpp b/obj/bhkLimitedHingeConstraint.cpp
index 1a67af5768a452ed733177bdb4ff6b16cc20c6e6..9795ffdf160e287f55fe943617c2be445be4bbf4 100644
--- a/obj/bhkLimitedHingeConstraint.cpp
+++ b/obj/bhkLimitedHingeConstraint.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkLimitedHingeConstraint.h"
 #include "../gen/LimitedHingeDescriptor.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkLimitedHingeConstraint::TYPE("bhkLimitedHingeConstraint", &BHK_LIMITED_HINGE_CONSTRAINT_PARENT::TypeConst() );
diff --git a/obj/bhkLimitedHingeConstraint.h b/obj/bhkLimitedHingeConstraint.h
index 6b5b4c40d5c8567d809fcf3dbaa7471f4f58d7e5..050faafea5c3289a02c295c8f020afebc924e9de 100644
--- a/obj/bhkLimitedHingeConstraint.h
+++ b/obj/bhkLimitedHingeConstraint.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/LimitedHingeDescriptor.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/bhkListShape.cpp b/obj/bhkListShape.cpp
index d60195bd280381e34a4923f2df3e70d948262f75..d280f6a5282a89500353de931a1418e614bb9571 100644
--- a/obj/bhkListShape.cpp
+++ b/obj/bhkListShape.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkListShape.h"
 #include "bhkShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkListShape::TYPE("bhkListShape", &BHK_LIST_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkListShape.h b/obj/bhkListShape.h
index e4545939d653d71ea4304d00283a8f6317754be9..cf0f85fb405d3442bc7e48c52829c570786f217c 100644
--- a/obj/bhkListShape.h
+++ b/obj/bhkListShape.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class bhkShape;
diff --git a/obj/bhkMalleableConstraint.cpp b/obj/bhkMalleableConstraint.cpp
index 713742fb8291d16beeb527d4e57b9a5a7614c482..51eb0eff79a2fb50263af2da798aff0d7fd0e45f 100644
--- a/obj/bhkMalleableConstraint.cpp
+++ b/obj/bhkMalleableConstraint.cpp
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../gen/RagDollDescriptor.h"
 #include "../gen/LimitedHingeDescriptor.h"
 #include "NiObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkMalleableConstraint::TYPE("bhkMalleableConstraint", &BHK_MALLEABLE_CONSTRAINT_PARENT::TypeConst() );
diff --git a/obj/bhkMalleableConstraint.h b/obj/bhkMalleableConstraint.h
index a1572d7ff52c8f6a47311b53619bac36c730ba78..af3b0bdf5b5b72114afa1797fd8a632c02643fdf 100644
--- a/obj/bhkMalleableConstraint.h
+++ b/obj/bhkMalleableConstraint.h
@@ -10,7 +10,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "../Ref.h"
 #include "../gen/RagDollDescriptor.h"
 #include "../gen/LimitedHingeDescriptor.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiObject;
diff --git a/obj/bhkMoppBvTreeShape.cpp b/obj/bhkMoppBvTreeShape.cpp
index 94159ae957ea62819256690055a095935745454b..64c2c4465adf504e163d4c6530746f75993a5d07 100644
--- a/obj/bhkMoppBvTreeShape.cpp
+++ b/obj/bhkMoppBvTreeShape.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkMoppBvTreeShape.h"
 #include "bhkShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkMoppBvTreeShape::TYPE("bhkMoppBvTreeShape", &BHK_MOPP_BV_TREE_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkMoppBvTreeShape.h b/obj/bhkMoppBvTreeShape.h
index b3628b7b070f7b6dd830ca2fecea88d05637a4d1..e827533b9088cca0f2dccac605e8b3398f3ebdcb 100644
--- a/obj/bhkMoppBvTreeShape.h
+++ b/obj/bhkMoppBvTreeShape.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class bhkShape;
diff --git a/obj/bhkMultiSphereShape.cpp b/obj/bhkMultiSphereShape.cpp
index c947718c8b8a6428d01147683560b15e58414302..ee9e7df49d85f7935a12807d25c35fef56c0443f 100644
--- a/obj/bhkMultiSphereShape.cpp
+++ b/obj/bhkMultiSphereShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkMultiSphereShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkMultiSphereShape::TYPE("bhkMultiSphereShape", &BHK_MULTI_SPHERE_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkMultiSphereShape.h b/obj/bhkMultiSphereShape.h
index 1d6305242c0b8130c1ca468c7bcf1af9dd7b77fa..eb7f9cf9df89aa4eff070842bf4b799a8dc289e2 100644
--- a/obj/bhkMultiSphereShape.h
+++ b/obj/bhkMultiSphereShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKMULTISPHERESHAPE_H_
 
 #include "bhkSphereRepShape.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkNiTriStripsShape.cpp b/obj/bhkNiTriStripsShape.cpp
index 48c8f9ce5c037321ffc68717e7385af8a53e317e..ece80031507db3f84f10a2463df5a9ba0496387c 100644
--- a/obj/bhkNiTriStripsShape.cpp
+++ b/obj/bhkNiTriStripsShape.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkNiTriStripsShape.h"
 #include "NiTriStripsData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkNiTriStripsShape::TYPE("bhkNiTriStripsShape", &BHK_NI_TRI_STRIPS_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkNiTriStripsShape.h b/obj/bhkNiTriStripsShape.h
index 10354c4ea41a46c2303a8a535340c422cfc5acaf..f718e884261ee65a2a976517876323aa144a195e 100644
--- a/obj/bhkNiTriStripsShape.h
+++ b/obj/bhkNiTriStripsShape.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class NiTriStripsData;
diff --git a/obj/bhkPackedNiTriStripsShape.cpp b/obj/bhkPackedNiTriStripsShape.cpp
index 386557bf0770e09037d0378b36c5fbd2de2a1b2b..7fb5a847667cad8caf4976199023cabde570ebb0 100644
--- a/obj/bhkPackedNiTriStripsShape.cpp
+++ b/obj/bhkPackedNiTriStripsShape.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkPackedNiTriStripsShape.h"
 #include "hkPackedNiTriStripsData.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkPackedNiTriStripsShape::TYPE("bhkPackedNiTriStripsShape", &BHK_PACKED_NI_TRI_STRIPS_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkPackedNiTriStripsShape.h b/obj/bhkPackedNiTriStripsShape.h
index cbfa610d798c514a37d8d9ff806b6827ca0d2a9b..be303c473a61524aea5cd89f69bf87add031df1b 100644
--- a/obj/bhkPackedNiTriStripsShape.h
+++ b/obj/bhkPackedNiTriStripsShape.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class hkPackedNiTriStripsData;
diff --git a/obj/bhkPrismaticConstraint.cpp b/obj/bhkPrismaticConstraint.cpp
index 77322344717a864f1812ad08bdc11f3d8b277179..49404360f3e620272820c9f5eb6461a56fecaa36 100644
--- a/obj/bhkPrismaticConstraint.cpp
+++ b/obj/bhkPrismaticConstraint.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkPrismaticConstraint.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkPrismaticConstraint::TYPE("bhkPrismaticConstraint", &BHK_PRISMATIC_CONSTRAINT_PARENT::TypeConst() );
diff --git a/obj/bhkPrismaticConstraint.h b/obj/bhkPrismaticConstraint.h
index 7428523784996ceb8c7643281a5908714841ddef..2b83db8737625cb28d57b296a662747bdabcc8b0 100644
--- a/obj/bhkPrismaticConstraint.h
+++ b/obj/bhkPrismaticConstraint.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKPRISMATICCONSTRAINT_H_
 
 #include "AbhkConstraint.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkRagdollConstraint.cpp b/obj/bhkRagdollConstraint.cpp
index 63fe589f772d4e7a41eb1dde011b7513194b7390..84becc302f87b69095697d76031ba2c978505c40 100644
--- a/obj/bhkRagdollConstraint.cpp
+++ b/obj/bhkRagdollConstraint.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkRagdollConstraint.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkRagdollConstraint::TYPE("bhkRagdollConstraint", &BHK_RAGDOLL_CONSTRAINT_PARENT::TypeConst() );
diff --git a/obj/bhkRagdollConstraint.h b/obj/bhkRagdollConstraint.h
index 1fc7014753886ace006beaffcbbe12b7207337d7..adf6c69fc77246c7cb8f8ceb6b9a94c6fafed966 100644
--- a/obj/bhkRagdollConstraint.h
+++ b/obj/bhkRagdollConstraint.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKRAGDOLLCONSTRAINT_H_
 
 #include "AbhkRagdollConstraint.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkRefObject.cpp b/obj/bhkRefObject.cpp
index 186e983e73fac686ff521fe7109697f01975580c..7fde0c94a638452844ed32bed34291c609f25ffa 100644
--- a/obj/bhkRefObject.cpp
+++ b/obj/bhkRefObject.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkRefObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkRefObject::TYPE("bhkRefObject", &BHK_REF_OBJECT_PARENT::TypeConst() );
diff --git a/obj/bhkRefObject.h b/obj/bhkRefObject.h
index fe16257e57bb66660fbdfa76b523158eb192cb93..b128701677ba9de9a3b847b58d28f342b6c09bdd 100644
--- a/obj/bhkRefObject.h
+++ b/obj/bhkRefObject.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKREFOBJECT_H_
 
 #include "NiObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkRigidBody.cpp b/obj/bhkRigidBody.cpp
index 64571721aa43d35b6c569603a43270066f893887..21037095f59f69d4660c2531a4f816d0571f3c9b 100644
--- a/obj/bhkRigidBody.cpp
+++ b/obj/bhkRigidBody.cpp
@@ -4,7 +4,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #include "bhkRigidBody.h"
 #include "../gen/QuaternionXYZW.h"
 #include "AbhkConstraint.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkRigidBody::TYPE("bhkRigidBody", &BHK_RIGID_BODY_PARENT::TypeConst() );
diff --git a/obj/bhkRigidBody.h b/obj/bhkRigidBody.h
index 86d5234a0486fad0fec49a5d8d348d2e1d1583a5..c04a41e11cfcb10cc75ea8940b559ad43e1cee65 100644
--- a/obj/bhkRigidBody.h
+++ b/obj/bhkRigidBody.h
@@ -9,7 +9,7 @@ All rights reserved.  Please see niflib.h for licence. */
 // Include structures
 #include "../gen/QuaternionXYZW.h"
 #include "../Ref.h"
-namespace NifLib {
+namespace Niflib {
 
 // Forward define of referenced blocks
 class AbhkConstraint;
diff --git a/obj/bhkRigidBodyT.cpp b/obj/bhkRigidBodyT.cpp
index 569a805e9419070bb8ff7c5c04c91a1249fec3a3..3304a0821fe60824c629c55112756b6bdee24383 100644
--- a/obj/bhkRigidBodyT.cpp
+++ b/obj/bhkRigidBodyT.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkRigidBodyT.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkRigidBodyT::TYPE("bhkRigidBodyT", &BHK_RIGID_BODY_T_PARENT::TypeConst() );
diff --git a/obj/bhkRigidBodyT.h b/obj/bhkRigidBodyT.h
index 6be1972221673237f276755cd84192da8ae89dc1..cb3f2d291e71618ee0db1e700953b2bf8ffe8cf3 100644
--- a/obj/bhkRigidBodyT.h
+++ b/obj/bhkRigidBodyT.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKRIGIDBODYT_H_
 
 #include "bhkRigidBody.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkSPCollisionObject.cpp b/obj/bhkSPCollisionObject.cpp
index 22f35ee1398f1b49eb1c40b6ea0a94edda6b8dba..205e46c1b6f8078c08c3ae848cafd08dedcd0247 100644
--- a/obj/bhkSPCollisionObject.cpp
+++ b/obj/bhkSPCollisionObject.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSPCollisionObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkSPCollisionObject::TYPE("bhkSPCollisionObject", &BHK_S_P_COLLISION_OBJECT_PARENT::TypeConst() );
diff --git a/obj/bhkSPCollisionObject.h b/obj/bhkSPCollisionObject.h
index 07cb5fc693f0d07aa7f94623bf726b49f0934b43..a65450c8e0e7605f5586e89215551006215cb501 100644
--- a/obj/bhkSPCollisionObject.h
+++ b/obj/bhkSPCollisionObject.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKSPCOLLISIONOBJECT_H_
 
 #include "NiCollisionObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkSerializable.cpp b/obj/bhkSerializable.cpp
index 4e69457d3b2070213b92080dec0cbd9b105ff32b..b8287c7fb2c6d63e196168d197d9ea7e0e610bcf 100644
--- a/obj/bhkSerializable.cpp
+++ b/obj/bhkSerializable.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSerializable.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkSerializable::TYPE("bhkSerializable", &BHK_SERIALIZABLE_PARENT::TypeConst() );
diff --git a/obj/bhkSerializable.h b/obj/bhkSerializable.h
index b0812149a0863b70202dcf8ed36dc12b9e6effa3..ca3d227c5bba3c96f58076332c268b23b8fcd00f 100644
--- a/obj/bhkSerializable.h
+++ b/obj/bhkSerializable.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKSERIALIZABLE_H_
 
 #include "bhkRefObject.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkShape.cpp b/obj/bhkShape.cpp
index e85f2234441a905602c7e9148293c877abe9a48d..58f3e532ef14f9dd891fa897dc29aa16c49470cb 100644
--- a/obj/bhkShape.cpp
+++ b/obj/bhkShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkShape::TYPE("bhkShape", &BHK_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkShape.h b/obj/bhkShape.h
index a9842fa812aa1dc50c11c72afbf284e82f31641f..d41cc1fea2f4271cf67cd7af66d1e583df4c72e4 100644
--- a/obj/bhkShape.h
+++ b/obj/bhkShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKSHAPE_H_
 
 #include "bhkSerializable.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkSimpleShapePhantom.cpp b/obj/bhkSimpleShapePhantom.cpp
index 139c297eb19ccb9042f70b24306b9bd6bbc8d67c..6d3c326bbf0e734748cf82401d52957b89d9773b 100644
--- a/obj/bhkSimpleShapePhantom.cpp
+++ b/obj/bhkSimpleShapePhantom.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSimpleShapePhantom.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkSimpleShapePhantom::TYPE("bhkSimpleShapePhantom", &BHK_SIMPLE_SHAPE_PHANTOM_PARENT::TypeConst() );
diff --git a/obj/bhkSimpleShapePhantom.h b/obj/bhkSimpleShapePhantom.h
index 7e2360d84fe8945c4cabc02a18bfdb3784ae82a4..a21f05133cf7b77e1765fa45e42dfc9eff5bdfa0 100644
--- a/obj/bhkSimpleShapePhantom.h
+++ b/obj/bhkSimpleShapePhantom.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKSIMPLESHAPEPHANTOM_H_
 
 #include "bhkEntity.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkSphereRepShape.cpp b/obj/bhkSphereRepShape.cpp
index 0a6dc79ef01d4387475f6223ee5136531e483bf2..43c8c4adbfb7bc1cd2a1a962fd34a2d935e78fd9 100644
--- a/obj/bhkSphereRepShape.cpp
+++ b/obj/bhkSphereRepShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSphereRepShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkSphereRepShape::TYPE("bhkSphereRepShape", &BHK_SPHERE_REP_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkSphereRepShape.h b/obj/bhkSphereRepShape.h
index 1f3a4422f24473a62da29a1fce9a2c1f84e591f4..4536c968ec2ab5ea027758600f8ffa67a642fd62 100644
--- a/obj/bhkSphereRepShape.h
+++ b/obj/bhkSphereRepShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKSPHEREREPSHAPE_H_
 
 #include "bhkShape.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/bhkSphereShape.cpp b/obj/bhkSphereShape.cpp
index 2499b7f423565da0e508f74696f31ab361f7a1c5..7064d0912b622b53620ba8d020c577e75a36aa88 100644
--- a/obj/bhkSphereShape.cpp
+++ b/obj/bhkSphereShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkSphereShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkSphereShape::TYPE("bhkSphereShape", &BHK_SPHERE_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkSphereShape.h b/obj/bhkSphereShape.h
index e10429db16e1ef84c3aa4b92226f04db0cabf7df..728c95ba34eb7f119789b56580e98a2233637f48 100644
--- a/obj/bhkSphereShape.h
+++ b/obj/bhkSphereShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKSPHERESHAPE_H_
 
 #include "bhkConvexShape.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/bhkStiffSpringConstraint.cpp b/obj/bhkStiffSpringConstraint.cpp
index 992a86e472b1e7df836a19f914c41aa409e3e489..4d8d02c43c82fa69868f7deb268480019850b527 100644
--- a/obj/bhkStiffSpringConstraint.cpp
+++ b/obj/bhkStiffSpringConstraint.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkStiffSpringConstraint.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkStiffSpringConstraint::TYPE("bhkStiffSpringConstraint", &BHK_STIFF_SPRING_CONSTRAINT_PARENT::TypeConst() );
diff --git a/obj/bhkStiffSpringConstraint.h b/obj/bhkStiffSpringConstraint.h
index 46dd61cbccf79f181ea013729728cfb9bde3ea00..df3221026fbbb64e657f72c441a0b576f6359d34 100644
--- a/obj/bhkStiffSpringConstraint.h
+++ b/obj/bhkStiffSpringConstraint.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKSTIFFSPRINGCONSTRAINT_H_
 
 #include "AbhkConstraint.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/bhkTransformShape.cpp b/obj/bhkTransformShape.cpp
index c037cba90f7550efa1d1ac31f3d9cb7fcac71e5c..c3086cb3c7381470ddcee12bdaad42e419ce9dbc 100644
--- a/obj/bhkTransformShape.cpp
+++ b/obj/bhkTransformShape.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkTransformShape.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkTransformShape::TYPE("bhkTransformShape", &BHK_TRANSFORM_SHAPE_PARENT::TypeConst() );
diff --git a/obj/bhkTransformShape.h b/obj/bhkTransformShape.h
index c44f82a1a1f90d22de41939c6a3fd50292c56b73..9424b984ac36c8e0c4bb8e4b61acd44f05f86f4f 100644
--- a/obj/bhkTransformShape.h
+++ b/obj/bhkTransformShape.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKTRANSFORMSHAPE_H_
 
 #include "bhkEntity.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/obj/bhkWorldObject.cpp b/obj/bhkWorldObject.cpp
index 312ac15d368d7738ff8b2e4f9286a41656677dd2..199c5114ba2d004d89be286d9ca622496577e61e 100644
--- a/obj/bhkWorldObject.cpp
+++ b/obj/bhkWorldObject.cpp
@@ -2,7 +2,7 @@
 All rights reserved.  Please see niflib.h for licence. */
 
 #include "bhkWorldObject.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type bhkWorldObject::TYPE("bhkWorldObject", &BHK_WORLD_OBJECT_PARENT::TypeConst() );
diff --git a/obj/bhkWorldObject.h b/obj/bhkWorldObject.h
index 52c5e03e4384ffa9e9e638993b0c7165854b3cf6..6e344c3a2e2efb8853e55255a8735742f8cd3859 100644
--- a/obj/bhkWorldObject.h
+++ b/obj/bhkWorldObject.h
@@ -5,7 +5,7 @@ All rights reserved.  Please see niflib.h for licence. */
 #define _BHKWORLDOBJECT_H_
 
 #include "bhkShape.h"
-namespace NifLib {
+namespace Niflib {
 
 #include "../gen/obj_defines.h"
 
diff --git a/obj/hkPackedNiTriStripsData.cpp b/obj/hkPackedNiTriStripsData.cpp
index 514f2fed7bd799db5a08bcbb2b4840bcf0891ce5..d6178b06331f07f2853bd63f6d43fa61ba752ab1 100644
--- a/obj/hkPackedNiTriStripsData.cpp
+++ b/obj/hkPackedNiTriStripsData.cpp
@@ -3,7 +3,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 #include "hkPackedNiTriStripsData.h"
 #include "../gen/hkTriangle.h"
-using namespace NifLib;
+using namespace Niflib;
 
 //Definition of TYPE constant
 const Type hkPackedNiTriStripsData::TYPE("hkPackedNiTriStripsData", &HK_PACKED_NI_TRI_STRIPS_DATA_PARENT::TypeConst() );
diff --git a/obj/hkPackedNiTriStripsData.h b/obj/hkPackedNiTriStripsData.h
index adc91bd5ab4de7a6ff5dcd0827a006f690ae10a0..ea7013b3408af8028618eee28da0517bd13694f3 100644
--- a/obj/hkPackedNiTriStripsData.h
+++ b/obj/hkPackedNiTriStripsData.h
@@ -8,7 +8,7 @@ All rights reserved.  Please see niflib.h for licence. */
 
 // Include structures
 #include "../gen/hkTriangle.h"
-namespace NifLib {
+namespace Niflib {
 
 
 #include "../gen/obj_defines.h"
diff --git a/pch.h b/pch.h
index 2cd284a16c7f6e4182a77228e8e5c66f831b6e07..a3eaebeb07f17d67744d8ca9185bd10be130ab0a 100644
--- a/pch.h
+++ b/pch.h
@@ -1,6 +1,6 @@
 //Headers to pre-compile
 
-//Trying to pre-compile only generated headers
+
 
 #include "dll_export.h"
 #include "NIF_IO.h"
@@ -41,216 +41,217 @@
 #include "gen/TexDesc.h"
 #include "gen/TexSource.h"
 
-#include "obj/AbhkConstraint.h"
-#include "obj/AbhkRagdollConstraint.h"
-#include "obj/AbhkShapeCollection.h"
-#include "obj/ABoneLODController.h"
-#include "obj/AKeyedData.h"
-#include "obj/AParticleModifier.h"
-#include "obj/APSysCtlr.h"
-#include "obj/APSysData.h"
-#include "obj/AvoidNode.h"
-#include "obj/bhkBlendCollisionObject.h"
-#include "obj/bhkBlendController.h"
-#include "obj/bhkBoxShape.h"
-#include "obj/bhkCapsuleShape.h"
-#include "obj/bhkCollisionObject.h"
-#include "obj/bhkConvexShape.h"
-#include "obj/bhkConvexTransformShape.h"
-#include "obj/bhkConvexVerticesShape.h"
-#include "obj/bhkEntity.h"
-#include "obj/bhkHingeConstraint.h"
-#include "obj/bhkLimitedHingeConstraint.h"
-#include "obj/bhkListShape.h"
-#include "obj/bhkMalleableConstraint.h"
-#include "obj/bhkMoppBvTreeShape.h"
-#include "obj/bhkMultiSphereShape.h"
-#include "obj/bhkNiTriStripsShape.h"
-#include "obj/bhkPackedNiTriStripsShape.h"
-#include "obj/bhkPrismaticConstraint.h"
-#include "obj/bhkRagdollConstraint.h"
-#include "obj/bhkRefObject.h"
-#include "obj/bhkRigidBody.h"
-#include "obj/bhkRigidBodyT.h"
-#include "obj/bhkSerializable.h"
-#include "obj/bhkShape.h"
-#include "obj/bhkSimpleShapePhantom.h"
-#include "obj/bhkSPCollisionObject.h"
-#include "obj/bhkSphereRepShape.h"
-#include "obj/bhkSphereShape.h"
-#include "obj/bhkStiffSpringConstraint.h"
-#include "obj/bhkTransformShape.h"
-#include "obj/bhkWorldObject.h"
-#include "obj/BSBound.h"
-#include "obj/BSFurnitureMarker.h"
-#include "obj/BSKeyframeController.h"
-#include "obj/BSParentVelocityModifier.h"
-#include "obj/BSPSysArrayEmitter.h"
-#include "obj/BSXFlags.h"
-#include "obj/FxButton.h"
-#include "obj/FxRadioButton.h"
-#include "obj/FxWidget.h"
-#include "obj/hkPackedNiTriStripsData.h"
-#include "obj/NiAlphaController.h"
-#include "obj/NiAlphaProperty.h"
-#include "obj/NiAmbientLight.h"
-#include "obj/NiAutoNormalParticles.h"
-#include "obj/NiAutoNormalParticlesData.h"
-#include "obj/NiAVObject.h"
-#include "obj/NiBillboardNode.h"
-#include "obj/NiBinaryExtraData.h"
-#include "obj/NiBlendBoolInterpolator.h"
-#include "obj/NiBlendFloatInterpolator.h"
-#include "obj/NiBlendInterpolator.h"
-#include "obj/NiBlendPoint3Interpolator.h"
-#include "obj/NiBlendTransformInterpolator.h"
-#include "obj/NiBoneLODController.h"
-#include "obj/NiBoolData.h"
-#include "obj/NiBooleanExtraData.h"
-#include "obj/NiBoolInterpolator.h"
-#include "obj/NiBoolTimelineInterpolator.h"
-#include "obj/NiBSAnimationNode.h"
-#include "obj/NiBSBoneLODController.h"
-#include "obj/NiBSPArrayController.h"
-#include "obj/NiBSParticleNode.h"
-#include "obj/NiBSplineBasisData.h"
-#include "obj/NiBSplineCompFloatInterpolator.h"
-#include "obj/NiBSplineCompPoint3Interpolator.h"
-#include "obj/NiBSplineCompTransformInterpolator.h"
-#include "obj/NiBSplineData.h"
-#include "obj/NiBSplineInterpolator.h"
-#include "obj/NiCamera.h"
-#include "obj/NiCollisionData.h"
-#include "obj/NiCollisionObject.h"
-#include "obj/NiColorData.h"
-#include "obj/NiColorExtraData.h"
-#include "obj/NiControllerManager.h"
-#include "obj/NiControllerSequence.h"
-#include "obj/NiDefaultAVObjectPalette.h"
-#include "obj/NiDirectionalLight.h"
-#include "obj/NiDitherProperty.h"
-#include "obj/NiDynamicEffect.h"
-#include "obj/NiExtraData.h"
-#include "obj/NiFlipController.h"
-#include "obj/NiFloatData.h"
-#include "obj/NiFloatExtraData.h"
-#include "obj/NiFloatExtraDataController.h"
-#include "obj/NiFloatInterpolator.h"
-#include "obj/NiFloatsExtraData.h"
-#include "obj/NiFogProperty.h"
-#include "obj/NiGeomMorpherController.h"
-#include "obj/NiGravity.h"
-#include "obj/NiIntegerExtraData.h"
-#include "obj/NiIntegersExtraData.h"
-#include "obj/NiInterpolator.h"
-#include "obj/NiKeyframeController.h"
-#include "obj/NiKeyframeData.h"
-#include "obj/NiLight.h"
-#include "obj/NiLightColorController.h"
-#include "obj/NiLightDimmerController.h"
-#include "obj/NiLODNode.h"
-#include "obj/NiLookAtController.h"
-#include "obj/NiLookAtInterpolator.h"
-#include "obj/NiMaterialColorController.h"
-#include "obj/NiMaterialProperty.h"
-#include "obj/NiMeshParticleSystem.h"
-#include "obj/NiMeshPSysData.h"
-#include "obj/NiMorphData.h"
-#include "obj/NiMultiTargetTransformController.h"
-#include "obj/NiNode.h"
-#include "obj/NiObject.h"
-#include "obj/NiObjectNET.h"
-#include "obj/NiPalette.h"
-#include "obj/NiParticleBomb.h"
-#include "obj/NiParticleColorModifier.h"
-#include "obj/NiParticleGrowFade.h"
-#include "obj/NiParticleMeshes.h"
-#include "obj/NiParticleMeshesData.h"
-#include "obj/NiParticleMeshModifier.h"
-#include "obj/NiParticleRotation.h"
-#include "obj/NiParticles.h"
-#include "obj/NiParticlesData.h"
-#include "obj/NiParticleSystem.h"
-#include "obj/NiParticleSystemController.h"
-#include "obj/NiPathController.h"
-#include "obj/NiPathInterpolator.h"
-#include "obj/NiPixelData.h"
-#include "obj/NiPlanarCollider.h"
-#include "obj/NiPoint3Interpolator.h"
-#include "obj/NiPointLight.h"
-#include "obj/NiPosData.h"
-#include "obj/NiProperty.h"
-#include "obj/NiPSysAgeDeathModifier.h"
-#include "obj/NiPSysBombModifier.h"
-#include "obj/NiPSysBoundUpdateModifier.h"
-#include "obj/NiPSysBoxEmitter.h"
-#include "obj/NiPSysColliderManager.h"
-#include "obj/NiPSysColorModifier.h"
-#include "obj/NiPSysCylinderEmitter.h"
-#include "obj/NiPSysData.h"
-#include "obj/NiPSysDragModifier.h"
-#include "obj/NiPSysEmitter.h"
-#include "obj/NiPSysEmitterCtlr.h"
-#include "obj/NiPSysEmitterCtlrData.h"
-#include "obj/NiPSysEmitterDeclinationCtlr.h"
-#include "obj/NiPSysEmitterDeclinationVarCtlr.h"
-#include "obj/NiPSysEmitterInitialRadiusCtlr.h"
-#include "obj/NiPSysEmitterLifeSpanCtlr.h"
-#include "obj/NiPSysEmitterSpeedCtlr.h"
-#include "obj/NiPSysGravityModifier.h"
-#include "obj/NiPSysGravityStrengthCtlr.h"
-#include "obj/NiPSysGrowFadeModifier.h"
-#include "obj/NiPSysMeshEmitter.h"
-#include "obj/NiPSysMeshUpdateModifier.h"
-#include "obj/NiPSysModifier.h"
-#include "obj/NiPSysModifierActiveCtlr.h"
-#include "obj/NiPSysPlanarCollider.h"
-#include "obj/NiPSysPositionModifier.h"
-#include "obj/NiPSysResetOnLoopCtlr.h"
-#include "obj/NiPSysRotationModifier.h"
-#include "obj/NiPSysSpawnModifier.h"
-#include "obj/NiPSysSphereEmitter.h"
-#include "obj/NiPSysUpdateCtlr.h"
-#include "obj/NiPSysVolumeEmitter.h"
-#include "obj/NiRangeLODData.h"
-#include "obj/NiRotatingParticles.h"
-#include "obj/NiRotatingParticlesData.h"
-#include "obj/NiScreenLODData.h"
-#include "obj/NiSequenceStreamHelper.h"
-#include "obj/NiShadeProperty.h"
-#include "obj/NiSingleInterpolatorController.h"
-#include "obj/NiSkinData.h"
-#include "obj/NiSkinInstance.h"
-#include "obj/NiSkinPartition.h"
-#include "obj/NiSourceTexture.h"
-#include "obj/NiSpecularProperty.h"
-#include "obj/NiSphericalCollider.h"
-#include "obj/NiSpotLight.h"
-#include "obj/NiStencilProperty.h"
-#include "obj/NiStringExtraData.h"
-#include "obj/NiStringPalette.h"
-#include "obj/NiStringsExtraData.h"
-#include "obj/NiTextKeyExtraData.h"
-#include "obj/NiTextureEffect.h"
-#include "obj/NiTextureTransformController.h"
-#include "obj/NiTexturingProperty.h"
-#include "obj/NiTimeController.h"
-#include "obj/NiTransformController.h"
-#include "obj/NiTransformData.h"
-#include "obj/NiTransformInterpolator.h"
-#include "obj/NiTriBasedGeom.h"
-#include "obj/NiTriBasedGeomData.h"
-#include "obj/NiTriShape.h"
-#include "obj/NiTriShapeData.h"
-#include "obj/NiTriStrips.h"
-#include "obj/NiTriStripsData.h"
-#include "obj/NiUVController.h"
-#include "obj/NiUVData.h"
-#include "obj/NiVectorExtraData.h"
-#include "obj/NiVertexColorProperty.h"
-#include "obj/NiVertWeightsExtraData.h"
-#include "obj/NiVisController.h"
-#include "obj/NiVisData.h"
-#include "obj/NiWireframeProperty.h"
-#include "obj/NiZBufferProperty.h"
-#include "obj/RootCollisionNode.h"
\ No newline at end of file
+//Only pre-compile generated headers
+//#include "obj/AbhkConstraint.h"
+//#include "obj/AbhkRagdollConstraint.h"
+//#include "obj/AbhkShapeCollection.h"
+//#include "obj/ABoneLODController.h"
+//#include "obj/AKeyedData.h"
+//#include "obj/AParticleModifier.h"
+//#include "obj/APSysCtlr.h"
+//#include "obj/APSysData.h"
+//#include "obj/AvoidNode.h"
+//#include "obj/bhkBlendCollisionObject.h"
+//#include "obj/bhkBlendController.h"
+//#include "obj/bhkBoxShape.h"
+//#include "obj/bhkCapsuleShape.h"
+//#include "obj/bhkCollisionObject.h"
+//#include "obj/bhkConvexShape.h"
+//#include "obj/bhkConvexTransformShape.h"
+//#include "obj/bhkConvexVerticesShape.h"
+//#include "obj/bhkEntity.h"
+//#include "obj/bhkHingeConstraint.h"
+//#include "obj/bhkLimitedHingeConstraint.h"
+//#include "obj/bhkListShape.h"
+//#include "obj/bhkMalleableConstraint.h"
+//#include "obj/bhkMoppBvTreeShape.h"
+//#include "obj/bhkMultiSphereShape.h"
+//#include "obj/bhkNiTriStripsShape.h"
+//#include "obj/bhkPackedNiTriStripsShape.h"
+//#include "obj/bhkPrismaticConstraint.h"
+//#include "obj/bhkRagdollConstraint.h"
+//#include "obj/bhkRefObject.h"
+//#include "obj/bhkRigidBody.h"
+//#include "obj/bhkRigidBodyT.h"
+//#include "obj/bhkSerializable.h"
+//#include "obj/bhkShape.h"
+//#include "obj/bhkSimpleShapePhantom.h"
+//#include "obj/bhkSPCollisionObject.h"
+//#include "obj/bhkSphereRepShape.h"
+//#include "obj/bhkSphereShape.h"
+//#include "obj/bhkStiffSpringConstraint.h"
+//#include "obj/bhkTransformShape.h"
+//#include "obj/bhkWorldObject.h"
+//#include "obj/BSBound.h"
+//#include "obj/BSFurnitureMarker.h"
+//#include "obj/BSKeyframeController.h"
+//#include "obj/BSParentVelocityModifier.h"
+//#include "obj/BSPSysArrayEmitter.h"
+//#include "obj/BSXFlags.h"
+//#include "obj/FxButton.h"
+//#include "obj/FxRadioButton.h"
+//#include "obj/FxWidget.h"
+//#include "obj/hkPackedNiTriStripsData.h"
+//#include "obj/NiAlphaController.h"
+//#include "obj/NiAlphaProperty.h"
+//#include "obj/NiAmbientLight.h"
+//#include "obj/NiAutoNormalParticles.h"
+//#include "obj/NiAutoNormalParticlesData.h"
+//#include "obj/NiAVObject.h"
+//#include "obj/NiBillboardNode.h"
+//#include "obj/NiBinaryExtraData.h"
+//#include "obj/NiBlendBoolInterpolator.h"
+//#include "obj/NiBlendFloatInterpolator.h"
+//#include "obj/NiBlendInterpolator.h"
+//#include "obj/NiBlendPoint3Interpolator.h"
+//#include "obj/NiBlendTransformInterpolator.h"
+//#include "obj/NiBoneLODController.h"
+//#include "obj/NiBoolData.h"
+//#include "obj/NiBooleanExtraData.h"
+//#include "obj/NiBoolInterpolator.h"
+//#include "obj/NiBoolTimelineInterpolator.h"
+//#include "obj/NiBSAnimationNode.h"
+//#include "obj/NiBSBoneLODController.h"
+//#include "obj/NiBSPArrayController.h"
+//#include "obj/NiBSParticleNode.h"
+//#include "obj/NiBSplineBasisData.h"
+//#include "obj/NiBSplineCompFloatInterpolator.h"
+//#include "obj/NiBSplineCompPoint3Interpolator.h"
+//#include "obj/NiBSplineCompTransformInterpolator.h"
+//#include "obj/NiBSplineData.h"
+//#include "obj/NiBSplineInterpolator.h"
+//#include "obj/NiCamera.h"
+//#include "obj/NiCollisionData.h"
+//#include "obj/NiCollisionObject.h"
+//#include "obj/NiColorData.h"
+//#include "obj/NiColorExtraData.h"
+//#include "obj/NiControllerManager.h"
+//#include "obj/NiControllerSequence.h"
+//#include "obj/NiDefaultAVObjectPalette.h"
+//#include "obj/NiDirectionalLight.h"
+//#include "obj/NiDitherProperty.h"
+//#include "obj/NiDynamicEffect.h"
+//#include "obj/NiExtraData.h"
+//#include "obj/NiFlipController.h"
+//#include "obj/NiFloatData.h"
+//#include "obj/NiFloatExtraData.h"
+//#include "obj/NiFloatExtraDataController.h"
+//#include "obj/NiFloatInterpolator.h"
+//#include "obj/NiFloatsExtraData.h"
+//#include "obj/NiFogProperty.h"
+//#include "obj/NiGeomMorpherController.h"
+//#include "obj/NiGravity.h"
+//#include "obj/NiIntegerExtraData.h"
+//#include "obj/NiIntegersExtraData.h"
+//#include "obj/NiInterpolator.h"
+//#include "obj/NiKeyframeController.h"
+//#include "obj/NiKeyframeData.h"
+//#include "obj/NiLight.h"
+//#include "obj/NiLightColorController.h"
+//#include "obj/NiLightDimmerController.h"
+//#include "obj/NiLODNode.h"
+//#include "obj/NiLookAtController.h"
+//#include "obj/NiLookAtInterpolator.h"
+//#include "obj/NiMaterialColorController.h"
+//#include "obj/NiMaterialProperty.h"
+//#include "obj/NiMeshParticleSystem.h"
+//#include "obj/NiMeshPSysData.h"
+//#include "obj/NiMorphData.h"
+//#include "obj/NiMultiTargetTransformController.h"
+//#include "obj/NiNode.h"
+//#include "obj/NiObject.h"
+//#include "obj/NiObjectNET.h"
+//#include "obj/NiPalette.h"
+//#include "obj/NiParticleBomb.h"
+//#include "obj/NiParticleColorModifier.h"
+//#include "obj/NiParticleGrowFade.h"
+//#include "obj/NiParticleMeshes.h"
+//#include "obj/NiParticleMeshesData.h"
+//#include "obj/NiParticleMeshModifier.h"
+//#include "obj/NiParticleRotation.h"
+//#include "obj/NiParticles.h"
+//#include "obj/NiParticlesData.h"
+//#include "obj/NiParticleSystem.h"
+//#include "obj/NiParticleSystemController.h"
+//#include "obj/NiPathController.h"
+//#include "obj/NiPathInterpolator.h"
+//#include "obj/NiPixelData.h"
+//#include "obj/NiPlanarCollider.h"
+//#include "obj/NiPoint3Interpolator.h"
+//#include "obj/NiPointLight.h"
+//#include "obj/NiPosData.h"
+//#include "obj/NiProperty.h"
+//#include "obj/NiPSysAgeDeathModifier.h"
+//#include "obj/NiPSysBombModifier.h"
+//#include "obj/NiPSysBoundUpdateModifier.h"
+//#include "obj/NiPSysBoxEmitter.h"
+//#include "obj/NiPSysColliderManager.h"
+//#include "obj/NiPSysColorModifier.h"
+//#include "obj/NiPSysCylinderEmitter.h"
+//#include "obj/NiPSysData.h"
+//#include "obj/NiPSysDragModifier.h"
+//#include "obj/NiPSysEmitter.h"
+//#include "obj/NiPSysEmitterCtlr.h"
+//#include "obj/NiPSysEmitterCtlrData.h"
+//#include "obj/NiPSysEmitterDeclinationCtlr.h"
+//#include "obj/NiPSysEmitterDeclinationVarCtlr.h"
+//#include "obj/NiPSysEmitterInitialRadiusCtlr.h"
+//#include "obj/NiPSysEmitterLifeSpanCtlr.h"
+//#include "obj/NiPSysEmitterSpeedCtlr.h"
+//#include "obj/NiPSysGravityModifier.h"
+//#include "obj/NiPSysGravityStrengthCtlr.h"
+//#include "obj/NiPSysGrowFadeModifier.h"
+//#include "obj/NiPSysMeshEmitter.h"
+//#include "obj/NiPSysMeshUpdateModifier.h"
+//#include "obj/NiPSysModifier.h"
+//#include "obj/NiPSysModifierActiveCtlr.h"
+//#include "obj/NiPSysPlanarCollider.h"
+//#include "obj/NiPSysPositionModifier.h"
+//#include "obj/NiPSysResetOnLoopCtlr.h"
+//#include "obj/NiPSysRotationModifier.h"
+//#include "obj/NiPSysSpawnModifier.h"
+//#include "obj/NiPSysSphereEmitter.h"
+//#include "obj/NiPSysUpdateCtlr.h"
+//#include "obj/NiPSysVolumeEmitter.h"
+//#include "obj/NiRangeLODData.h"
+//#include "obj/NiRotatingParticles.h"
+//#include "obj/NiRotatingParticlesData.h"
+//#include "obj/NiScreenLODData.h"
+//#include "obj/NiSequenceStreamHelper.h"
+//#include "obj/NiShadeProperty.h"
+//#include "obj/NiSingleInterpolatorController.h"
+//#include "obj/NiSkinData.h"
+//#include "obj/NiSkinInstance.h"
+//#include "obj/NiSkinPartition.h"
+//#include "obj/NiSourceTexture.h"
+//#include "obj/NiSpecularProperty.h"
+//#include "obj/NiSphericalCollider.h"
+//#include "obj/NiSpotLight.h"
+//#include "obj/NiStencilProperty.h"
+//#include "obj/NiStringExtraData.h"
+//#include "obj/NiStringPalette.h"
+//#include "obj/NiStringsExtraData.h"
+//#include "obj/NiTextKeyExtraData.h"
+//#include "obj/NiTextureEffect.h"
+//#include "obj/NiTextureTransformController.h"
+//#include "obj/NiTexturingProperty.h"
+//#include "obj/NiTimeController.h"
+//#include "obj/NiTransformController.h"
+//#include "obj/NiTransformData.h"
+//#include "obj/NiTransformInterpolator.h"
+//#include "obj/NiTriBasedGeom.h"
+//#include "obj/NiTriBasedGeomData.h"
+//#include "obj/NiTriShape.h"
+//#include "obj/NiTriShapeData.h"
+//#include "obj/NiTriStrips.h"
+//#include "obj/NiTriStripsData.h"
+//#include "obj/NiUVController.h"
+//#include "obj/NiUVData.h"
+//#include "obj/NiVectorExtraData.h"
+//#include "obj/NiVertexColorProperty.h"
+//#include "obj/NiVertWeightsExtraData.h"
+//#include "obj/NiVisController.h"
+//#include "obj/NiVisData.h"
+//#include "obj/NiWireframeProperty.h"
+//#include "obj/NiZBufferProperty.h"
+//#include "obj/RootCollisionNode.h"
\ No newline at end of file