diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index dae2c9df76..709b21fc84 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -358,7 +358,7 @@ void OMW::Engine::go()
     loadBSA();
 
     // Create physics. shapeLoader is deleted by the physic engine
-    ManualBulletShapeLoader* shapeLoader = new ManualBulletShapeLoader();
+    NifBullet::ManualBulletShapeLoader* shapeLoader = new NifBullet::ManualBulletShapeLoader();
     mPhysicEngine = new OEngine::Physic::PhysicEngine(shapeLoader);
 
     // Create the world
diff --git a/components/nifbullet/bullet_nif_loader.cpp b/components/nifbullet/bullet_nif_loader.cpp
index 1ff78023d9..94a3a5aac8 100644
--- a/components/nifbullet/bullet_nif_loader.cpp
+++ b/components/nifbullet/bullet_nif_loader.cpp
@@ -49,7 +49,7 @@ using namespace Ogre;
 using namespace Nif;
 using namespace Mangle::VFS;
 
-
+using namespace NifBullet;
 
 //====================================================================================================
 Ogre::Matrix3 ManualBulletShapeLoader::getMatrix(Nif::Transformation* tr)
diff --git a/components/nifbullet/bullet_nif_loader.hpp b/components/nifbullet/bullet_nif_loader.hpp
index d960c6629c..360d9850bf 100644
--- a/components/nifbullet/bullet_nif_loader.hpp
+++ b/components/nifbullet/bullet_nif_loader.hpp
@@ -58,6 +58,8 @@ namespace Mangle
     }
 }
 
+namespace NifBullet
+{
 
 /**
 *Load bulletShape from NIF files.
@@ -126,4 +128,6 @@ private:
     btCompoundShape* currentShape;//the shape curently under construction
 };
 
+}
+
 #endif
diff --git a/components/nifbullet/test/test.cpp b/components/nifbullet/test/test.cpp
index b91c486666..261edf512a 100644
--- a/components/nifbullet/test/test.cpp
+++ b/components/nifbullet/test/test.cpp
@@ -90,11 +90,11 @@ int main()
 
 
         //Ressources stuff
-        addBSA("Morrowind.bsa");
+        Bsa::addBSA("Morrowind.bsa");
         //Ogre::ResourceGroupManager::getSingleton().createResourceGroup("general");
 
         Ogre::ResourcePtr ptr = BulletShapeManager::getSingleton().getByName(mesh,"General");
-        ManualBulletShapeLoader* ShapeLoader = new ManualBulletShapeLoader();
+        NifBullet::ManualBulletShapeLoader* ShapeLoader = new NifBullet::ManualBulletShapeLoader();
 
         ShapeLoader->load(mesh,"General");
         //BulletShapeManager::getSingleton().unload(mesh);