--- a/examples/mcabberrc.lua	Fri Mar 27 12:06:19 2009 +0200
+++ b/examples/mcabberrc.lua	Sat Mar 28 19:43:12 2009 +0200
@@ -255,9 +255,11 @@
 
 require 'room_priv'
 
--- DATA FORMS (XEP-0004)
+-- FORMS
 
-require 'x_data'
+require 'mc_forms'
+
+-- DATA FORMS (XEP-0004)
 
 -- SERVICE DISCOVERY (XEP-0030)
 
@@ -269,7 +271,7 @@
 
 -- VCARD-TEMP (XEP-0054)
 
-require 'vcard'
+require 'mc_vcard'
 
 -- PUBLISH-SUBSRIBE (XEP-0060)
 
@@ -285,7 +287,7 @@
 
 -- IN-BAND REGISTRATION (XEP-0077)
 
-require 'iq_register'
+require 'mc_register'
 
 -- USER LOCATION (XEP-0080)
 
@@ -309,7 +311,7 @@
 
 -- REMOTE CONTROLLING CLIENTS (XEP-0146)
 
-require 'remote'
+require 'mc_remote'
 
 -- PERSONAL EVENTING PROTOCOL (XEP-0163)