diff --git a/main/admin/class_add.php b/main/admin/class_add.php
index ff84ba183e..e9c4461d62 100755
--- a/main/admin/class_add.php
+++ b/main/admin/class_add.php
@@ -1,34 +1,11 @@
 <?php
-// $Id: class_add.php 10215 2006-11-27 13:57:17Z pcool $
-/*
-==============================================================================
-    Dokeos - elearning and course management software
-
-    Copyright (c) 2004 Dokeos S.A.
-    Copyright (c) 2003 Ghent University (UGent)
-    Copyright (c) 2001 Universite catholique de Louvain (UCL)
-    Copyright (c) Olivier Brouckaert
-    Copyright (c) Bart Mollet, Hogeschool Gent
-
-    For a full list of contributors, see "credits.txt".
-    The full license can be read in "license.txt".
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    See the GNU General Public License for more details.
-
-    Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
-==============================================================================
+*	@package chamilo.admin
 */
-
+/**
+ * Code
+ */
 // Language files that should be included.
 $language_file = 'admin';
 
diff --git a/main/admin/class_edit.php b/main/admin/class_edit.php
index 6e3c317845..655a53896e 100755
--- a/main/admin/class_edit.php
+++ b/main/admin/class_edit.php
@@ -1,34 +1,11 @@
 <?php
-// $Id: class_edit.php 10215 2006-11-27 13:57:17Z pcool $
-
-/*
-==============================================================================
-    Dokeos - elearning and course management software
-
-    Copyright (c) 2004 Dokeos S.A.
-    Copyright (c) 2003 Ghent University (UGent)
-    Copyright (c) 2001 Universite catholique de Louvain (UCL)
-    Copyright (c) Olivier Brouckaert
-
-    For a full list of contributors, see "credits.txt".
-    The full license can be read in "license.txt".
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    See the GNU General Public License for more details.
-
-    Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
-==============================================================================
+*	@package chamilo.admin
 */
-
+/**
+ * Code
+ */
 // Language files that should be included.
 $language_file = 'admin';
 
diff --git a/main/admin/class_import.php b/main/admin/class_import.php
index 11be17c1b7..c137deea26 100755
--- a/main/admin/class_import.php
+++ b/main/admin/class_import.php
@@ -1,34 +1,12 @@
 <?php
-// $Id: class_import.php 10215 2006-11-27 13:57:17Z pcool $
-/*
-==============================================================================
-    Dokeos - elearning and course management software
-
-    Copyright (c) 2004 Dokeos S.A.
-    Copyright (c) 2003 Ghent University (UGent)
-    Copyright (c) 2001 Universite catholique de Louvain (UCL)
-    Copyright (c) Olivier Brouckaert
-    Copyright (c) Bart Mollet, Hogeschool Gent
-
-    For a full list of contributors, see "credits.txt".
-    The full license can be read in "license.txt".
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    See the GNU General Public License for more details.
-
-    Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
+/* For licensing terms, see /license.txt */
+/**
+*	@package chamilo.admin
 */
 /**
-==============================================================================
+ * Code
 *   This     tool allows platform admins to add classes by uploading a CSV file
 * @todo Add some langvars to DLTT
-*	@package dokeos.admin
-==============================================================================
 */
 
 /**
diff --git a/main/admin/class_information.php b/main/admin/class_information.php
index fba2425f80..0b18a277e7 100755
--- a/main/admin/class_information.php
+++ b/main/admin/class_information.php
@@ -1,31 +1,11 @@
-<?php // $Id: class_information.php 16954 2008-11-26 14:41:35Z pcool $
-/*
-==============================================================================
-    Dokeos - elearning and course management software
-
-    Copyright (c) 2004 Dokeos S.A.
-    Copyright (c) 2003 Ghent University (UGent)
-    Copyright (c) 2001 Universite catholique de Louvain (UCL)
-    Copyright (c) Olivier Brouckaert
-
-    For a full list of contributors, see "credits.txt".
-    The full license can be read in "license.txt".
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    See the GNU General Public License for more details.
-
-    Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
+<?php
+/* For licensing terms, see /license.txt */
+/**
+*	@package chamilo.admin
 */
 /**
-==============================================================================
+ * Code
 *	@author	 Bart Mollet
-*	@package dokeos.admin
-==============================================================================
 */
 
 // Language files that should be included.
diff --git a/main/admin/class_list.php b/main/admin/class_list.php
index fd7585392b..50123248f0 100755
--- a/main/admin/class_list.php
+++ b/main/admin/class_list.php
@@ -1,33 +1,11 @@
 <?php
