diff --git a/.gitignore b/.gitignore
index 0061e71ff5abd9bc6cf69472e9c44e23c6a7d15f..d1cf0301a77c8413578a677f7763ccac34917516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 lib/
 msg/lisp/
+msg/java/
 msg_gen/
-src/dynamic_graph/
+src/dynamic_graph_bridge/
 bin/
diff --git a/src/ros_export.hxx b/src/ros_export.hxx
index 236ead66d8a083618d4f7be6ca00f5aa17bc21a3..3423835fbb6983ada1f6610fcb45091826e10dd7 100644
--- a/src/ros_export.hxx
+++ b/src/ros_export.hxx
@@ -4,8 +4,8 @@
 # include <boost/bind.hpp>
 # include <jrl/mal/boost.hh>
 # include <std_msgs/Float64.h>
-# include "dynamic_graph/Matrix.h"
-# include "dynamic_graph/Vector.h"
+# include "dynamic_graph_bridge/Matrix.h"
+# include "dynamic_graph_bridge/Vector.h"
 
 
 namespace ml = maal::boost;
diff --git a/src/ros_import.hxx b/src/ros_import.hxx
index 3b8b5024effa53f41ba13f8d932019715efd500d..57f7ccc9fb8456d858e12088daeaafecdbf24f3a 100644
--- a/src/ros_import.hxx
+++ b/src/ros_import.hxx
@@ -2,8 +2,8 @@
 # define DYNAMIC_GRAPH_ROS_IMPORT_HXX
 # include <vector>
 # include <std_msgs/Float64.h>
-# include "dynamic_graph/Matrix.h"
-# include "dynamic_graph/Vector.h"
+# include "dynamic_graph_bridge/Matrix.h"
+# include "dynamic_graph_bridge/Vector.h"
 
 # include "sot_to_ros.hh"
 
diff --git a/src/sot_to_ros.hh b/src/sot_to_ros.hh
index f5ac0cd98120b7957d42374c34eb2030fe437b02..3253aacb2e3f8cb3f51c9001cd76581b9cee8637 100644
--- a/src/sot_to_ros.hh
+++ b/src/sot_to_ros.hh
@@ -3,8 +3,8 @@
 # include <vector>
 # include <jrl/mal/boost.hh>
 # include <std_msgs/Float64.h>
-# include "dynamic_graph/Matrix.h"
-# include "dynamic_graph/Vector.h"
+# include "dynamic_graph_bridge/Matrix.h"
+# include "dynamic_graph_bridge/Vector.h"
 
 namespace dynamicgraph
 {
@@ -27,8 +27,8 @@ namespace dynamicgraph
   struct SotToRos<ml::Matrix>
   {
     typedef ml::Matrix sot_t;
-    typedef dynamic_graph::Matrix ros_t;
-    typedef dynamic_graph::MatrixConstPtr ros_const_ptr_t;
+    typedef dynamic_graph_bridge::Matrix ros_t;
+    typedef dynamic_graph_bridge::MatrixConstPtr ros_const_ptr_t;
     typedef dynamicgraph::SignalTimeDependent<sot_t, int> signal_t;
     typedef boost::function<sot_t& (sot_t&, int)> callback_t;
   };
@@ -37,8 +37,8 @@ namespace dynamicgraph
   struct SotToRos<ml::Vector>
   {
     typedef ml::Vector sot_t;
-    typedef dynamic_graph::Vector ros_t;
-    typedef dynamic_graph::VectorConstPtr ros_const_ptr_t;
+    typedef dynamic_graph_bridge::Vector ros_t;
+    typedef dynamic_graph_bridge::VectorConstPtr ros_const_ptr_t;
     typedef dynamicgraph::SignalTimeDependent<sot_t, int> signal_t;
     typedef boost::function<sot_t& (sot_t&, int)> callback_t;
   };