diff --git a/main/admin/course_category.php b/main/admin/course_category.php
index 681c0722c6..ee42478343 100755
--- a/main/admin/course_category.php
+++ b/main/admin/course_category.php
@@ -1,33 +1,12 @@
-<?php // $Id: course_category.php 20648 2009-05-14 17:34:11Z cvargas1 $
-/*
-==============================================================================
-	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 dokeos.admin
+*	@package chamilo.admin
 * 	@todo use formvalidator for the form
-==============================================================================
 */
-
+/**
+ * Code
+ */
 // name of the language file that needs to be included
 $language_file='admin';
 
diff --git a/main/admin/course_create_content.php b/main/admin/course_create_content.php
index c34113d1ca..5aae8943a0 100755
--- a/main/admin/course_create_content.php
+++ b/main/admin/course_create_content.php
@@ -1,41 +1,14 @@
 <?php
-// $Id: course_create_content.php 10811 2007-01-22 08:26:40Z elixir_julian $
-/*
-==============================================================================
-	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) 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 address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+/* For licensing terms, see /license.txt */
 /**
- * ==============================================================================
  * This script allows a platform admin to add dummy content to a course.
  *
  * @author Bart Mollet <bart.mollet@hogent.be>
- * @package dokeos.admin
- * ==============================================================================
+ * @package chamilo.admin
+ */
+/**
+ *		INIT SECTION
  */
-/*
-==============================================================================
-		INIT SECTION
-==============================================================================
-*/
 
 // name of the language file that needs to be included
 $language_file = 'admin';
@@ -69,4 +42,4 @@ else
 ==============================================================================
 */
 Display::display_footer();
-?>
\ No newline at end of file
+?>
diff --git a/main/admin/course_export.php b/main/admin/course_export.php
index ff9de04f06..6771abfd40 100755
--- a/main/admin/course_export.php
+++ b/main/admin/course_export.php
@@ -1,13 +1,12 @@
 <?php
-/* For licensing terms, see /dokeos_license.txt */
-
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 * 	This tool allows platform admins to export courses to CSV file
-*	@package dokeos.admin
-==============================================================================
+*	@package chamilo.admin
 */
-
+/**
+ * Code
+ */
 $language_file = array ('admin', 'registration','create_course', 'document');
 $cidReset = true;
 
@@ -120,4 +119,4 @@ foreach($course_list as $course) {
 
 <?php
 Display :: display_footer();
-?>
\ No newline at end of file
+?>
diff --git a/main/admin/course_information.php b/main/admin/course_information.php
index c547484821..93f328ec71 100755
--- a/main/admin/course_information.php
+++ b/main/admin/course_information.php
@@ -1,11 +1,13 @@
-<?php // $Id: course_information.php 18070 2009-01-29 02:01:33Z yannoo $
-/* For licensing terms, see /dokeos_license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 /**
  * This script gives information about a course
  * @author Bart Mollet
- * @package dokeos.admin
+ * @package chamilo.admin
 */
-/*		INIT SECTION */
+/**
+ * INIT SECTION
+ */
 
 // name of the language file that needs to be included
 $language_file = 'admin';
@@ -180,4 +182,4 @@ if (Database::num_rows($res) > 0)
 }
 /*	FOOTER	*/
 Display::display_footer();
-?>
\ No newline at end of file
+?>
diff --git a/main/admin/course_user_import.php b/main/admin/course_user_import.php
index 16fac889ac..78a6c6392b 100755
--- a/main/admin/course_user_import.php
+++ b/main/admin/course_user_import.php
@@ -1,13 +1,10 @@
-<?php // $Id: course_user_import.php 8216 2006-03-15 16:33:13Z turboke $
-/* For licensing terms, see /dokeos_license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 * This tool allows platform admins to update course-user relations by uploading
 * a CSVfile
-* @package dokeos.admin
-==============================================================================
+* @package chamilo.admin
 */
-
 /**
  * Validates the imported data.
  */
diff --git a/main/admin/course_virtual.php b/main/admin/course_virtual.php
index 7d69726efb..23f02e7513 100755
--- a/main/admin/course_virtual.php
+++ b/main/admin/course_virtual.php
@@ -1,39 +1,12 @@
-<?php // $Id: course_virtual.php 20441 2009-05-10 07:39:15Z ivantcholakov $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2004-2005 Dokeos S.A.
-	Copyright (c) 2003 Ghent University (UGent)
-	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
-
-	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 address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
+<?php
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@author Roan Embrechts - initial admin interface
-*	@package dokeos.admin
-==============================================================================
-*/
-
-/*
-==============================================================================
-		INIT SECTION
-==============================================================================
-*/
+ * @author Roan Embrechts - initial admin interface
+ * @package chamilo.admin
+ */
+/**
+ * INIT SECTION
+ */
 
 // name of the language file that needs to be included
 $language_file = 'admin';