-// $Id: class_list.php 20441 2009-05-10 07:39:15Z ivantcholakov $
-/*
-==============================================================================
-    Dokeos - elearning and course management software
-
-    Copyright (c) 2004 Dokeos S.A.
-    Copyright (c) 2003 Ghent University (UGent)
-    Copyright (c) 2001 Universite catholique de Louvain (UCL)
-    Copyright (c) Olivier Brouckaert
-
-    For a full list of contributors, see "credits.txt".
-    The full license can be read in "license.txt".
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    See the GNU General Public License for more details.
-
-    Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
-==============================================================================
+*	@package chamilo.admin
 */
-
+/**
+ * Code
+ */
 $language_file = 'admin';
 
 $cidReset = true;
diff --git a/main/admin/class_user_import.php b/main/admin/class_user_import.php
index fa1fe8a03b..0e74e54334 100755
--- a/main/admin/class_user_import.php
+++ b/main/admin/class_user_import.php
@@ -1,31 +1,12 @@
 <?php
-
-// $Id: class_user_import.php 9018 2006-06-28 15:11:16Z evie_em $
-/*
-==============================================================================
-    Dokeos - elearning and course management software
-
-    Copyright (c) 2005 Bart Mollet <bart.mollet@hogent.be>
-
-    For a full list of contributors, see "credits.txt".
-    The full license can be read in "license.txt".
-
-    This program is free software; you can redistribute it and/or
-    modify it under the terms of the GNU General Public License
-    as published by the Free Software Foundation; either version 2
-    of the License, or (at your option) any later version.
-
-    See the GNU General Public License for more details.
-
-    Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-==============================================================================
+/* For licensing terms, see /license.txt */
+/**
+*	@package chamilo.admin
 */
 /**
-==============================================================================
+ * Code
 * This tool allows platform admins to update class-user relations by uploading
 * a CSVfile
-* @package dokeos.admin
-==============================================================================
 */
 
 /**
diff --git a/main/exercice/answer_admin.inc.php b/main/exercice/answer_admin.inc.php
index e25b8e2dcc..f4e3dc9d57 100755
--- a/main/exercice/answer_admin.inc.php
+++ b/main/exercice/answer_admin.inc.php
@@ -3,11 +3,13 @@
 // YW: 20110209: Script depredated? 
 /**
 *	This script allows to manage answers. It is included from the script admin.php
-*	@package dokeos.exercise
+*	@package chamilo.exercise
 * 	@author Olivier Brouckaert
 * 	@version $Id: answer_admin.inc.php 21361 2009-06-11 04:08:58Z ivantcholakov $
 */
-
+/**
+ * Code
+ */
 
 // ALLOWED_TO_INCLUDE is defined in admin.php
 if(!defined('ALLOWED_TO_INCLUDE'))
diff --git a/main/exercice/export/index.php b/main/exercice/export/index.php
old mode 100644
new mode 100755
index c3a958ff04..d8f325fd62
--- a/main/exercice/export/index.php
+++ b/main/exercice/export/index.php
@@ -5,9 +5,12 @@
  * @license http://www.gnu.org/copyleft/gpl.html (GPL) GENERAL PUBLIC LICENSE
  *
  * @author Claro Team <cvs@claroline.net>
- * @package dokeos.exercise
+ * @package chamilo.exercise
  *
  */
+/**
+ * Redirection
+ */
 header("Location: ../../../");
 exit();
-?>
\ No newline at end of file
+?>
diff --git a/main/exercice/export/qti2/qti2_classes.php b/main/exercice/export/qti2/qti2_classes.php
index 11fb0880fa..6ae2dc7690 100755
--- a/main/exercice/export/qti2/qti2_classes.php
+++ b/main/exercice/export/qti2/qti2_classes.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 /**
  * @author Claro Team <cvs@claroline.net>
- * @author Yannick Warnier <yannick.warnier@dokeos.com> - updated ImsAnswerHotspot to match QTI norms
+ * @author Yannick Warnier <yannick.warnier@beeznest.com> - updated ImsAnswerHotspot to match QTI norms
  * @package chamilo.exercise
  */
 /**
diff --git a/main/exercice/fill_blanks.class.php b/main/exercice/fill_blanks.class.php
index 7d49acd71a..83a6ede455 100755
--- a/main/exercice/fill_blanks.class.php
+++ b/main/exercice/fill_blanks.class.php
@@ -1,7 +1,5 @@
 <?php
 /* For licensing terms, see /license.txt */
-
-
 /**
 *	File containing the FillBlanks class.
 *	@package chamilo.exercise
@@ -9,7 +7,9 @@
 * 	@author Julio Montoya Armas switchable fill in blank option added
 * 	@version $Id: admin.php 10680 2007-01-11 21:26:23Z pcool $
 */
-
+/**
+ * Code
+ */
 
 if(!class_exists('FillBlanks')):
 
