-# Remap to Intel
-#Alex Zhuravlev <alexey.zhuravlev@intel.com> <bzzz@whamcloud.com>
-Andreas Dilger <andreas.dilger@intel.com> Anreas Dilger <andreas.dilger@intel.com>
-#Andreas Dilger <andreas.dilger@intel.com> <adilger@whamcloud.com>
-Bob Glossman <bob.glossman@intel.com> <bogl@whamcloud.com>
-#Bobi Jam <bobijam.xu@intel.com> <bobijam@whamcloud.com>
-Brian J. Murrell <brian.murrell@intel.com> <brian@whamcloud.com>
-Bruno Faccini <bruno.faccini@intel.com> <bfaccini62@gmail.com>
-Chris Gearing <chris.gearing@intel.com> Chris <chris@whamcloud.com>
-Cliff White <cliff.white@intel.com> <cliffw@whamcloud.com>
-Cliff White <cliff.white@intel.com> <cliffwhi@intel.com>
-Dmitry Eremin <dmitry.eremin@intel.com> <dmiter4ever@gmail.com>
-Doug Oucharek <doug.s.oucharek@intel.com> <doug@whamcloud.com>
-#Emoly Liu <emoly.liu@intel.com> <emoly@whamcloud.com>
-Eric Barton <eric.barton@intel.com> <eeb@intel.com>
-Fan Yong <fan.yong@intel.com> <yong.fan@whamcloud.com>
-#Hongchao Zhang <hongchao.zhang@intel.com> <hongchao.zhang@whamcloud.com>
-#Jian Yu <jian.yu@intel.com> <yujian@whamcloud.com>
-Jinshan Xiong <jinshan.xiong@intel.com> <jay@whamcloud.com>
-Jinshan Xiong <jinshan.xiong@intel.com> Jinshan <jinshan.xiong@intel.com>
-Jinshan Xiong <jinshan.xiong@intel.com> <jinshan.xiong@whamcloud.com>
-Johann Lombardi <johann.lombardi@intel.com> Johann Lombard <johann.lombardi@intel.com>
-Johann Lombardi <johann.lombardi@intel.com> <johann@whamcloud.com>
-John L. Hammond <john.hammond@intel.com> <johnlockwoodhammond@gmail.com>
-#John L. Hammond <john.hammond@intel.com> <jhammond@whamcloud.com>
-Keith Mannthey <keith.mannthey@intel.com> <keith@whamcloud.com>
-Lai Siyao <lai.siyao@intel.com> <laisiyao@whamcloud.com>
-Li Wei <wei.g.li@intel.com> <liwei@whamcloud.com>
-Liang Zhen <liang.zhen@intel.com> <liang@whamcloud.com>
-Mikhail Pershin <mike.pershin@intel.com> <tappro@whamcloud.com>
-Mikhail Pershin <mike.pershin@intel.com> Mike Pershin <mike.pershin@intel.com>
-Mikhail Pershin <mike.pershin@intel.com> Mikhal Pershin <mike.pershin@intel.com>
-#Minh Diep <min.diep@intel.com> <mdiep@whamcloud.com>
-Niu Yawei <niu.yaweh@intel.com> <niu@whamcloud.com>
-#Oleg Drokin <oleg.drokin@intel.com> <green@whamcloud.com>
-Oleg Drokin <oleg.drokin@intel.com> <green@intel.com>
-Richard Henwood <richard.henwood@intel.com> <build@lgit-121.(none)>
-Richard Henwood <richard.henwood@intel.com> <rhenwood@whamcloud.com>
-Robert Read <robert.read@intel.com> <robert.read.@intel.com>
-Sonia Sharma <sonia.sharma@intel.com> Sonia <sonia.sharma@intel.com>
-Sonia Sharma <sonia.sharma@intel.com> sharmaso <sonia.sharma@intel.com>
-Wang Di <di.wang@intel.com> <di.wang@whamcloud.com>
-Wang Di <di.wang@intel.com> wang di <di.wang@intel.com>
-Wang Di <di.wang@intel.com> Di Wang <di.wang@intel.com>
-Wang Di <di.wang@intel.com> wangdi <di.wang@intel.com>
-Wei Liu <wei3.liu@intel.com> <w3liu@unknown000dc5d3c256.gateway.2wire.net>
-#Wei Liu <wei3.liu@intel.com> <sarah@whamcloud.com>
-Wei Li <wei.g.li@intel.com> <liwei@whamcloud.com>
-Yang Sheng <yang.sheng@intel.com> yangsheng <yang.sheng@intel.com>
-Yang Sheng <yang.sheng@intel.com> yang sheng <yang.sheng@intel.com>
-#Yang Sheng <yang.sheng@intel.com> <ys@whamcloud.com>
+# Remap to Sun
+Andreas Dilger <adilger@sun.com> <adilger@clusterfs.com>
+Andrew Perepechko <andrew.perepechko@sun.com> anserper <anserper>
+Andrew Perepechko <andrew.perepechko@sun.com> <panda@clusterfs.com>
+Alexander Zarochentsev <Alexander.Zarochentsev@sun.com> Alexander.Zarochentsev <Alexander.Zarochentsev@sun.com>
+Alexander Zarochentsev <Alexander.Zarochentsev@sun.com> Alexander.Zarochentev <alexander.zarochentev@sun.com>
+Bobi Jam <bobijam@sun.com> <bobijam@clusterfs.com>
+Brian J. Murrell <brian@sun.com> <brian@clusterfs.com>
+Cliff White <cliff.white@sun.com> <cliffw@clusterfs.com>
+Elena Gryaznova <grev@sun.com> <grev>
+Eric Barton <eric.barton@sun.com> <eeb@clusterfs.com>
+Eric Mei <eric.mei@sun.com> <ericm@clusterfs.com>
+Fan Yong <yong.fan@sun.com> <fanyong@clusterfs.com>
+Hongchao Zhang <Hongchao.Zhang@sun.com> hongchao.zhang <Hongchao.Zhang@sun.com>
+Hongchao Zhang <Hongchao.Zhang@sun.com> ZhangHongChao <Hongchao.zhang@sun.com>
+Hongchao Zhang <hongchao.zhang@sun.com> <zhanghc@clusterfs.com>
+Isaac Huang <he.huang@sun.com> <isaac@clusterfs.com>
+Jian Yu <jian.yu@sun.com> <yujian@clusterfs.com>
+Johann Lombardi <johann@sun.com> <johann@clusterfs.com>
+Liang Zhen <liang.zhen@sun.com> <liang@clusterfs.com>
+LiuYing <emoly.liu@sun.com> <emoly@clusterfs.com>
+Mikhail Pershin <tappro@sun.com> <tappro@clusterfs.com>
+Mikhail Pershin <tappro@sun.com> Mike Tappro <tappro@sun.com>
+Mikhail Pershin <tappro@sun.com> Mike Tappro <tappro@garden.(none)>
+Nathan Rutman <nathan.rutman@sun.com> <nathan@clusterfs.com>
+Nicolas Williams <nicolas.williams@sun.com> nicolas.williams <nicolas.williams>
+Nicolas Williams <nicolas.williams@sun.com> <root@vl1.(none)>
+Niu Yawei <niu.yawei@sun.com> <niu@clusterfs.com>
+Oleg Drokin <oleg.drokin@sun.com> <green@clusterfs.com>
+Oleg Drokin <oleg.drokin@sun.com> <green@linuxhacker.ru>
+Pravin Shelar <Pravin.Shelar@sun.com> <pravin>
+Pravin Shelar <Pravin.Shelar@sun.com> <pravins>
+Pravin Shelar <Pravin.Shelar@sun.com> pravin <Pravin.Shelar@sun.com>
+Ricardo M. Correia <ricardo.correia@sun.com> <rcorreia>
+Robert Read <robert.read@sun.com> <rread@clusterfs.com>
+Robert Read <robert.read@sun.com> <rread@vpn-129-150-244-142.sfbay.sun.com>
+Vitaly Fertman <vitaly.fertman@sun.com> <vitaly@clusterfs.com>
+Wang Yibin <wang.yibin@oracle.com>
+Wang Di <tom.wang@sun.com> <wangdi@clusterfs.com>
+Wang Di <tom.wang@sun.com> Tom.Wang <Tom.Wang@sun.com>
+Yang Sheng <sheng.yang@sun.com> <yangsheng@clusterfs.com>
+Yang Sheng <sheng.yang@sun.com> yangsheng <sheng.yang@sun.com>