diff --git a/src/plugins/plugin_misc_tarot.py b/src/plugins/plugin_misc_tarot.py
index 3a0b80aa..538a05cd 100755
--- a/src/plugins/plugin_misc_tarot.py
+++ b/src/plugins/plugin_misc_tarot.py
@@ -50,7 +50,7 @@ PLUGIN_INFO = {
 "import_name": "Tarot",
 "type": "Misc",
 "protocols": [],
-"dependencies": ["XEP_0045"],
+"dependencies": ["XEP-0045"],
 "main": "Tarot",
 "handler": "yes",
 "description": _("""Implementation of Tarot card game""")
@@ -408,7 +408,7 @@ class Tarot():
         if self.games.has_key(room_jid):
             warning (_("Tarot game already started in room %s") % room_jid.userhost())
         else:
-            room_nick = self.host.plugins["XEP_0045"].getRoomNick(room_jid.userhost(), profile)
+            room_nick = self.host.plugins["XEP-0045"].getRoomNick(room_jid.userhost(), profile)
             if not room_nick:
                 error ('Internal error')
                 return
diff --git a/src/plugins/plugin_xep_0045.py b/src/plugins/plugin_xep_0045.py
index b1eddaf2..90f463f7 100755
--- a/src/plugins/plugin_xep_0045.py
+++ b/src/plugins/plugin_xep_0045.py
@@ -43,7 +43,7 @@ except ImportError:
 
 PLUGIN_INFO = {
 "name": "XEP 0045 Plugin",
-"import_name": "XEP_0045",
+"import_name": "XEP-0045",
 "type": "XEP",
 "protocols": ["XEP-0045"],
 "dependencies": [],
diff --git a/src/plugins/plugin_xep_0054.py b/src/plugins/plugin_xep_0054.py
index 2a9c2406..4b4e23f8 100755
--- a/src/plugins/plugin_xep_0054.py
+++ b/src/plugins/plugin_xep_0054.py
@@ -53,7 +53,7 @@ VCARD_UPDATE = PRESENCE + '/x[@xmlns="' +  NS_VCARD_UPDATE + '"]'
 
 PLUGIN_INFO = {
 "name": "XEP 0054 Plugin",
-"import_name": "XEP_0054",
+"import_name": "XEP-0054",
 "type": "XEP",
 "protocols": ["XEP-0054", "XEP-0153"],
 "dependencies": [],
diff --git a/src/plugins/plugin_xep_0060.py b/src/plugins/plugin_xep_0060.py
index 16cbe153..93efb9f9 100755
--- a/src/plugins/plugin_xep_0060.py
+++ b/src/plugins/plugin_xep_0060.py
@@ -31,7 +31,7 @@ from zope.interface import implements
 
 PLUGIN_INFO = {
 "name": "Publish-Subscribe",
-"import_name": "XEP_0060",
+"import_name": "XEP-0060",
 "type": "XEP",
 "protocols": ["XEP-0060"],
 "dependencies": [],
diff --git a/src/plugins/plugin_xep_0065.py b/src/plugins/plugin_xep_0065.py
index 8e96de29..ade5ecf9 100755
--- a/src/plugins/plugin_xep_0065.py
+++ b/src/plugins/plugin_xep_0065.py
@@ -81,7 +81,7 @@ BS_REQUEST = IQ_SET + '/query[@xmlns="' + NS_BS + '"]'
 
 PLUGIN_INFO = {
 "name": "XEP 0065 Plugin",
-"import_name": "XEP_0065",
+"import_name": "XEP-0065",
 "type": "XEP",
 "protocols": ["XEP-0065"],
 "main": "XEP_0065",
diff --git a/src/plugins/plugin_xep_0077.py b/src/plugins/plugin_xep_0077.py
index 120e552a..594ecfeb 100755
--- a/src/plugins/plugin_xep_0077.py
+++ b/src/plugins/plugin_xep_0077.py
@@ -33,7 +33,7 @@ NS_REG = 'jabber:iq:register'
 
 PLUGIN_INFO = {
 "name": "XEP 0077 Plugin",
-"import_name": "XEP_0077",
+"import_name": "XEP-0077",
 "type": "XEP",
 "protocols": ["XEP-0077"],
 "dependencies": [],
diff --git a/src/plugins/plugin_xep_0096.py b/src/plugins/plugin_xep_0096.py
index a7f4c99a..902e25c7 100755
--- a/src/plugins/plugin_xep_0096.py
+++ b/src/plugins/plugin_xep_0096.py
@@ -43,10 +43,10 @@ SI_REQUEST = IQ_SET + '/si[@xmlns="' + NS_SI + '"]'
 
 PLUGIN_INFO = {
 "name": "XEP 0096 Plugin",
-"import_name": "XEP_0096",
+"import_name": "XEP-0096",
 "type": "XEP",
 "protocols": ["XEP-0096"],
-"dependencies": ["XEP_0065"],
+"dependencies": ["XEP-0065"],
 "main": "XEP_0096",
 "handler": "yes",
 "description": _("""Implementation of SI File Transfert""")
@@ -85,7 +85,7 @@ class XEP_0096():
         """Called on confirmation answer"""
         if accepted:
             data['size'] = self._waiting_for_approval[id][2]
-            self.host.plugins["XEP_0065"].setData(data, id)
+            self.host.plugins["XEP-0065"].setData(data, id)
             self.approved(id)
         else:
             debug (_("Transfert [%s] refused"), id)
@@ -161,7 +161,7 @@ class XEP_0096():
         offer=client.IQ(xmlstream,'set')
         debug ("Transfert ID: %s", offer["id"])
 
-        self.host.plugins["XEP_0065"].sendFile(offer["id"], filepath, str(statinfo.st_size))
+        self.host.plugins["XEP-0065"].sendFile(offer["id"], filepath, str(statinfo.st_size))
 
         offer["from"]=current_jid.full()
         offer["to"]=jid.JID(to).full()
diff --git a/src/plugins/plugin_xep_0100.py b/src/plugins/plugin_xep_0100.py
index 400dec3c..3c850ab0 100755
--- a/src/plugins/plugin_xep_0100.py
+++ b/src/plugins/plugin_xep_0100.py
@@ -30,10 +30,10 @@ from wokkel import disco, iwokkel
 
 PLUGIN_INFO = {
 "name": "Gateways Plugin",
-"import_name": "XEP_0100",
+"import_name": "XEP-0100",
 "type": "XEP",
 "protocols": ["XEP-0100"],
-"dependencies": ["XEP_0077"],
+"dependencies": ["XEP-0077"],
 "main": "XEP_0100",
 "description": _("""Implementation of Gateways protocol""")
 }
@@ -110,8 +110,8 @@ class XEP_0100():
         profile = self.host.memory.getProfileName(profile_key)
         assert(profile) #FIXME: return an error here
         if action == 'SUBMIT':
-            self.host.plugins["XEP_0077"].addTrigger(target, self.registrationSuccessful, profile)
-        return self.host.plugins["XEP_0077"].in_band_submit(action, target, fields, profile)
+            self.host.plugins["XEP-0077"].addTrigger(target, self.registrationSuccessful, profile)
+        return self.host.plugins["XEP-0077"].in_band_submit(action, target, fields, profile)
 
     def findGateways(self, target, profile_key='@DEFAULT@'):
         """Find gateways in the target JID, using discovery protocol
diff --git a/src/plugins/plugin_xep_0115.py b/src/plugins/plugin_xep_0115.py
index a986907f..f3b147ea 100755
--- a/src/plugins/plugin_xep_0115.py
+++ b/src/plugins/plugin_xep_0115.py
@@ -45,7 +45,7 @@ CAPABILITY_UPDATE = PRESENCE + '/c[@xmlns="' +  NS_ENTITY_CAPABILITY + '"]'
 
 PLUGIN_INFO = {
 "name": "XEP 0115 Plugin",
-"import_name": "XEP_0115",
+"import_name": "XEP-0115",
 "type": "XEP",
 "protocols": ["XEP-0115"],
 "dependencies": [],