diff --git a/config/module.config.php b/config/module.config.php
index 22c8fd1d924b9350f2f559ac381f73c8b87c6055..79389b49af829d41646c24e225a38c132f055882 100755
--- a/config/module.config.php
+++ b/config/module.config.php
@@ -19,14 +19,14 @@ return [
             'orm_default' => [
                 'class' => MappingDriverChain::class,
                 'drivers' => [
-                    'Observation\Entity\Db' => 'orm_default_xml_driver',
+                    'UnicaenObservation\Entity\Db' => 'orm_default_xml_driver',
                 ],
             ],
             'orm_default_xml_driver' => [
                 'class' => XmlDriver::class,
                 'cache' => 'apc',
                 'paths' => [
-                    __DIR__ . '/../src/Observation/Entity/Db/Mapping',
+                    __DIR__ . '/../src/UnicaenObservation/Entity/Db/Mapping',
                 ],
             ],
         ],
diff --git a/src/UnicaenObservation/Entity/Db/Mapping/Observation.Entity.Db.ObservationInstance.dcm.xml b/src/UnicaenObservation/Entity/Db/Mapping/UnicaenObservation.Entity.Db.ObservationInstance.dcm.xml
similarity index 100%
rename from src/UnicaenObservation/Entity/Db/Mapping/Observation.Entity.Db.ObservationInstance.dcm.xml
rename to src/UnicaenObservation/Entity/Db/Mapping/UnicaenObservation.Entity.Db.ObservationInstance.dcm.xml
diff --git a/src/UnicaenObservation/Entity/Db/Mapping/Observation.Entity.Db.ObservationType.dcm.xml b/src/UnicaenObservation/Entity/Db/Mapping/UnicaenObservation.Entity.Db.ObservationType.dcm.xml
similarity index 100%
rename from src/UnicaenObservation/Entity/Db/Mapping/Observation.Entity.Db.ObservationType.dcm.xml
rename to src/UnicaenObservation/Entity/Db/Mapping/UnicaenObservation.Entity.Db.ObservationType.dcm.xml
diff --git a/src/UnicaenObservation/View/Helper/partial/observation-instance.phtml b/src/UnicaenObservation/View/Helper/partial/observation-instance.phtml
index 4be29ef500185c42173ef485b0f0d14741137af0..c7346eab663fa47c900e57b921255c65e8612e03 100644
--- a/src/UnicaenObservation/View/Helper/partial/observation-instance.phtml
+++ b/src/UnicaenObservation/View/Helper/partial/observation-instance.phtml
@@ -1,11 +1,11 @@
 <?php
 
-use Observation\Entity\Db\ObservationInstance;
-use Observation\Provider\Privilege\ObservationinstancePrivileges;
-use Observation\Provider\Validation\ObservationValidations;
+use UnicaenObservation\Entity\Db\ObservationInstance;
+use UnicaenObservation\Provider\Privilege\ObservationinstancePrivileges;
+use UnicaenObservation\Provider\Validation\ObservationValidations;
 
 /**
- * @see \Observation\View\Helper\ObservationInstanceViewHelper
+ * @see \UnicaenObservation\View\Helper\ObservationInstanceViewHelper
  * @var ObservationInstance $observation
  * @var array $options
  */