diff --git a/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.cpp b/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.cpp
index 778236cb55a..a12051455fa 100644
--- a/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.cpp
+++ b/extern/bullet/Bullet/CollisionDispatch/CollisionDispatcher.cpp
@@ -17,7 +17,7 @@
 #include "CollisionDispatch/EmptyCollisionAlgorithm.h"
 #include "CollisionDispatch/ConvexConcaveCollisionAlgorithm.h"
 
-#include "NarrowphaseCollision/CollisionObject.h"
+#include "NarrowPhaseCollision/CollisionObject.h"
 #include <algorithm>
 
 void CollisionDispatcher::FindUnions()
@@ -221,4 +221,4 @@ bool	CollisionDispatcher::NeedsCollision(BroadphaseProxy& proxy0,BroadphaseProxy
 	
 	return needsCollision ;
 
-}
\ No newline at end of file
+}
diff --git a/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.cpp b/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.cpp
index da83ada22c4..b0975e5ac03 100644
--- a/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.cpp
+++ b/extern/bullet/Bullet/CollisionDispatch/CollisionWorld.cpp
@@ -11,7 +11,7 @@
 
 #include "CollisionWorld.h"
 #include "CollisionDispatcher.h"
-#include "NarrowphaseCollision/CollisionObject.h"
+#include "NarrowPhaseCollision/CollisionObject.h"
 #include "CollisionShapes/CollisionShape.h"
 
 #include "BroadphaseCollision/BroadphaseInterface.h"
@@ -120,4 +120,4 @@ void	CollisionWorld::RemoveCollisionObject(CollisionObject* collisionObject)
 			std::swap(*i, m_collisionObjects.back());
 			m_collisionObjects.pop_back();
 		}
-}
\ No newline at end of file
+}
diff --git a/extern/bullet/SConscript b/extern/bullet/SConscript
index 70fb59334fe..b6a92b43e8b 100644
--- a/extern/bullet/SConscript
+++ b/extern/bullet/SConscript
@@ -35,7 +35,7 @@ else:
 
 sources = [         'Bullet/BroadphaseCollision/BroadphaseProxy.cpp',
                 'Bullet/BroadphaseCollision/CollisionAlgorithm.cpp',
-                'Bullet/BroadphaseCollision/CollisionDispatcher.cpp',
+                'Bullet/BroadphaseCollision/Dispatcher.cpp',
                 'Bullet/BroadphaseCollision/SimpleBroadphase.cpp',
                 
                 'Bullet/CollisionShapes/BoxShape.cpp',
@@ -76,12 +76,14 @@ sources = [         'Bullet/BroadphaseCollision/BroadphaseProxy.cpp',
                 'Bullet/NarrowPhaseCollision/VoronoiSimplexSolver.cpp',
                 'Bullet/NarrowPhaseCollision/ManifoldContactAddResult.cpp',
                                 
-                'BulletDynamics/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp',
-                'BulletDynamics/CollisionDispatch/ConvexConvexAlgorithm.cpp',
-                'BulletDynamics/CollisionDispatch/EmptyCollisionAlgorithm.cpp',
-                'BulletDynamics/CollisionDispatch/ManifoldResult.cpp',
-                'BulletDynamics/CollisionDispatch/ToiContactDispatcher.cpp',
-                'BulletDynamics/CollisionDispatch/UnionFind.cpp',
+                'Bullet/CollisionDispatch/ConvexConcaveCollisionAlgorithm.cpp',
+                'Bullet/CollisionDispatch/ConvexConvexAlgorithm.cpp',
+                'Bullet/CollisionDispatch/EmptyCollisionAlgorithm.cpp',
+                'Bullet/CollisionDispatch/ManifoldResult.cpp',
+                'Bullet/CollisionDispatch/CollisionDispatcher.cpp',
+                'Bullet/CollisionDispatch/UnionFind.cpp',
+		'Bullet/NarrowPhaseCollision/CollisionObject.cpp',
+		'Bullet/CollisionDispatch/CollisionWorld.cpp',
                 
                 'BulletDynamics/ConstraintSolver/ContactConstraint.cpp',
                 'BulletDynamics/ConstraintSolver/OdeConstraintSolver.cpp',