diff --git a/apps/app_osplookup.c b/apps/app_osplookup.c
index dcdd2f92de..2eef7cea84 100644
--- a/apps/app_osplookup.c
+++ b/apps/app_osplookup.c
@@ -26,7 +26,7 @@
  */
 
 /*** MODULEINFO
-	<depend>libosptk</depend>
+	<depend>osptk</depend>
 	<depend>ssl</depend>
  ***/
 
diff --git a/cdr/cdr_radius.c b/cdr/cdr_radius.c
index 66e85ec1cb..8fe6d4459c 100644
--- a/cdr/cdr_radius.c
+++ b/cdr/cdr_radius.c
@@ -26,7 +26,7 @@
  */
 
 /*** MODULEINFO
-	<depend>radiusclient</depend>
+	<depend>radius</depend>
  ***/
 
 #include "asterisk.h"
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 2a6271ebd3..304fb13f6e 100644
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -40,7 +40,7 @@
 /*** MODULEINFO
 	<depend>zaptel</depend>
 	<depend>tonezone</depend>
-	<use>libpri</use>
+	<use>pri</use>
  ***/
 
 #include "asterisk.h"
diff --git a/codecs/codec_gsm.c b/codecs/codec_gsm.c
index a23306e574..33f7884773 100644
--- a/codecs/codec_gsm.c
+++ b/codecs/codec_gsm.c
@@ -27,7 +27,7 @@
  */
 
 /*** MODULEINFO
-	<depend>libgsm</depend>
+	<depend>gsm</depend>
  ***/
 
 #include "asterisk.h"
diff --git a/codecs/codec_speex.c b/codecs/codec_speex.c
index ebc1ed5664..fec92520d6 100644
--- a/codecs/codec_speex.c
+++ b/codecs/codec_speex.c
@@ -28,7 +28,7 @@
  */
 
 /*** MODULEINFO
-	<depend>libspeex</depend>
+	<depend>speex</depend>
  ***/
 
 #include "asterisk.h"
diff --git a/formats/format_ogg_vorbis.c b/formats/format_ogg_vorbis.c
index a9f9262513..1e346ef46e 100644
--- a/formats/format_ogg_vorbis.c
+++ b/formats/format_ogg_vorbis.c
@@ -22,8 +22,8 @@
  */
 
 /*** MODULEINFO
-	<depend>libvorbis</depend>
-	<depend>libogg</depend>
+	<depend>vorbis</depend>
+	<depend>ogg</depend>
  ***/
 
 #include "asterisk.h"