@@ -21,7 +21,7 @@ if(!class_exists('FillBlanks')):
  *
  *	@author Eric Marguin
  * 	@author Julio Montoya multiple fill in blank option added
- *	@package dokeos.exercise
+ *	@package chamilo.exercise
  **/
 
 class FillBlanks extends Question
diff --git a/main/exercice/hotspot.class.php b/main/exercice/hotspot.class.php
index 381d8947f7..c7a0dd7b75 100755
--- a/main/exercice/hotspot.class.php
+++ b/main/exercice/hotspot.class.php
@@ -1,5 +1,5 @@
 <?php //$id:$
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 *	File containing the HotSpot class.
 *	@package chamilo.exercise
diff --git a/main/exercice/mark_free_answer.php b/main/exercice/mark_free_answer.php
index 1ebd7e06ba..0bd34f542d 100755
--- a/main/exercice/mark_free_answer.php
+++ b/main/exercice/mark_free_answer.php
@@ -4,7 +4,7 @@
 *	Free answer marking script
 * 	This script allows a course tutor to mark a student's free answer.
 *	@package chamilo.exercise
-* 	@author Yannick Warnier <yannick.warnier@dokeos.com>
+* 	@author Yannick Warnier <yannick.warnier@beeznest.com>
 * 	@version $Id: admin.php 10680 2007-01-11 21:26:23Z pcool $
 *
 * 	@todo respect coding guidelines
diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php
index 86754cf0a6..33a410b39d 100755
--- a/main/exercice/multiple_answer.class.php
+++ b/main/exercice/multiple_answer.class.php
@@ -3,7 +3,7 @@
 
 /**
  *	File containing the MultipleAnswer class.
- *	@package dokeos.exercise
+ *	@package chamilo.exercise
  * 	@author Eric Marguin
  */
 
diff --git a/main/exercice/multiple_answer_combination.class.php b/main/exercice/multiple_answer_combination.class.php
index f3fd5d390b..f603956722 100755
--- a/main/exercice/multiple_answer_combination.class.php
+++ b/main/exercice/multiple_answer_combination.class.php
@@ -1,13 +1,14 @@
 <?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
 /* For licensing terms, see /chamilo_license.txt */
-
 /**
 *	File containing the MultipleAnswer class.
-*	@package dokeos.exercise
+*	@package chamilo.exercise
 * 	@author Eric Marguin
 * 	@version $Id: admin.php 10680 2007-01-11 21:26:23Z pcool $
 */
-
+/**
+ * Code
+ */
 if(!class_exists('MultipleAnswerCombination')):
 
 /**
@@ -17,7 +18,7 @@ if(!class_exists('MultipleAnswerCombination')):
  *	extending the class question
  *
  *	@author Eric Marguin
- *	@package dokeos.exercise
+ *	@package chamilo.exercise
  **/
 
 class MultipleAnswerCombination extends Question {
diff --git a/main/exercice/unique_answer.class.php b/main/exercice/unique_answer.class.php
index 8d02ed3b62..ebd72d62c9 100755
--- a/main/exercice/unique_answer.class.php
+++ b/main/exercice/unique_answer.class.php
@@ -6,7 +6,9 @@
  *	@package chamilo.exercise
  * 	@author Eric Marguin
  */
-
+/**
+ * Code
+ */
 
 if(!class_exists('UniqueAnswer')):
 
@@ -18,7 +20,7 @@ if(!class_exists('UniqueAnswer')):
  *
  *	@author Eric Marguin
  *  @author Julio Montoya
- *	@package dokeos.exercise
+ *	@package chamilo.exercise
  **/
 
 class UniqueAnswer extends Question {
diff --git a/main/exercice/unique_answer_no_option.class.php b/main/exercice/unique_answer_no_option.class.php
index 831188cb22..3f6ece09ae 100755
--- a/main/exercice/unique_answer_no_option.class.php
+++ b/main/exercice/unique_answer_no_option.class.php
@@ -7,6 +7,9 @@
  * 	@author Eric Marguin
  */
 
+/**
+ * Code
+ */
 
 if(!class_exists('UniqueAnswerNoOption')):
 
@@ -397,7 +400,7 @@ class UniqueAnswerNoOption extends Question {
  			How we are going to parse the destination value
 
 			here we parse the destination value which is a string
-		 	1@@3@@2;4;4;@@http://www.dokeos.com
+		 	1@@3@@2;4;4;@@http://www.chamilo.org
 
 		 	where: try_again@@lp_id@@selected_questions@@url
 
@@ -484,4 +487,4 @@ class UniqueAnswerNoOption extends Question {
         return $header;	
 	}
 }
-endif;
\ No newline at end of file
+endif;