diff --git a/addons/anonymous/__init__.py b/addons/auth_anonymous/__init__.py
similarity index 100%
rename from addons/anonymous/__init__.py
rename to addons/auth_anonymous/__init__.py
diff --git a/addons/anonymous/__openerp__.py b/addons/auth_anonymous/__openerp__.py
similarity index 64%
rename from addons/anonymous/__openerp__.py
rename to addons/auth_anonymous/__openerp__.py
index 3494fca7a9f..95d98e65fea 100644
--- a/addons/anonymous/__openerp__.py
+++ b/addons/auth_anonymous/__openerp__.py
@@ -3,17 +3,17 @@
  'description': 'Allow anonymous access to OpenERP.',
  'author': 'OpenERP SA',
  'version': '1.0',
- 'category': 'Tools',
+ 'category': 'Authentication',
  'website': 'http://www.openerp.com',
  'installable': True,
  'depends': ['web'],
  'data': [
-    'anonymous.xml',
+    'auth_anonymous.xml',
  ],
  'js': [
-    'static/src/js/anonymous.js',
+    'static/src/js/auth_anonymous.js',
  ],
  'qweb': [
-     'static/src/xml/anonymous.xml',
+     'static/src/xml/auth_anonymous.xml',
  ],
 }
diff --git a/addons/anonymous/anonymous.xml b/addons/auth_anonymous/auth_anonymous.xml
similarity index 100%
rename from addons/anonymous/anonymous.xml
rename to addons/auth_anonymous/auth_anonymous.xml
diff --git a/addons/anonymous/static/src/js/anonymous.js b/addons/auth_anonymous/static/src/js/auth_anonymous.js
similarity index 93%
rename from addons/anonymous/static/src/js/anonymous.js
rename to addons/auth_anonymous/static/src/js/auth_anonymous.js
index 5140429d030..fab2be1fd53 100644
--- a/addons/anonymous/static/src/js/anonymous.js
+++ b/addons/auth_anonymous/static/src/js/auth_anonymous.js
@@ -1,4 +1,4 @@
-openerp.anonymous = function(instance) {
+openerp.auth_anonymous = function(instance) {
 
     instance.web.Login.include({
         start: function() {
@@ -19,7 +19,7 @@ openerp.anonymous = function(instance) {
         init: function(parent) {
             this._super(parent);
             if (this.session.username == 'anonymous') {
-                this.template = 'UserMenu.anonymous';
+                this.template = 'UserMenu.auth_anonymous';
                 this.do_update = function() {};     // avoid change of avatar
             }
         },
diff --git a/addons/anonymous/static/src/xml/anonymous.xml b/addons/auth_anonymous/static/src/xml/auth_anonymous.xml
similarity index 90%
rename from addons/anonymous/static/src/xml/anonymous.xml
rename to addons/auth_anonymous/static/src/xml/auth_anonymous.xml
index 7429efff458..79d7efcbdc8 100644
--- a/addons/anonymous/static/src/xml/anonymous.xml
+++ b/addons/auth_anonymous/static/src/xml/auth_anonymous.xml
@@ -3,7 +3,7 @@
 -->
 <templates id="template" xml:space="preserve">
 
-<t t-name="UserMenu.anonymous">
+<t t-name="UserMenu.auth_anonymous">
     <div>
     <a href="#" class="oe_user_menu oe_topbar_item oe_topbar_anonymous_login">
         <img class="oe_topbar_avatar" t-att-src="_s + '/web/static/src/img/icons/gtk-dialog-authentication.png'"/>
diff --git a/addons/auth_reset_password/__openerp__.py b/addons/auth_reset_password/__openerp__.py
index 6e1d8fc1f50..de15fd21f03 100644
--- a/addons/auth_reset_password/__openerp__.py
+++ b/addons/auth_reset_password/__openerp__.py
@@ -3,10 +3,10 @@
  'description': 'Allow users to reset their password from the login page',
  'author': 'OpenERP SA',
  'version': '1.0',
- 'category': 'Tools',
+ 'category': 'Authentication',
  'website': 'http://www.openerp.com',
  'installable': True,
- 'depends': ['anonymous', 'email_template'],
+ 'depends': ['auth_anonymous', 'email_template'],
  'data': [
     'email_templates.xml',
     'res_users.xml',
diff --git a/addons/auth_signup/__openerp__.py b/addons/auth_signup/__openerp__.py
index bf34ec27abf..8c8a4919550 100644
--- a/addons/auth_signup/__openerp__.py
+++ b/addons/auth_signup/__openerp__.py
@@ -3,10 +3,10 @@
  'description': 'Allow users to sign up',
  'author': 'OpenERP SA',
  'version': '1.0',
- 'category': 'Tools',
+ 'category': 'Authentication',
  'website': 'http://www.openerp.com',
  'installable': True,
- 'depends': ['anonymous', 'base_setup'],
+ 'depends': ['auth_anonymous', 'base_setup'],
  'data': [
     'auth_signup.xml',
     'res_config.xml',
diff --git a/addons/auth_signup/static/src/xml/auth_signup.xml b/addons/auth_signup/static/src/xml/auth_signup.xml
index c6c7f555ecd..7b3ed6de77b 100644
--- a/addons/auth_signup/static/src/xml/auth_signup.xml
+++ b/addons/auth_signup/static/src/xml/auth_signup.xml
@@ -3,7 +3,7 @@
 -->
 <templates id="template" xml:space="preserve">
 
-<t t-extend="UserMenu.anonymous">
+<t t-extend="UserMenu.auth_anonymous">
     <t t-jquery="a" t-operation="after">
         <a href="#" class="oe_user_menu oe_topbar_item oe_topbar_signup">
             <img class="oe_topbar_avatar" t-att-src="_s + '/web/static/src/img/user_menu_avatar.png'"/>
diff --git a/addons/portal/__openerp__.py b/addons/portal/__openerp__.py
index 6dd22a46ca2..97183bccd9f 100644
--- a/addons/portal/__openerp__.py
+++ b/addons/portal/__openerp__.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2011 OpenERP S.A (<http://www.openerp.com>).
+#    Copyright (C) 2004-2012 OpenERP S.A (<http://www.openerp.com>).
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -22,7 +22,7 @@
 {
     'name' : "Portal",
     'version' : "1.0",
-    'depends' : ["base", "share", "anonymous"],
+    'depends' : ["base", "share", "auth_anonymous"],
     'author' : "OpenERP SA",
     'category': 'Portal',
     'description': """
diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 74e08bc5343..5245c99eed2 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -23,7 +23,7 @@
         <!-- Top menu item -->
         <menuitem name="Portal"
             id="portal_menu"
-            groups="base.group_no_one,portal.group_portal_member,anonymous.group_anonymous"
+            groups="base.group_no_one,portal.group_portal_member,auth_anonymous.group_anonymous"
             sequence="20"/>
 
             <menuitem name="Our company" id="portal_company" parent="portal_menu" sequence="10"/>
diff --git a/addons/users_ldap/__openerp__.py b/addons/users_ldap/__openerp__.py
index ba153328af1..4e5bc811dca 100644
--- a/addons/users_ldap/__openerp__.py
+++ b/addons/users_ldap/__openerp__.py
@@ -101,7 +101,7 @@ authentication if installed at the same time.
 
 
     "website" : "http://www.openerp.com",
-    "category" : "Tools",
+    "category" : "Authentication",
     "data" : [
         "users_ldap_view.xml",
         "user_ldap_installer.xml",