diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index e04d2f01e0..ea6e0a2f52 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -9,11 +9,11 @@
 #include <components/bsa/bsa_archive.hpp>
 #include <components/files/configurationmanager.hpp>
 #include <components/translation/translation.hpp>
-#include <components/nif/nif_file.hpp>
+#include <components/nif/niffile.hpp>
 #include <components/nifoverrides/nifoverrides.hpp>
 
-#include <components/nifbullet/bullet_nif_loader.hpp>
-#include <components/nifogre/ogre_nif_loader.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
 
 #include "mwinput/inputmanagerimp.hpp"
 
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 810ca869f5..7caf351694 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -1,7 +1,7 @@
 #ifndef _GAME_RENDER_ANIMATION_H
 #define _GAME_RENDER_ANIMATION_H
 
-#include <components/nifogre/ogre_nif_loader.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
 
 #include "../mwworld/ptr.hpp"
 
diff --git a/apps/openmw/mwrender/objects.cpp b/apps/openmw/mwrender/objects.cpp
index d3899d4b7d..525dcdcc4e 100644
--- a/apps/openmw/mwrender/objects.cpp
+++ b/apps/openmw/mwrender/objects.cpp
@@ -7,7 +7,7 @@
 #include <OgreSubEntity.h>
 #include <OgreStaticGeometry.h>
 
-#include <components/nifogre/ogre_nif_loader.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
 #include <components/settings/settings.hpp>
 
 #include "../mwworld/ptr.hpp"
diff --git a/apps/openmw/mwrender/sky.cpp b/apps/openmw/mwrender/sky.cpp
index fde7676ae1..604ad50d22 100644
--- a/apps/openmw/mwrender/sky.cpp
+++ b/apps/openmw/mwrender/sky.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <components/nifogre/ogre_nif_loader.hpp>
+#include <components/nifogre/ogrenifloader.hpp>
 
 #include <extern/shiny/Platforms/Ogre/OgreMaterial.hpp>
 
diff --git a/apps/openmw/mwworld/physicssystem.cpp b/apps/openmw/mwworld/physicssystem.cpp
index 65cbc1164e..566a463b6b 100644
--- a/apps/openmw/mwworld/physicssystem.cpp
+++ b/apps/openmw/mwworld/physicssystem.cpp
@@ -13,7 +13,7 @@
 #include <openengine/bullet/physic.hpp>
 #include <openengine/ogre/renderer.hpp>
 
-#include <components/nifbullet/bullet_nif_loader.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
 
 //#include "../mwbase/world.hpp" // FIXME
 #include "../mwbase/environment.hpp"
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ecf783d6c4..35024b3079 100644
--- a/apps/openmw/mwworld/scene.cpp
+++ b/apps/openmw/mwworld/scene.cpp
@@ -1,6 +1,6 @@
 #include "scene.hpp"
 
