diff --git a/addons/piratepad/__init__.py b/addons/pad/__init__.py
similarity index 100%
rename from addons/piratepad/__init__.py
rename to addons/pad/__init__.py
diff --git a/addons/piratepad/__openerp__.py b/addons/pad/__openerp__.py
similarity index 75%
rename from addons/piratepad/__openerp__.py
rename to addons/pad/__openerp__.py
index 05e707b0581..1c83afc6b30 100644
--- a/addons/piratepad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -1,5 +1,5 @@
 {
-    "name" : "Piratepad Controller methods",
+    "name" : "(Ether)Pad enhanced support",
     "version" : "1.0",
     "depends" : ["openerp"],
     "author" : "Tiny",
diff --git a/addons/piratepad/controllers.py b/addons/pad/controllers.py
similarity index 100%
rename from addons/piratepad/controllers.py
rename to addons/pad/controllers.py
diff --git a/addons/piratepad/editors.py b/addons/pad/editors.py
similarity index 100%
rename from addons/piratepad/editors.py
rename to addons/pad/editors.py