diff --git a/main/admin/languages.php b/main/admin/languages.php
index c6f19c1349..dabdc236d7 100755
--- a/main/admin/languages.php
+++ b/main/admin/languages.php
@@ -1,7 +1,6 @@
 <?php
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
 * This page allows the platform admin to decide which languages should
 * be available in the language selection menu in the login page. This can be
 * useful for countries with more than one official language (like Belgium:
@@ -11,14 +10,11 @@
 * @author Patrick Cool, main author
 * @author Roan EMbrechts, code cleaning
 * @since Dokeos 1.6
-* @package dokeos.admin
-==============================================================================
-*/
-/*
-==============================================================================
-	   INIT SECTION
-==============================================================================
+* @package chamilo.admin
 */
+/**
+ *	   INIT SECTION
+ */
 // name of the language file that needs to be included
 $language_file = 'admin';
 
@@ -302,4 +298,4 @@ $table->display();
 ==============================================================================
 */
 Display :: display_footer();
-?>
\ No newline at end of file
+?>
diff --git a/main/admin/ldap_synchro.php b/main/admin/ldap_synchro.php
index 81c889598f..6a4b331be7 100755
--- a/main/admin/ldap_synchro.php
+++ b/main/admin/ldap_synchro.php
@@ -1,31 +1,12 @@
-<?php //$id: $
-exit(); //not yet functional, needs to be revised
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2008 Dokeos SPRL
-	Copyright (c) 2007 Mustapha Alouani (supervised by Michel Moreau-Belliard)
-
-	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, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+<?php
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
-==============================================================================
+*	@package chamilo.admin
 */
-
+/**
+ * Code
+ */
+exit(); //not yet functional, needs to be revised
 // name of the language file that needs to be included
 $language_file='admin';
 
@@ -188,4 +169,4 @@ foreach($Sessions as $session){
 		Database::query($sql);
 	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/main/admin/ldap_users_list.php b/main/admin/ldap_users_list.php
old mode 100644
new mode 100755
index e4359c7928..17ba82c893
--- a/main/admin/ldap_users_list.php
+++ b/main/admin/ldap_users_list.php
@@ -1,31 +1,12 @@
-<?php //$id: $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2008 Dokeos SPRL
-	Copyright (c) 2007 Mustapha Alouani (supervised by Michel Moreau-Belliard)
-
-	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, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+<?php
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-	@author Mustapha Alouani
-*	@package dokeos.admin
-==============================================================================
-*/
-
+ *	@author Mustapha Alouani
+ *	@package chamilo.admin
+ */
+/**
+ * Init
+ */
 // name of the language file that needs to be included
 $language_file[] = 'registration';
 $language_file[] = 'admin';
@@ -265,4 +246,4 @@ $table->display();
 ==============================================================================
 */
 Display :: display_footer();
-?>
\ No newline at end of file
+?>
diff --git a/main/admin/ldap_users_synchro.php b/main/admin/ldap_users_synchro.php
old mode 100644
new mode 100755
index 14123850bd..15cf26ebc4
--- a/main/admin/ldap_users_synchro.php
+++ b/main/admin/ldap_users_synchro.php
@@ -1,31 +1,12 @@
-<?php //$id: $
-exit(); //not yet functional, needs to be revised
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2008 Dokeos SPRL
-	Copyright (c) 2007 Mustapha Alouani (supervised by Michel Moreau-Belliard)
-
-	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, rue du Corbeau, 108, B-1030 Brussels, Belgium, info@dokeos.com
-==============================================================================
-*/
+<?php
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
-==============================================================================
-*/
-
+ * @package chamilo.admin
+ */
+/**
+ * Code
+ */
+exit(); //not yet functional, needs to be revised
 // name of the language file that needs to be included
 $language_file='admin';
 
@@ -88,4 +69,4 @@ if (isset($action) && ($action=="synchro")) {
 	Display :: display_normal_message($message,false);
 }
 Display::display_footer();
-?>
\ No newline at end of file
+?>
diff --git a/main/admin/session_course_user_list.php b/main/admin/session_course_user_list.php
index 2b9daec47a..06a735b0ba 100755
--- a/main/admin/session_course_user_list.php
+++ b/main/admin/session_course_user_list.php
@@ -1,11 +1,11 @@
 <?php
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
-==============================================================================
-*	@package dokeos.admin
-==============================================================================
+*	@package chamilo.admin
 */
-
+/**
+ * Code
+ */
 $language_file='admin';
 $cidReset=true;
 include('../inc/global.inc.php');
@@ -171,4 +171,4 @@ if($nbr_results > $limit) {
 <button class="save" type="submit"> <?php echo get_lang('Ok'); ?></button>
 </form>
 <?php
-Display::display_footer();
\ No newline at end of file
+Display::display_footer();
diff --git a/main/admin/subscribe_class2course.php b/main/admin/subscribe_class2course.php
index 56798cf06f..f8a3679bab 100755
--- a/main/admin/subscribe_class2course.php
+++ b/main/admin/subscribe_class2course.php
@@ -1,33 +1,11 @@
 <?php
-
-// $Id: subscribe_class2course.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
+ */
 // name of the language file that needs to be included
 $language_file = 'admin';
 
diff --git a/main/admin/subscribe_user2class.php b/main/admin/subscribe_user2class.php
index b81a552dd8..c5952365ed 100755
--- a/main/admin/subscribe_user2class.php
+++ b/main/admin/subscribe_user2class.php
@@ -1,32 +1,11 @@
 <?php
-// $Id: subscribe_user2class.php 12269 2007-05-03 14:17:37Z elixir_julian $
-/*
-==============================================================================
-    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
+ */
 // name of the language file that needs to be included
 $language_file = 'admin';
 
@@ -193,4 +172,4 @@ foreach ($right_users as $user)
 ==============================================================================
 */
 Display :: display_footer();
-?>
\ No newline at end of file
+?>
diff --git a/main/admin/user_export.php b/main/admin/user_export.php
index 244225737f..17e6c6694f 100755
--- a/main/admin/user_export.php
+++ b/main/admin/user_export.php
@@ -1,33 +1,11 @@
 <?php
-// $Id: user_export.php 19597 2009-04-07 14:38:36Z 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
+ */
 // name of the language file that needs to be included
 $language_file = 'admin';
 
@@ -168,4 +146,4 @@ $form->display();
 ==============================================================================
 */
 Display :: display_footer();
-?>
\ No newline at end of file
+?>
diff --git a/main/exercice/export/index.php b/main/exercice/export/index.php
index d8f325fd62..236d12e4d0 100755
--- a/main/exercice/export/index.php
+++ b/main/exercice/export/index.php
@@ -1,16 +1,11 @@
-<?php // $Id: $
+<?php
+/* For licensing terms, see /license.txt */
 /**
- * @copyright (c) 2001-2006 Universite catholique de Louvain (UCL)
- *
- * @license http://www.gnu.org/copyleft/gpl.html (GPL) GENERAL PUBLIC LICENSE
- *
- * @author Claro Team <cvs@claroline.net>
  * @package chamilo.exercise
- *
+ * @author Claro Team <cvs@claroline.net>
  */
 /**
  * Redirection
  */
 header("Location: ../../../");
 exit();
-?>
diff --git a/main/exercice/multiple_answer.class.php b/main/exercice/multiple_answer.class.php
index 33a410b39d..67029d1938 100755
--- a/main/exercice/multiple_answer.class.php
+++ b/main/exercice/multiple_answer.class.php
@@ -1,12 +1,13 @@
 <?php
 /* For licensing terms, see /license.txt */
-
 /**
  *	File containing the MultipleAnswer class.
  *	@package chamilo.exercise
  * 	@author Eric Marguin
  */
-
+/**
+ * Code
+ */
 if(!class_exists('MultipleAnswer')):
 
 /**
diff --git a/main/exercice/multiple_answer_combination.class.php b/main/exercice/multiple_answer_combination.class.php
index f603956722..aa1416ca00 100755
--- a/main/exercice/multiple_answer_combination.class.php
+++ b/main/exercice/multiple_answer_combination.class.php
@@ -1,5 +1,5 @@
-<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
-/* For licensing terms, see /chamilo_license.txt */
+<?php
+/* For licensing terms, see /license.txt */
 /**
 *	File containing the MultipleAnswer class.
 *	@package chamilo.exercise
diff --git a/main/gradebook/lib/be/learnpathlink.class.php b/main/gradebook/lib/be/learnpathlink.class.php
index 0059cf99ce..81a26a6d33 100755
--- a/main/gradebook/lib/be/learnpathlink.class.php
+++ b/main/gradebook/lib/be/learnpathlink.class.php
@@ -2,7 +2,7 @@
 /* For licensing terms, see /license.txt */
 /**
  * Defines a gradebook LearnpathLink object.
- * @author Yannick Warnier <yannick.warnier@dokeos.com>
+ * @author Yannick Warnier <yannick.warnier@beeznest.com>
  * @author Bert Steppé
  * @package chamilo.gradebook
  */
diff --git a/main/gradebook/lib/fe/userform.class.php b/main/gradebook/lib/fe/userform.class.php
index 7f7a161efb..09c5a711c2 100755
--- a/main/gradebook/lib/fe/userform.class.php
+++ b/main/gradebook/lib/fe/userform.class.php
@@ -15,7 +15,7 @@ require_once api_get_path(LIBRARY_PATH) . 'formvalidator/FormValidator.class.php
 /**
  * Extends formvalidator with import and export forms
  * @author Stijn Konings
- * @package dokeos.gradebook
+ * @package chamilo.gradebook
  */
 class UserForm extends FormValidator
 {