diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index d14696cdd..a69dc7402 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -9,7 +9,7 @@
 #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>
diff --git a/apps/openmw/mwworld/scene.cpp b/apps/openmw/mwworld/scene.cpp
index ecf783d6c..35024b307 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 00342e2ac..a80afdd6b 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -15,7 +15,7 @@ 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
diff --git a/components/nif/controlled.hpp b/components/nif/controlled.hpp
index dac541b2d..36c9a82ac 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"
diff --git a/components/nif/controller.hpp b/components/nif/controller.hpp
index 4f7ef3c0f..8331b93b7 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
 {
diff --git a/components/nif/data.hpp b/components/nif/data.hpp
index 5f18800f0..9bdba6396 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"
 
diff --git a/components/nif/effect.hpp b/components/nif/effect.hpp
index b07a39303..cc1b0f41c 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"
 
diff --git a/components/nif/extra.hpp b/components/nif/extra.hpp
index b5335f987..45c4fefc6 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
 {
diff --git a/components/nif/nif_file.cpp b/components/nif/niffile.cpp
similarity index 99%
rename from components/nif/nif_file.cpp
rename to components/nif/niffile.cpp
index dc8670cba..bf05e7576 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"
 
diff --git a/components/nif/nif_file.hpp b/components/nif/niffile.hpp
similarity index 97%
rename from components/nif/nif_file.hpp
rename to components/nif/niffile.hpp
index a406de4a0..ed11bdd7c 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,8 +45,8 @@
 #include <libs/platform/stdint.h>
 
 #include "record.hpp"
-#include "nif_types.hpp"
-#include "nif_stream.hpp"
+#include "niftypes.hpp"
+#include "nifstream.hpp"
 
 namespace Nif
 {
diff --git a/components/nif/nif_stream.hpp b/components/nif/nifstream.hpp
similarity index 97%
rename from components/nif/nif_stream.hpp
rename to components/nif/nifstream.hpp
index 8fb98f3d6..02b931b7e 100644
--- a/components/nif/nif_stream.hpp
+++ b/components/nif/nifstream.hpp
@@ -1,5 +1,5 @@
-#ifndef _NIF_STREAM_HPP_
-#define _NIF_STREAM_HPP_
+#ifndef OPENMW_COMPONENTS_NIF_NIFSTREAM_HPP
+#define OPENMW_COMPONENTS_NIF_NIFSTREAM_HPP
 
 namespace Nif
 {
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 a5fb61361..786c48b65 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 e08703756..ab92d74f8 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>
 
diff --git a/components/nif/property.hpp b/components/nif/property.hpp
index cdf97986c..cd1e0a5d1 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"
 
diff --git a/components/nif/record.hpp b/components/nif/record.hpp
index 9f0645dfd..3a3cd9b84 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>
 
diff --git a/components/nif/record_ptr.hpp b/components/nif/recordptr.hpp
similarity index 97%
rename from components/nif/record_ptr.hpp
rename to components/nif/recordptr.hpp
index 855099a04..c5bafea12 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
diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bullet_nif_loader.cpp
index 3d9c16ebb..e33754264 100644
--- a/components/nifbullet/bullet_nif_loader.cpp
+++ b/components/nifbullet/bullet_nif_loader.cpp
@@ -25,7 +25,7 @@ http://www.gnu.org/licenses/ .
 #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"