diff --git a/apps/Makefile b/apps/Makefile
index 7f8e7c9c29..e3762d7031 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -1,5 +1,5 @@
 #
-# Asterisk -- A telephony toolkit for Linux.
+# Asterisk -- An open source telephony toolkit.
 # 
 # Makefile for PBX applications
 #
diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index d13dba32ba..3654f4d6df 100644
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -25,8 +25,7 @@
  * \ingroup applications
  */
 
-/*! 
- * \li The application app_adsiprog uses the configuration file \ref adsi.conf
+/*! \li \ref app_adsiprog.c uses the configuration file \ref adsi.conf
  * \addtogroup configuration_file Configuration Files
  */
 
diff --git a/apps/app_alarmreceiver.c b/apps/app_alarmreceiver.c
index 40275410fb..e4bdcfb7af 100644
--- a/apps/app_alarmreceiver.c
+++ b/apps/app_alarmreceiver.c
@@ -30,8 +30,7 @@
  * \ingroup applications
  */
 
-/*! 
- * \li The application app_alarmreceiver uses the configuration file \ref alarmreceiver.conf
+/*! \li \ref app_alarmreceiver.c uses the configuration file \ref alarmreceiver.conf
  * \addtogroup configuration_file Configuration Files
  */
 
diff --git a/apps/app_amd.c b/apps/app_amd.c
index 3d6169d086..d8f26b49be 100644
--- a/apps/app_amd.c
+++ b/apps/app_amd.c
@@ -28,8 +28,7 @@
  * \ingroup applications
  */
 
-/*!
- * \li The application app_amd uses the configuration file \ref amd.conf
+/*! \li \ref app_amd.c uses the configuration file \ref amd.conf
  * \addtogroup configuration_file Configuration Files
  */
 
diff --git a/apps/app_confbridge.c b/apps/app_confbridge.c
index c560ecec26..762e39bc33 100644
--- a/apps/app_confbridge.c
+++ b/apps/app_confbridge.c
@@ -28,8 +28,7 @@
  * \ingroup applications
  */
 
-/*! 
- * \li The application app_confbridge uses the configuration file \ref confbridge.conf
+/*! \li \ref app_confbridge.c uses the configuration file \ref confbridge.conf
  * \addtogroup configuration_file Configuration Files
  */
 
diff --git a/apps/app_fax.c b/apps/app_fax.c
index 9d63a3c23b..adee8f4bde 100644
--- a/apps/app_fax.c
+++ b/apps/app_fax.c
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * Simple fax applications
  * 
diff --git a/apps/app_festival.c b/apps/app_festival.c
index c4ad0f6b9b..ffea6e8bf8 100644
--- a/apps/app_festival.c
+++ b/apps/app_festival.c
@@ -27,8 +27,7 @@
  * \ingroup applications
  */
 
-/*!
- * \li The application app_festival uses the configuration file \ref festival.conf
+/*! \li \ref app_festival.c uses the configuration file \ref festival.conf
  * \addtogroup configuration_file Configuration Files
  */
 
diff --git a/apps/app_followme.c b/apps/app_followme.c
index 97e3213a7a..83f583bb37 100644
--- a/apps/app_followme.c
+++ b/apps/app_followme.c
@@ -1,5 +1,5 @@
 /*
- * Asterisk -- A telephony toolkit for Linux.
+ * Asterisk -- An open source telephony toolkit.
  *
  * A full-featured Find-Me/Follow-Me Application
  * 
@@ -26,8 +26,7 @@
  * \ingroup applications
  */
 
-/*!
- * \li The application app_followme uses the configuration file \ref followme.conf
+/*! \li \ref app_followme.c uses the configuration file \ref followme.conf
  * \addtogroup configuration_file Configuration Files
  */
 
diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 8b71a71e00..c2bfccd033 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -29,8 +29,7 @@
  * \ingroup applications
  */
 
-/*! 
- * \li The application app_meetme uses configuration file \ref meetme.conf
+/*! \li \ref app_meetme.c uses configuration file \ref meetme.conf
  * \addtogroup configuration_file Configuration Files
  */
 
diff --git a/apps/app_queue.c b/apps/app_queue.c
index 8f1f8f23a7..742636aa0b 100644
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -54,8 +54,7 @@
  * \ingroup applications
  */
 
-/*! 
- * \li The application app_queues uses configuration file \ref queues.conf
+/*! \li \ref app_queues.c uses configuration file \ref queues.conf
  * \addtogroup configuration_file
  */
 
diff --git a/apps/app_skel.c b/apps/app_skel.c
index 4c12a4ac87..6fdbebbf26 100644
--- a/apps/app_skel.c
+++ b/apps/app_skel.c
@@ -29,8 +29,7 @@
  * \ingroup applications
  */
 
-/*! 
- * \li The application app_skel uses configuration file \ref app_skel.conf
+/*! \li \ref app_skel.c uses configuration file \ref app_skel.conf
  * \addtogroup configuration_file Configuration Files
  */
 
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 7d9917d7e7..7253117b29 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -37,8 +37,7 @@
  *       with a plan to clean this up.
  */
 
-/*! 
- * \li The application app_voicemail uses configuration file \ref voicemail.conf
+/*! \li \ref app_voicemail.c uses configuration file \ref voicemail.conf
  * \addtogroup configuration_file Configuration Files
  */