-#include <components/nif/nif_file.hpp>
+#include <components/nif/niffile.hpp>
 
 #include "../mwbase/environment.hpp"
 #include "../mwbase/world.hpp" /// FIXME
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 00342e2ac8..9fdc728731 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -15,15 +15,15 @@ add_component_dir (bsa
     )
 
 add_component_dir (nif
-    controlled effect nif_types record controller extra node record_ptr data nif_file property
+    controlled effect niftypes record controller extra node record_ptr data niffile property
     )
 
 add_component_dir (nifogre
-    ogre_nif_loader
+    ogrenifloader
     )
 
 add_component_dir (nifbullet
-    bullet_nif_loader
+    bulletnifloader
     )
 
 add_component_dir (to_utf8
diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp
index b9d84b58ab..36c9a82ace 100644
--- a/components/nif/controlled.hpp
+++ b/components/nif/controlled.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_CONTROLLED_H_
-#define _NIF_CONTROLLED_H_
+#ifndef OPENMW_COMPONENTS_NIF_CONTROLLED_HPP
+#define OPENMW_COMPONENTS_NIF_CONTROLLED_HPP
 
 #include "extra.hpp"
 #include "controller.hpp"
@@ -36,7 +36,7 @@ class Controlled : public Extra
 public:
     ControllerPtr controller;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Extra::read(nif);
         controller.read(nif);
@@ -55,7 +55,7 @@ class Named : public Controlled
 public:
     std::string name;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         name = nif->getString();
         Controlled::read(nif);
@@ -66,7 +66,7 @@ typedef Named NiSequenceStreamHelper;
 class NiParticleGrowFade : public Controlled
 {
 public:
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controlled::read(nif);
 
@@ -80,7 +80,7 @@ class NiParticleColorModifier : public Controlled
 public:
     NiColorDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controlled::read(nif);
         data.read(nif);
@@ -96,7 +96,7 @@ public:
 class NiGravity : public Controlled
 {
 public:
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controlled::read(nif);
 
@@ -109,7 +109,7 @@ public:
 class NiPlanarCollider : public Controlled
 {
 public:
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controlled::read(nif);
 
@@ -121,7 +121,7 @@ public:
 class NiParticleRotation : public Controlled
 {
 public:
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controlled::read(nif);
 
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index cbc19cd8f5..8331b93b7d 100644
--- a/components/nif/controller.hpp
+++ b/components/nif/controller.hpp
@@ -21,12 +21,12 @@
 
  */
 
-#ifndef _NIF_CONTROLLER_H_
-#define _NIF_CONTROLLER_H_
+#ifndef OPENMW_COMPONENTS_NIF_CONTROLLER_HPP
+#define OPENMW_COMPONENTS_NIF_CONTROLLER_HPP
 
 #include "record.hpp"
-#include "nif_file.hpp"
-#include "record_ptr.hpp"
+#include "niffile.hpp"
+#include "recordptr.hpp"
 
 namespace Nif
 {
@@ -40,7 +40,7 @@ public:
     float timeStart, timeStop;
     ControlledPtr target;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         next.read(nif);
 
@@ -65,7 +65,7 @@ public:
 class NiBSPArrayController : public Controller
 {
 public:
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controller::read(nif);
 
@@ -82,7 +82,7 @@ class NiMaterialColorController : public Controller
 public:
     NiPosDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controller::read(nif);
         data.read(nif);
@@ -101,7 +101,7 @@ public:
     NiPosDataPtr posData;
     NiFloatDataPtr floatData;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controller::read(nif);
 
@@ -129,7 +129,7 @@ class NiUVController : public Controller
 public:
     NiUVDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controller::read(nif);
 
@@ -149,7 +149,7 @@ class NiKeyframeController : public Controller
 public:
     NiKeyframeDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controller::read(nif);
         data.read(nif);
@@ -167,7 +167,7 @@ class NiAlphaController : public Controller
 public:
     NiFloatDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controller::read(nif);
         data.read(nif);
@@ -185,7 +185,7 @@ class NiGeomMorpherController : public Controller
 public:
     NiMorphDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controller::read(nif);
         data.read(nif);
@@ -204,7 +204,7 @@ class NiVisController : public Controller
 public:
     NiVisDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Controller::read(nif);
         data.read(nif);
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 46b58da8f9..9bdba63961 100644
--- a/components/nif/data.hpp
+++ b/components/nif/data.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_DATA_H_
-#define _NIF_DATA_H_
+#ifndef OPENMW_COMPONENTS_NIF_DATA_HPP
+#define OPENMW_COMPONENTS_NIF_DATA_HPP
 
 #include "controlled.hpp"
 
@@ -65,7 +65,7 @@ public:
     */
     int alpha;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Named::read(nif);
 
@@ -102,7 +102,7 @@ public:
     Ogre::Vector3 center;
     float radius;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         int verts = nif->getUShort();
 
@@ -138,7 +138,7 @@ public:
     // Triangles, three vertex indices per triangle
     std::vector<short> triangles;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         ShapeData::read(nif);
 
@@ -167,7 +167,7 @@ class NiAutoNormalParticlesData : public ShapeData
 public:
     int activeCount;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         ShapeData::read(nif);
 
@@ -189,7 +189,7 @@ public:
 class NiRotatingParticlesData : public NiAutoNormalParticlesData
 {
 public:
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         NiAutoNormalParticlesData::read(nif);
 
@@ -208,7 +208,7 @@ class NiPosData : public Record
 public:
     Vector3KeyList mKeyList;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         mKeyList.read(nif);
     }
@@ -219,7 +219,7 @@ class NiUVData : public Record
 public:
     FloatKeyList mKeyList[4];
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         for(int i = 0;i < 4;i++)
             mKeyList[i].read(nif);
@@ -231,7 +231,7 @@ class NiFloatData : public Record
 public:
     FloatKeyList mKeyList;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         mKeyList.read(nif);
     }
@@ -243,7 +243,7 @@ public:
     unsigned int rmask, gmask, bmask, amask;
     int bpp, mips;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         nif->getInt(); // always 0 or 1
 
@@ -281,7 +281,7 @@ class NiColorData : public Record
 public:
     Vector4KeyList mKeyList;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         mKeyList.read(nif);
     }
@@ -295,7 +295,7 @@ public:
         char isSet;
     };
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         int count = nif->getInt();
 
@@ -311,7 +311,7 @@ public:
     NodePtr root;
     NodeList bones;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         data.read(nif);
         root.read(nif);
@@ -347,7 +347,7 @@ public:
     BoneTrafo trafo;
     std::vector<BoneInfo> bones;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         trafo.rotation = nif->getMatrix3();
         trafo.trans = nif->getVector3();
@@ -385,7 +385,7 @@ struct NiMorphData : public Record
     };
     std::vector<MorphData> mMorphs;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         int morphCount = nif->getInt();
         int vertCount  = nif->getInt();
@@ -410,7 +410,7 @@ struct NiKeyframeData : public Record
     Vector3KeyList mTranslations;
     FloatKeyList mScales;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         mRotations.read(nif);
         mTranslations.read(nif);
diff --git a/components/nif/effect.hpp b/components/nif/effect.hpp
index 850415dadc..cc1b0f41c1 100644
--- a/components/nif/effect.hpp
+++ b/components/nif/effect.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_EFFECT_H_
-#define _NIF_EFFECT_H_
+#ifndef OPENMW_COMPONENTS_NIF_EFFECT_HPP
+#define OPENMW_COMPONENTS_NIF_EFFECT_HPP
 
 #include "node.hpp"
 
@@ -42,7 +42,7 @@ struct NiLight : Effect
         Ogre::Vector3 diffuse;
         Ogre::Vector3 specular;
 
-        void read(NIFFile *nif)
+        void read(NIFStream *nif)
         {
             dimmer = nif->getFloat();
             ambient = nif->getVector3();
@@ -52,7 +52,7 @@ struct NiLight : Effect
     };
     SLight light;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Effect::read(nif);
 
@@ -66,7 +66,7 @@ struct NiTextureEffect : Effect
 {
     NiSourceTexturePtr texture;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Effect::read(nif);
 
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index 35781dbf59..45c4fefc69 100644
--- a/components/nif/extra.hpp
+++ b/components/nif/extra.hpp
@@ -21,12 +21,12 @@
 
  */
 
-#ifndef _NIF_EXTRA_H_
-#define _NIF_EXTRA_H_
+#ifndef OPENMW_COMPONENTS_NIF_EXTRA_HPP
+#define OPENMW_COMPONENTS_NIF_EXTRA_HPP
 
 #include "record.hpp"
-#include "nif_file.hpp"
-#include "record_ptr.hpp"
+#include "niffile.hpp"
+#include "recordptr.hpp"
 
 namespace Nif
 {
@@ -40,14 +40,14 @@ class Extra : public Record
 public:
     ExtraPtr extra;
 
-    void read(NIFFile *nif) { extra.read(nif); }
+    void read(NIFStream *nif) { extra.read(nif); }
     void post(NIFFile *nif) { extra.post(nif); }
 };
 
 class NiVertWeightsExtraData : public Extra
 {
 public:
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Extra::read(nif);
 
@@ -70,7 +70,7 @@ public:
     };
     std::vector<TextKey> list;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Extra::read(nif);
 
@@ -95,7 +95,7 @@ public:
     */
     std::string string;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Extra::read(nif);
 
diff --git a/components/nif/nif_file.cpp b/components/nif/niffile.cpp
similarity index 52%
rename from components/nif/nif_file.cpp
rename to components/nif/niffile.cpp
index 6e806e7ecc..bf05e7576a 100644
--- a/components/nif/nif_file.cpp
+++ b/components/nif/niffile.cpp
@@ -21,7 +21,7 @@
 
  */
 
-#include "nif_file.hpp"
+#include "niffile.hpp"
 #include "record.hpp"
 #include "components/misc/stringops.hpp"
 
@@ -174,10 +174,7 @@ NIFFile::ptr NIFFile::create (const std::string &name) { return LoadedCache::cre
 NIFFile::NIFFile(const std::string &name, psudo_private_modifier)
     : filename(name)
 {
-    inp = Ogre::ResourceGroupManager::getSingleton().openResource(name);
     parse();
-    // Make sure to close the file after it was loaded into memory
-    inp.setNull();
 }
 
 NIFFile::~NIFFile()
@@ -188,6 +185,101 @@ NIFFile::~NIFFile()
         delete records[i];
 }
 
+template <typename NodeType> static Record* construct() { return new NodeType; }
+
+struct RecordFactoryEntry {
+
+    typedef Record* (*create_t) ();
+
+    char const *    mName;
+    create_t        mCreate;
+    RecordType      mType;
+
+};
+
+/* These are all the record types we know how to read.
+
+    This can be heavily optimized later if needed. For example, a
+    hash table or a FSM-based parser could be used to look up
+    node names.
+*/
+
+static const RecordFactoryEntry recordFactories [] = {
+
+    { "NiNode",                     &construct <NiNode                      >, RC_NiNode                        },
+    { "AvoidNode",                  &construct <NiNode                      >, RC_NiNode                        },
+    { "NiBSParticleNode",           &construct <NiNode                      >, RC_NiNode                        },
+    { "NiBSAnimationNode",          &construct <NiNode                      >, RC_NiNode                        },
+    { "NiBillboardNode",            &construct <NiNode                      >, RC_NiNode                        },
+    { "NiTriShape",                 &construct <NiTriShape                  >, RC_NiTriShape                    },
+    { "NiRotatingParticles",        &construct <NiRotatingParticles         >, RC_NiRotatingParticles           },
+    { "NiAutoNormalParticles",      &construct <NiAutoNormalParticles       >, RC_NiAutoNormalParticles         },
+    { "NiCamera",                   &construct <NiCamera                    >, RC_NiCamera                      },
+    { "RootCollisionNode",          &construct <NiNode                      >, RC_RootCollisionNode             },
+    { "NiTexturingProperty",        &construct <NiTexturingProperty         >, RC_NiTexturingProperty           },
+    { "NiMaterialProperty",         &construct <NiMaterialProperty          >, RC_NiMaterialProperty            },
+    { "NiZBufferProperty",          &construct <NiZBufferProperty           >, RC_NiZBufferProperty             },
+    { "NiAlphaProperty",            &construct <NiAlphaProperty             >, RC_NiAlphaProperty               },
+    { "NiVertexColorProperty",      &construct <NiVertexColorProperty       >, RC_NiVertexColorProperty         },
+    { "NiShadeProperty",            &construct <NiShadeProperty             >, RC_NiShadeProperty               },
+    { "NiDitherProperty",           &construct <NiDitherProperty            >, RC_NiDitherProperty              },
+    { "NiWireframeProperty",        &construct <NiWireframeProperty         >, RC_NiWireframeProperty           },
+    { "NiSpecularProperty",         &construct <NiSpecularProperty          >, RC_NiSpecularProperty            },
+    { "NiStencilProperty",          &construct <NiStencilProperty           >, RC_NiStencilProperty             },
+    { "NiVisController",            &construct <NiVisController             >, RC_NiVisController               },
+    { "NiGeomMorpherController",    &construct <NiGeomMorpherController     >, RC_NiGeomMorpherController       },
+    { "NiKeyframeController",       &construct <NiKeyframeController        >, RC_NiKeyframeController          },
+    { "NiAlphaController",          &construct <NiAlphaController           >, RC_NiAlphaController             },
+    { "NiUVController",             &construct <NiUVController              >, RC_NiUVController                },
+    { "NiPathController",           &construct <NiPathController            >, RC_NiPathController              },
+    { "NiMaterialColorController",  &construct <NiMaterialColorController   >, RC_NiMaterialColorController     },
+    { "NiBSPArrayController",       &construct <NiBSPArrayController        >, RC_NiBSPArrayController          },
+    { "NiParticleSystemController", &construct <NiParticleSystemController  >, RC_NiParticleSystemController    },
+    { "NiAmbientLight",             &construct <NiLight                     >, RC_NiLight                       },
+    { "NiDirectionalLight",         &construct <NiLight                     >, RC_NiLight                       },
+    { "NiTextureEffect",            &construct <NiTextureEffect             >, RC_NiTextureEffect               },
+    { "NiVertWeightsExtraData",     &construct <NiVertWeightsExtraData      >, RC_NiVertWeightsExtraData        },
+    { "NiTextKeyExtraData",         &construct <NiTextKeyExtraData          >, RC_NiTextKeyExtraData            },
+    { "NiStringExtraData",          &construct <NiStringExtraData           >, RC_NiStringExtraData             },
+    { "NiGravity",                  &construct <NiGravity                   >, RC_NiGravity                     },
+    { "NiPlanarCollider",           &construct <NiPlanarCollider            >, RC_NiPlanarCollider              },
+    { "NiParticleGrowFade",         &construct <NiParticleGrowFade          >, RC_NiParticleGrowFade            },
+    { "NiParticleColorModifier",    &construct <NiParticleColorModifier     >, RC_NiParticleColorModifier       },
+    { "NiParticleRotation",         &construct <NiParticleRotation          >, RC_NiParticleRotation            },
+    { "NiFloatData",                &construct <NiFloatData                 >, RC_NiFloatData                   },
+    { "NiTriShapeData",             &construct <NiTriShapeData              >, RC_NiTriShapeData                },
+    { "NiVisData",                  &construct <NiVisData                   >, RC_NiVisData                     },
+    { "NiColorData",                &construct <NiColorData                 >, RC_NiColorData                   },
+    { "NiPixelData",                &construct <NiPixelData                 >, RC_NiPixelData                   },
+    { "NiMorphData",                &construct <NiMorphData                 >, RC_NiMorphData                   },
+    { "NiKeyframeData",             &construct <NiKeyframeData              >, RC_NiKeyframeData                },
+    { "NiSkinData",                 &construct <NiSkinData                  >, RC_NiSkinData                    },
+    { "NiUVData",                   &construct <NiUVData                    >, RC_NiUVData                      },
+    { "NiPosData",                  &construct <NiPosData                   >, RC_NiPosData                     },
+    { "NiRotatingParticlesData",    &construct <NiRotatingParticlesData     >, RC_NiRotatingParticlesData       },
+    { "NiAutoNormalParticlesData",  &construct <NiAutoNormalParticlesData   >, RC_NiAutoNormalParticlesData     },
+    { "NiSequenceStreamHelper",     &construct <NiSequenceStreamHelper      >, RC_NiSequenceStreamHelper        },
+    { "NiSourceTexture",            &construct <NiSourceTexture             >, RC_NiSourceTexture               },
+    { "NiSkinInstance",             &construct <NiSkinInstance              >, RC_NiSkinInstance                },
+};
+
+static RecordFactoryEntry const * recordFactories_begin = &recordFactories [0];
+static RecordFactoryEntry const * recordFactories_end   = &recordFactories [sizeof (recordFactories) / sizeof (recordFactories[0])];
+
+RecordFactoryEntry const * lookupRecordFactory (char const * name)
+{
+    RecordFactoryEntry const * i;
+
+    for (i = recordFactories_begin; i != recordFactories_end; ++i)
+        if (strcmp (name, i->mName) == 0)
+            break;
+
+    if (i == recordFactories_end)
+        return NULL;
+
+    return i;
+}
+
 /* This file implements functions from the NIFFile class. It is also
    where we stash all the functions we couldn't add as inline
    definitions in the record types.
@@ -195,18 +287,20 @@ NIFFile::~NIFFile()
 
 void NIFFile::parse()
 {
+    NIFStream nif (this, Ogre::ResourceGroupManager::getSingleton().openResource(filename));
+
   // Check the header string
-  std::string head = getString(40);
+  std::string head = nif.getString(40);
   if(head.compare(0, 22, "NetImmerse File Format") != 0)
     fail("Invalid NIF header");
 
   // Get BCD version
-  ver = getInt();
+  ver = nif.getInt();
   if(ver != VER_MW)
     fail("Unsupported NIF version");
 
   // Number of records
-  size_t recNum = getInt();
+  size_t recNum = nif.getInt();
   records.resize(recNum);
 
   /* The format for 10.0.1.0 seems to be a bit different. After the
@@ -222,97 +316,24 @@ void NIFFile::parse()
     {
       Record *r = NULL;
 
-      std::string rec = getString();
+      std::string rec = nif.getString();
 
-      /* These are all the record types we know how to read.
+      RecordFactoryEntry const * entry = lookupRecordFactory (rec.c_str ());
 
-         This can be heavily optimized later if needed. For example, a
-         hash table or a FSM-based parser could be used to look up
-         node names.
-      */
-
-      // NiNodes
-      if(rec == "NiNode" || rec == "AvoidNode" ||
-         rec == "NiBSParticleNode" ||
-         rec == "NiBSAnimationNode" ||
-         rec == "NiBillboardNode") { r = new NiNode; r->recType = RC_NiNode; }
-
-      // Other nodes
-      else if(rec == "NiTriShape") { r = new NiTriShape; r->recType = RC_NiTriShape; }
-      else if(rec == "NiRotatingParticles") { r = new NiRotatingParticles; r->recType = RC_NiRotatingParticles; }
-      else if(rec == "NiAutoNormalParticles") { r = new NiAutoNormalParticles; r->recType = RC_NiAutoNormalParticles; }
-      else if(rec == "NiCamera") { r = new NiCamera; r->recType = RC_NiCamera; }
-        else if(rec == "RootCollisionNode"){ r = new NiNode; r->recType = RC_RootCollisionNode; }// a root collision node is exactly like a node
-                                                                                                 //that's why there is no need to create a new type
-
-      // Properties
-      else if(rec == "NiTexturingProperty") { r = new NiTexturingProperty; r->recType = RC_NiTexturingProperty; }
-      else if(rec == "NiMaterialProperty") { r = new NiMaterialProperty; r->recType = RC_NiMaterialProperty; }
-      else if(rec == "NiZBufferProperty") { r = new NiZBufferProperty; r->recType = RC_NiZBufferProperty; }
-      else if(rec == "NiAlphaProperty") { r = new NiAlphaProperty; r->recType = RC_NiAlphaProperty; }
-      else if(rec == "NiVertexColorProperty") { r = new NiVertexColorProperty; r->recType = RC_NiVertexColorProperty; }
-      else if(rec == "NiShadeProperty") { r = new NiShadeProperty; r->recType = RC_NiShadeProperty; }
-      else if(rec == "NiDitherProperty") { r = new NiDitherProperty; r->recType = RC_NiDitherProperty; }
-      else if(rec == "NiWireframeProperty") { r = new NiWireframeProperty; r->recType = RC_NiWireframeProperty; }
-      else if(rec == "NiSpecularProperty") { r = new NiSpecularProperty; r->recType = RC_NiSpecularProperty; }
-      else if(rec == "NiStencilProperty") { r = new NiStencilProperty; r->recType = RC_NiStencilProperty; }
-
-      // Controllers
-      else if(rec == "NiVisController") { r = new NiVisController; r->recType = RC_NiVisController; }
-      else if(rec == "NiGeomMorpherController") { r = new NiGeomMorpherController; r->recType = RC_NiGeomMorpherController; }
-      else if(rec == "NiKeyframeController") { r = new NiKeyframeController; r->recType = RC_NiKeyframeController; }
-      else if(rec == "NiAlphaController") { r = new NiAlphaController; r->recType = RC_NiAlphaController; }
-      else if(rec == "NiUVController") { r = new NiUVController; r->recType = RC_NiUVController; }
-      else if(rec == "NiPathController") { r = new NiPathController; r->recType = RC_NiPathController; }
-      else if(rec == "NiMaterialColorController") { r = new NiMaterialColorController; r->recType = RC_NiMaterialColorController; }
-      else if(rec == "NiBSPArrayController") { r = new NiBSPArrayController; r->recType = RC_NiBSPArrayController; }
-      else if(rec == "NiParticleSystemController") { r = new NiParticleSystemController; r->recType = RC_NiParticleSystemController; }
-
-      // Effects
-      else if(rec == "NiAmbientLight" ||
-              rec == "NiDirectionalLight") { r = new NiLight; r->recType = RC_NiLight; }
-      else if(rec == "NiTextureEffect") { r = new NiTextureEffect; r->recType = RC_NiTextureEffect; }
-
-      // Extra Data
-      else if(rec == "NiVertWeightsExtraData") { r = new NiVertWeightsExtraData; r->recType = RC_NiVertWeightsExtraData; }
-      else if(rec == "NiTextKeyExtraData") { r = new NiTextKeyExtraData; r->recType = RC_NiTextKeyExtraData; }
-      else if(rec == "NiStringExtraData") { r = new NiStringExtraData; r->recType = RC_NiStringExtraData; }
-
-      else if(rec == "NiGravity") { r = new NiGravity; r->recType = RC_NiGravity; }
-      else if(rec == "NiPlanarCollider") { r = new NiPlanarCollider; r->recType = RC_NiPlanarCollider; }
-      else if(rec == "NiParticleGrowFade") { r = new NiParticleGrowFade; r->recType = RC_NiParticleGrowFade; }
-      else if(rec == "NiParticleColorModifier") { r = new NiParticleColorModifier; r->recType = RC_NiParticleColorModifier; }
-      else if(rec == "NiParticleRotation") { r = new NiParticleRotation; r->recType = RC_NiParticleRotation; }
-
-      // Data
-      else if(rec == "NiFloatData") { r = new NiFloatData; r->recType = RC_NiFloatData; }
-      else if(rec == "NiTriShapeData") { r = new NiTriShapeData; r->recType = RC_NiTriShapeData; }
-      else if(rec == "NiVisData") { r = new NiVisData; r->recType = RC_NiVisData; }
-      else if(rec == "NiColorData") { r = new NiColorData; r->recType = RC_NiColorData; }
-      else if(rec == "NiPixelData") { r = new NiPixelData; r->recType = RC_NiPixelData; }
-      else if(rec == "NiMorphData") { r = new NiMorphData; r->recType = RC_NiMorphData; }
-      else if(rec == "NiKeyframeData") { r = new NiKeyframeData; r->recType = RC_NiKeyframeData; }
-      else if(rec == "NiSkinData") { r = new NiSkinData; r->recType = RC_NiSkinData; }
-      else if(rec == "NiUVData") { r = new NiUVData; r->recType = RC_NiUVData; }
-      else if(rec == "NiPosData") { r = new NiPosData; r->recType = RC_NiPosData; }
-      else if(rec == "NiRotatingParticlesData") { r = new NiRotatingParticlesData; r->recType = RC_NiRotatingParticlesData; }
-      else if(rec == "NiAutoNormalParticlesData") { r = new NiAutoNormalParticlesData; r->recType = RC_NiAutoNormalParticlesData; }
-
-      // Other
-      else if(rec == "NiSequenceStreamHelper") { r = new NiSequenceStreamHelper; r->recType = RC_NiSequenceStreamHelper; }
-      else if(rec == "NiSourceTexture") { r = new NiSourceTexture; r->recType = RC_NiSourceTexture; }
-      else if(rec == "NiSkinInstance") { r = new NiSkinInstance; r->recType = RC_NiSkinInstance; }
-
-      // Failure
+      if (entry != NULL)
+      {
+          r = entry->mCreate ();
+          r->recType = entry->mType;
+      }
       else
-        fail("Unknown record type " + rec);
+          fail("Unknown record type " + rec);
 
       assert(r != NULL);
       assert(r->recType != RC_MISSING);
       r->recName = rec;
       r->recIndex = i;
       records[i] = r;
-      r->read(this);
+      r->read(&nif);
 
       // Discard tranformations for the root node, otherwise some meshes
       // occasionally get wrong orientation. Only for NiNode-s for now, but
diff --git a/components/nif/nif_file.hpp b/components/nif/niffile.hpp
similarity index 54%
rename from components/nif/nif_file.hpp
rename to components/nif/niffile.hpp
index 5e9694f4b4..ed11bdd7cb 100644
--- a/components/nif/nif_file.hpp
+++ b/components/nif/niffile.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_FILE_H_
-#define _NIF_FILE_H_
+#ifndef OPENMW_COMPONENTS_NIF_NIFFILE_HPP
+#define OPENMW_COMPONENTS_NIF_NIFFILE_HPP
 
 #include <OgreResourceGroupManager.h>
 #include <OgreDataStream.h>
@@ -45,7 +45,8 @@
 #include <libs/platform/stdint.h>
 
 #include "record.hpp"
-#include "nif_types.hpp"
+#include "niftypes.hpp"
+#include "nifstream.hpp"
 
 namespace Nif
 {
@@ -59,9 +60,6 @@ class NIFFile
     /// Nif file version
     int ver;
 
-    /// Input stream
-    Ogre::DataStreamPtr inp;
-
     /// File name, used for error messages
     std::string filename;
 
@@ -71,33 +69,6 @@ class NIFFile
     /// Parse the file
     void parse();
 
-    uint8_t read_byte()
-    {
-        uint8_t byte;
-        if(inp->read(&byte, 1) != 1) return 0;
-        return byte;
-    }
-    uint16_t read_le16()
-    {
-        uint8_t buffer[2];
-        if(inp->read(buffer, 2) != 2) return 0;
-        return buffer[0] | (buffer[1]<<8);
-    }
-    uint32_t read_le32()
-    {
-        uint8_t buffer[4];
-        if(inp->read(buffer, 4) != 4) return 0;
-        return buffer[0] | (buffer[1]<<8) | (buffer[2]<<16) | (buffer[3]<<24);
-    }
-    float read_le32f()
-    {
-        union {
-            uint32_t i;
-            float f;
-        } u = { read_le32() };
-        return u.f;
-    }
-
     class LoadedCache;
     friend class LoadedCache;
 
@@ -117,8 +88,8 @@ public:
 
     void warn(const std::string &msg)
     {
-        std::cerr<< "NIFFile Warning: "<<msg <<std::endl
-                 << "File: "<<filename <<std::endl;
+        std::cerr << "NIFFile Warning: " << msg <<std::endl
+                  << "File: " << filename <<std::endl;
     }
 
     typedef boost::shared_ptr <NIFFile> ptr;
@@ -147,111 +118,6 @@ public:
 
     /// Number of records
     size_t numRecords() { return records.size(); }
-
-    /*************************************************
-               Parser functions
-    ****************************************************/
-
-    void skip(size_t size) { inp->skip(size); }
-
-    char getChar() { return read_byte(); }
-    short getShort() { return read_le16(); }
-    unsigned short getUShort() { return read_le16(); }
-    int getInt() { return read_le32(); }
-    unsigned int getUInt() { return read_le32(); }
-    float getFloat() { return read_le32f(); }
-    Ogre::Vector2 getVector2()
-    {
-        float a[2];
-        for(size_t i = 0;i < 2;i++)
-            a[i] = getFloat();
-        return Ogre::Vector2(a);
-    }
-    Ogre::Vector3 getVector3()
-    {
-        float a[3];
-        for(size_t i = 0;i < 3;i++)
-            a[i] = getFloat();
-        return Ogre::Vector3(a);
-    }
-    Ogre::Vector4 getVector4()
-    {
-        float a[4];
-        for(size_t i = 0;i < 4;i++)
-            a[i] = getFloat();
-        return Ogre::Vector4(a);
-    }
-    Ogre::Matrix3 getMatrix3()
-    {
-        Ogre::Real a[3][3];
-        for(size_t i = 0;i < 3;i++)
-        {
-            for(size_t j = 0;j < 3;j++)
-                a[i][j] = Ogre::Real(getFloat());
-        }
-        return Ogre::Matrix3(a);
-    }
-    Ogre::Quaternion getQuaternion()
-    {
-        float a[4];
-        for(size_t i = 0;i < 4;i++)
-            a[i] = getFloat();
-        return Ogre::Quaternion(a);
-    }
-    Transformation getTrafo()
-    {
-        Transformation t;
-        t.pos = getVector3();
-        t.rotation = getMatrix3();
-        t.scale = getFloat();
-        return t;
-    }
-
-    std::string getString(size_t length)
-    {
-        std::vector<char> str (length+1, 0);
-
-        if(inp->read(&str[0], length) != length)
-            throw std::runtime_error ("string length in NIF file does not match");
-
-        return &str[0];
-    }
-    std::string getString()
-    {
-        size_t size = read_le32();
-        return getString(size);
-    }
-
-    void getShorts(std::vector<short> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getShort();
-    }
-    void getFloats(std::vector<float> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getFloat();
-    }
-    void getVector2s(std::vector<Ogre::Vector2> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getVector2();
-    }
-    void getVector3s(std::vector<Ogre::Vector3> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getVector3();
-    }
-    void getVector4s(std::vector<Ogre::Vector4> &vec, size_t size)
-    {
-        vec.resize(size);
-        for(size_t i = 0;i < vec.size();i++)
-            vec[i] = getVector4();
-    }
 };
 
 
@@ -270,7 +136,7 @@ typedef KeyT<Ogre::Vector3> Vector3Key;
 typedef KeyT<Ogre::Vector4> Vector4Key;
 typedef KeyT<Ogre::Quaternion> QuaternionKey;
 
-template<typename T, T (NIFFile::*getValue)()>
+template<typename T, T (NIFStream::*getValue)()>
 struct KeyListT {
     typedef std::vector< KeyT<T> > VecType;
 
@@ -281,7 +147,7 @@ struct KeyListT {
     int mInterpolationType;
     VecType mKeys;
 
-    void read(NIFFile *nif, bool force=false)
+    void read(NIFStream *nif, bool force=false)
     {
         size_t count = nif->getInt();
         if(count == 0 && !force)
@@ -322,13 +188,13 @@ struct KeyListT {
             }
         }
         else
-            nif->warn("Unhandled interpolation type: "+Ogre::StringConverter::toString(mInterpolationType));
+            nif->file->warn("Unhandled interpolation type: "+Ogre::StringConverter::toString(mInterpolationType));
     }
 };
-typedef KeyListT<float,&NIFFile::getFloat> FloatKeyList;
-typedef KeyListT<Ogre::Vector3,&NIFFile::getVector3> Vector3KeyList;
-typedef KeyListT<Ogre::Vector4,&NIFFile::getVector4> Vector4KeyList;
-typedef KeyListT<Ogre::Quaternion,&NIFFile::getQuaternion> QuaternionKeyList;
+typedef KeyListT<float,&NIFStream::getFloat> FloatKeyList;
+typedef KeyListT<Ogre::Vector3,&NIFStream::getVector3> Vector3KeyList;
+typedef KeyListT<Ogre::Vector4,&NIFStream::getVector4> Vector4KeyList;
+typedef KeyListT<Ogre::Quaternion,&NIFStream::getQuaternion> QuaternionKeyList;
 
 } // Namespace
 #endif
diff --git a/components/nif/nifstream.hpp b/components/nif/nifstream.hpp
new file mode 100644
index 0000000000..02b931b7ed
--- /dev/null
+++ b/components/nif/nifstream.hpp
@@ -0,0 +1,175 @@
+#ifndef OPENMW_COMPONENTS_NIF_NIFSTREAM_HPP
+#define OPENMW_COMPONENTS_NIF_NIFSTREAM_HPP
+
+namespace Nif
+{
+
+class NIFFile;
+
+class NIFStream {
+
+    /// Input stream
+    Ogre::DataStreamPtr inp;
+
+    uint8_t read_byte()
+    {
+        uint8_t byte;
+        if(inp->read(&byte, 1) != 1) return 0;
+        return byte;
+    }
+    uint16_t read_le16()
+    {
+        uint8_t buffer[2];
+        if(inp->read(buffer, 2) != 2) return 0;
+        return buffer[0] | (buffer[1]<<8);
+    }
+    uint32_t read_le32()
+    {
+        uint8_t buffer[4];
+        if(inp->read(buffer, 4) != 4) return 0;
+        return buffer[0] | (buffer[1]<<8) | (buffer[2]<<16) | (buffer[3]<<24);
+    }
+    float read_le32f()
+    {
+        union {
+            uint32_t i;
+            float f;
+        } u = { read_le32() };
+        return u.f;
+    }
+
+public:
+
+    NIFFile * const file;
+
+    NIFStream (NIFFile * file, Ogre::DataStreamPtr inp): file (file), inp (inp) {}
+
+    /*************************************************
+               Parser functions
+    ****************************************************/
+
+    template <typename T>
+    struct GetHandler
+    {
+        typedef T (NIFStream::*fn_t)();
+
+        static const fn_t sValue; // this is specialized per supported type in the .cpp file
+
+        static T read (NIFStream* nif)
+        {
+            return (nif->*sValue) ();
+        }
+    };
+
+    template <typename T>
+    void read (NIFStream* nif, T & Value)
+    {
+        Value = GetHandler <T>::read (nif);
+    }
+
+    void skip(size_t size) { inp->skip(size); }
+    void read (void * data, size_t size) { inp->read (data, size); }
+
+    char getChar() { return read_byte(); }
+    short getShort() { return read_le16(); }
+    unsigned short getUShort() { return read_le16(); }
+    int getInt() { return read_le32(); }
+    int getUInt() { return read_le32(); }
+    float getFloat() { return read_le32f(); }
+    Ogre::Vector2 getVector2()
+    {
+        float a[2];
+        for(size_t i = 0;i < 2;i++)
+            a[i] = getFloat();
+        return Ogre::Vector2(a);
+    }
+    Ogre::Vector3 getVector3()
+    {
+        float a[3];
+        for(size_t i = 0;i < 3;i++)
+            a[i] = getFloat();
+        return Ogre::Vector3(a);
+    }
+    Ogre::Vector4 getVector4()
+    {
+        float a[4];
+        for(size_t i = 0;i < 4;i++)
+            a[i] = getFloat();
+        return Ogre::Vector4(a);
+    }
+    Ogre::Matrix3 getMatrix3()
+    {
+        Ogre::Real a[3][3];
+        for(size_t i = 0;i < 3;i++)
+        {
+            for(size_t j = 0;j < 3;j++)
+                a[i][j] = Ogre::Real(getFloat());
+        }
+        return Ogre::Matrix3(a);
+    }
+    Ogre::Quaternion getQuaternion()
+    {
+        float a[4];
+        for(size_t i = 0;i < 4;i++)
+            a[i] = getFloat();
+        return Ogre::Quaternion(a);
+    }
+    Transformation getTrafo()
+    {
+        Transformation t;
+        t.pos = getVector3();
+        t.rotation = getMatrix3();
+        t.scale = getFloat();
+        return t;
+    }
+
+    std::string getString(size_t length)
+    {
+        std::vector<char> str (length+1, 0);
+
+        if(inp->read(&str[0], length) != length)
+            throw std::runtime_error ("string length in NIF file does not match");
+
+        return &str[0];
+    }
+    std::string getString()
+    {
+        size_t size = read_le32();
+        return getString(size);
+    }
+
+    void getShorts(std::vector<short> &vec, size_t size)
+    {
+        vec.resize(size);
+        for(size_t i = 0;i < vec.size();i++)
+            vec[i] = getShort();
+    }
+    void getFloats(std::vector<float> &vec, size_t size)
+    {
+        vec.resize(size);
+        for(size_t i = 0;i < vec.size();i++)
+            vec[i] = getFloat();
+    }
+    void getVector2s(std::vector<Ogre::Vector2> &vec, size_t size)
+    {
+        vec.resize(size);
+        for(size_t i = 0;i < vec.size();i++)
+            vec[i] = getVector2();
+    }
+    void getVector3s(std::vector<Ogre::Vector3> &vec, size_t size)
+    {
+        vec.resize(size);
+        for(size_t i = 0;i < vec.size();i++)
+            vec[i] = getVector3();
+    }
+    void getVector4s(std::vector<Ogre::Vector4> &vec, size_t size)
+    {
+        vec.resize(size);
+        for(size_t i = 0;i < vec.size();i++)
+            vec[i] = getVector4();
+    }
+};
+
+}
+
+#endif
diff --git a/components/nif/nif_types.hpp b/components/nif/niftypes.hpp
similarity index 93%
rename from components/nif/nif_types.hpp
rename to components/nif/niftypes.hpp
index a5fb613617..786c48b65e 100644
--- a/components/nif/nif_types.hpp
+++ b/components/nif/niftypes.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_TYPES_H_
-#define _NIF_TYPES_H_
+#ifndef OPENMW_COMPONENTS_NIF_NIFTYPES_HPP
+#define OPENMW_COMPONENTS_NIF_NIFTYPES_HPP
 
 #include <OgreVector3.h>
 #include <OgreMatrix3.h>
diff --git a/components/nif/node.hpp b/components/nif/node.hpp
index 07e7868cce..ab92d74f8d 100644
--- a/components/nif/node.hpp
+++ b/components/nif/node.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_NODE_H_
-#define _NIF_NODE_H_
+#ifndef OPENMW_COMPONENTS_NIF_NODE_HPP
+#define OPENMW_COMPONENTS_NIF_NODE_HPP
 
 #include <OgreMatrix4.h>
 
@@ -54,7 +54,7 @@ public:
     Ogre::Matrix3 boundRot;
     Ogre::Vector3 boundXYZ; // Box size
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Named::read(nif);
 
@@ -128,7 +128,7 @@ struct NiNode : Node
         0x20, 0x40, 0x80 unknown
     */
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Node::read(nif);
         children.read(nif);
@@ -162,7 +162,7 @@ struct NiTriShape : Node
     NiTriShapeDataPtr data;
     NiSkinInstancePtr skin;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Node::read(nif);
         data.read(nif);
@@ -190,7 +190,7 @@ struct NiCamera : Node
         // Level of detail modifier
         float LOD;
 
-        void read(NIFFile *nif)
+        void read(NIFStream *nif)
         {
             left = nif->getFloat();
             right = nif->getFloat();
@@ -209,7 +209,7 @@ struct NiCamera : Node
     };
     Camera cam;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Node::read(nif);
 
@@ -224,7 +224,7 @@ struct NiAutoNormalParticles : Node
 {
     NiAutoNormalParticlesDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Node::read(nif);
         data.read(nif);
@@ -242,7 +242,7 @@ struct NiRotatingParticles : Node
 {
     NiRotatingParticlesDataPtr data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Node::read(nif);
         data.read(nif);
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index 046fb04652..cd1e0a5d11 100644
--- a/components/nif/property.hpp
+++ b/components/nif/property.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_PROPERTY_H_
-#define _NIF_PROPERTY_H_
+#ifndef OPENMW_COMPONENTS_NIF_PROPERTY_HPP
+#define OPENMW_COMPONENTS_NIF_PROPERTY_HPP
 
 #include "controlled.hpp"
 
@@ -35,7 +35,7 @@ public:
     // The meaning of these depends on the actual property type.
     int flags;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Named::read(nif);
         flags = nif->getUShort();
@@ -67,7 +67,7 @@ public:
         int clamp, set, filter;
         short unknown2;
 
-        void read(NIFFile *nif)
+        void read(NIFStream *nif)
         {
             inUse = !!nif->getInt();
             if(!inUse) return;
@@ -111,7 +111,7 @@ public:
      */
     Texture textures[7];
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Property::read(nif);
         apply = nif->getInt();
@@ -157,7 +157,7 @@ struct StructPropT : Property
 {
     T data;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         Property::read(nif);
         data.read(nif);
@@ -170,7 +170,7 @@ struct S_MaterialProperty
     Ogre::Vector3 ambient, diffuse, specular, emissive;
     float glossiness, alpha;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         ambient = nif->getVector3();
         diffuse = nif->getVector3();
@@ -194,7 +194,7 @@ struct S_VertexColorProperty
     */
     int vertmode, lightmode;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         vertmode = nif->getInt();
         lightmode = nif->getInt();
@@ -251,7 +251,7 @@ struct S_AlphaProperty
     // Tested against when certain flags are set (see above.)
     unsigned char threshold;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         threshold = nif->getChar();
     }
@@ -300,7 +300,7 @@ struct S_StencilProperty
      */
     int drawMode;
 
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         enabled = nif->getChar();
         compareFunc = nif->getInt();
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 073f4657c0..3a3cd9b84a 100644
--- a/components/nif/record.hpp
+++ b/components/nif/record.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _NIF_RECORD_H_
-#define _NIF_RECORD_H_
+#ifndef OPENMW_COMPONENTS_NIF_RECORD_HPP
+#define OPENMW_COMPONENTS_NIF_RECORD_HPP
 
 #include <string>
 
@@ -30,6 +30,7 @@ namespace Nif
 {
 
 class NIFFile;
+class NIFStream;
 
 enum RecordType
 {
@@ -97,7 +98,7 @@ struct Record
     Record() : recType(RC_MISSING), recIndex(~(size_t)0) {}
 
     /// Parses the record from file
-    virtual void read(NIFFile *nif) = 0;
+    virtual void read(NIFStream *nif) = 0;
 
     /// Does post-processing, after the entire tree is loaded
     virtual void post(NIFFile *nif) {}
diff --git a/components/nif/record_ptr.hpp b/components/nif/recordptr.hpp
similarity index 95%
rename from components/nif/record_ptr.hpp
rename to components/nif/recordptr.hpp
index ef5bb1deec..c5bafea124 100644
--- a/components/nif/record_ptr.hpp
+++ b/components/nif/recordptr.hpp
@@ -21,10 +21,10 @@
 
  */
 
-#ifndef _NIF_RECORD_PTR_H_
-#define _NIF_RECORD_PTR_H_
+#ifndef OPENMW_COMPONENTS_NIF_RECORDPTR_HPP
+#define OPENMW_COMPONENTS_NIF_RECORDPTR_HPP
 
-#include "nif_file.hpp"
+#include "niffile.hpp"
 #include <vector>
 
 namespace Nif
@@ -46,7 +46,7 @@ public:
     RecordPtrT() : index(-2) {}
 
     /// Read the index from the nif
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         // Can only read the index once
         assert(index == -2);
@@ -99,7 +99,7 @@ class RecordListT
     std::vector<Ptr> list;
 
 public:
-    void read(NIFFile *nif)
+    void read(NIFStream *nif)
     {
         int len = nif->getInt();
         list.resize(len);
diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bulletnifloader.cpp
similarity index 99%
rename from components/nifbullet/bullet_nif_loader.cpp
rename to components/nifbullet/bulletnifloader.cpp
index 3d9c16ebbf..91fd6dbcfa 100644
--- a/components/nifbullet/bullet_nif_loader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -21,11 +21,11 @@ http://www.gnu.org/licenses/ .
 
 */
 
-#include "bullet_nif_loader.hpp"
+#include "bulletnifloader.hpp"
 #include <Ogre.h>
 #include <cstdio>
 
-#include "../nif/nif_file.hpp"
+#include "../nif/niffile.hpp"
 #include "../nif/node.hpp"
 #include "../nif/data.hpp"
 #include "../nif/property.hpp"
diff --git a/components/nifbullet/bullet_nif_loader.hpp b/components/nifbullet/bulletnifloader.hpp
similarity index 96%
rename from components/nifbullet/bullet_nif_loader.hpp
rename to components/nifbullet/bulletnifloader.hpp
index 0629b208de..0ff4b4ccd7 100644
--- a/components/nifbullet/bullet_nif_loader.hpp
+++ b/components/nifbullet/bulletnifloader.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _BULLET_NIF_LOADER_H_
-#define _BULLET_NIF_LOADER_H_
+#ifndef OPENMW_COMPONENTS_NIFBULLET_BULLETNIFLOADER_HPP
+#define OPENMW_COMPONENTS_NIFBULLET_BULLETNIFLOADER_HPP
 
 #include <OgreMesh.h>
 #include <cassert>
diff --git a/components/nifogre/ogre_nif_loader.cpp b/components/nifogre/ogrenifloader.cpp
similarity index 99%
rename from components/nifogre/ogre_nif_loader.cpp
rename to components/nifogre/ogrenifloader.cpp
index a48e997810..b71c4b3fd2 100644
--- a/components/nifogre/ogre_nif_loader.cpp
+++ b/components/nifogre/ogrenifloader.cpp
@@ -21,7 +21,7 @@
 
  */
 
-#include "ogre_nif_loader.hpp"
+#include "ogrenifloader.hpp"
 
 #include <algorithm>
 
diff --git a/components/nifogre/ogre_nif_loader.hpp b/components/nifogre/ogrenifloader.hpp
similarity index 96%
rename from components/nifogre/ogre_nif_loader.hpp
rename to components/nifogre/ogrenifloader.hpp
index eae37dd8a9..b8b2e3c007 100644
--- a/components/nifogre/ogre_nif_loader.hpp
+++ b/components/nifogre/ogrenifloader.hpp
@@ -21,8 +21,8 @@
 
  */
 
-#ifndef _OGRE_NIF_LOADER_H_
-#define _OGRE_NIF_LOADER_H_
+#ifndef OPENMW_COMPONENTS_NIFOGRE_OGRENIFLOADER_HPP
+#define OPENMW_COMPONENTS_NIFOGRE_OGRENIFLOADER_HPP
 
 #include <OgreResource.h>
 #include <OgreMesh.h>
diff --git a/components/nifoverrides/nifoverrides.hpp b/components/nifoverrides/nifoverrides.hpp
index c9b711df67..ba2e4cc3c3 100644
--- a/components/nifoverrides/nifoverrides.hpp
+++ b/components/nifoverrides/nifoverrides.hpp
@@ -1,5 +1,5 @@
-#ifndef COMPONENTS_NIFOVERRIDES_H
-#define COMPONENTS_NIFOVERRIDES_H
+#ifndef OPENMW_COMPONENTS_NIFOVERRIDES_NIFOVERRIDES_HPP
+#define OPENMW_COMPONENTS_NIFOVERRIDES_NIFOVERRIDES_HPP
 
 #include <OgreConfigFile.h>
 
diff --git a/libs/openengine/bullet/CMotionState.cpp b/libs/openengine/bullet/CMotionState.cpp
index 6be615dfb0..c20415884a 100644
--- a/libs/openengine/bullet/CMotionState.cpp
+++ b/libs/openengine/bullet/CMotionState.cpp
@@ -3,7 +3,7 @@
 
 #include <btBulletDynamicsCommon.h>
 #include <btBulletCollisionCommon.h>
-#include <components/nifbullet/bullet_nif_loader.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
 
 namespace OEngine {
 namespace Physic
diff --git a/libs/openengine/bullet/physic.cpp b/libs/openengine/bullet/physic.cpp
index f993ce68e2..119f6893a3 100644
--- a/libs/openengine/bullet/physic.cpp
+++ b/libs/openengine/bullet/physic.cpp
@@ -2,7 +2,7 @@
 #include <btBulletDynamicsCommon.h>
 #include <btBulletCollisionCommon.h>
 #include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h>
-#include <components/nifbullet/bullet_nif_loader.hpp>
+#include <components/nifbullet/bulletnifloader.hpp>
 #include "CMotionState.h"
 #include "OgreRoot.h"
 #include "btKinematicCharacterController.h"