diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index a69dc7402..74e967d8d 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -12,8 +12,8 @@
 #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 810ca869f..7caf35169 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 e91180a42..89425e9f2 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 062079693..0f778511d 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 65cbc1164..566a463b6 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/components/CMakeLists.txt b/components/CMakeLists.txt
index a80afdd6b..9fdc72873 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -19,11 +19,11 @@ add_component_dir (nif
     )
 
 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/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 e33754264..91fd6dbcf 100644
--- a/components/nifbullet/bullet_nif_loader.cpp
+++ b/components/nifbullet/bulletnifloader.cpp
@@ -21,7 +21,7 @@ http://www.gnu.org/licenses/ .
 
 */
 
-#include "bullet_nif_loader.hpp"
+#include "bulletnifloader.hpp"
 #include <Ogre.h>
 #include <cstdio>
 
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 0629b208d..0ff4b4ccd 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 d33243dd4..4eaedeaa8 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 eae37dd8a..b8b2e3c00 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 c9b711df6..ba2e4cc3c 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 6be615dfb..c20415884 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 f993ce68e..119f6893a 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"