diff --git a/addons/hr_holidays/__init__.py b/addons/hr_holidays/__init__.py
index 441f7d252a9..9fc701068ef 100644
--- a/addons/hr_holidays/__init__.py
+++ b/addons/hr_holidays/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -15,11 +15,11 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
-import hr
+import hr_holidays
 import report
 import wizard
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/hr_holidays/__terp__.py b/addons/hr_holidays/__terp__.py
index 2a8f07c58bb..3ff2df69bf9 100644
--- a/addons/hr_holidays/__terp__.py
+++ b/addons/hr_holidays/__terp__.py
@@ -51,8 +51,8 @@
     'init_xml': [],
     'update_xml': [
         'security/ir.model.access.csv',
-        'hr_workflow.xml',
-        'hr_view.xml',
+        'hr_holidays_workflow.xml',
+        'hr_holidays_view.xml',
         'hr_holidays_report.xml',
         'hr_holidays_wizard.xml',
         #'process/hr_holidays_process.xml'
diff --git a/addons/hr_holidays/hr.py b/addons/hr_holidays/hr_holidays.py
similarity index 100%
rename from addons/hr_holidays/hr.py
rename to addons/hr_holidays/hr_holidays.py
diff --git a/addons/hr_holidays/hr_view.xml b/addons/hr_holidays/hr_holidays_view.xml
similarity index 99%
rename from addons/hr_holidays/hr_view.xml
rename to addons/hr_holidays/hr_holidays_view.xml
index 4b8afe21a93..a01847cb7cc 100644
--- a/addons/hr_holidays/hr_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -173,7 +173,9 @@
                 <search string="Search Holiday Per User">
                        <group col='8' colspan='4'>
                           <field name="employee_id" select='1' widget="selection"/>
-                          <field name="user_id" select="1" widget="selection"/>
+                          <field name="user_id" select="1" widget="selection">
+	                          	<filter icon="terp-partner" help="My Holidays" domain="[('user_id','=',uid)]"/>
+	                      </field>
                           <field name="holiday_status" select="1" widget="selection"/>
                       </group>
                       <newline/>
diff --git a/addons/hr_holidays/hr_workflow.xml b/addons/hr_holidays/hr_holidays_workflow.xml
similarity index 100%
rename from addons/hr_holidays/hr_workflow.xml
rename to addons/hr_holidays/hr_holidays_workflow.xml