diff --git a/src/dgraph/entity.cpp b/src/dgraph/entity.cpp
index 0b5c5dbbdaa4ebb2e510f35c3de28cc65a910917..4d6c9a369cf78c27ebd4570f1ae27cb2be9c4470 100644
--- a/src/dgraph/entity.cpp
+++ b/src/dgraph/entity.cpp
@@ -34,9 +34,6 @@ using namespace std;
 using namespace dynamicgraph;
 using dynamicgraph::command::Command;
 
-const std::string Entity::CLASS_NAME = "Entity";
-
-
 void Entity::
 entityRegistration  ()
 {
diff --git a/tests/entity.cpp b/tests/entity.cpp
index 0bd94db79d198173b836aa25ef49e5f9cb699889..a614ad8aaa45c3471d1b129c6405390677040948 100644
--- a/tests/entity.cpp
+++ b/tests/entity.cpp
@@ -50,7 +50,8 @@ BOOST_AUTO_TEST_CASE (constructor)
 
    dynamicgraph::CustomEntity entity ("my-entity");
    BOOST_CHECK_EQUAL (entity.getName (), "my-entity");
-   BOOST_CHECK_EQUAL (entity.getClassName (), dynamicgraph::Entity::CLASS_NAME);
+   BOOST_CHECK_EQUAL (entity.getClassName (),
+		      dynamicgraph::CustomEntity::CLASS_NAME);
 
    dynamicgraph::CustomEntity entity2 ("");
 }