6 files changed, 12 insertions, 13 deletions
diff --git a/doc/user-guide/user-guide.info b/doc/user-guide/user-guide.info
index 2b4728a0a..10992d7e2 100644
--- a/doc/user-guide/user-guide.info
+++ b/doc/user-guide/user-guide.info
@@ -6,7 +6,7 @@ END-INFO-DIR-ENTRY
 
    This is the user manual for GlusterFS 2.0.
 
-   Copyright (C) 2007-2009 <Z> Research, Inc. Permission is granted to
+   Copyright (C) 2007-2009 Gluster, Inc. Permission is granted to
 copy, distribute and/or modify this document under the terms of the GNU
 Free Documentation License, Version 1.2 or any later version published
 by the Free Software Foundation; with no Invariant Sections, no
@@ -21,7 +21,7 @@ GlusterFS 2.0 User Guide
 
 This is the user manual for GlusterFS 2.0.
 
-   Copyright (C) 2007-2009 <Z> Research, Inc. Permission is granted to
+   Copyright (C) 2007-2009 Gluster, Inc. Permission is granted to
 copy, distribute and/or modify this document under the terms of the GNU
 Free Documentation License, Version 1.2 or any later version published
 by the Free Software Foundation; with no Invariant Sections, no
@@ -130,7 +130,7 @@ suggestions.  A huge thanks to them all.
 
    Patrick Negri - for TCP non-blocking connect.
         http://gluster.org/core-team.php (<list-hacking@gluster.com>)
-                                                           <Z> Research
+                                                          Gluster 
 
 
 File: user-guide.info,  Node: Introduction,  Next: Installation and Invocation,  Prev: Acknowledgements,  Up: Top
@@ -168,7 +168,7 @@ channel on Freenode (<irc.freenode.net>).
    The GlusterFS documentation wiki is also useful:
 <http://gluster.org/docs/index.php/GlusterFS>
 
-   For commercial support, you can contact <Z> Research at: 
+   For commercial support, you can contact Gluster at: 
 
      3194 Winding Vista Common
      Fremont, CA 94539
diff --git a/doc/user-guide/user-guide.texi b/doc/user-guide/user-guide.texi
index a198891fc..9dce15be4 100644
--- a/doc/user-guide/user-guide.texi
+++ b/doc/user-guide/user-guide.texi
@@ -10,7 +10,7 @@
 @copying
 This is the user manual for GlusterFS 2.0.
 
-Copyright @copyright{} 2007-2009 @email{@b{Z}} Research, Inc. Permission is granted to
+Copyright @copyright{} 2007-2009 @email{@b{Gluster}} , Inc. Permission is granted to
 copy, distribute and/or modify this document under the terms of the
 @acronym{GNU} Free Documentation License, Version 1.2 or any later
 version published by the Free Software Foundation; with no Invariant
@@ -23,8 +23,7 @@ Documentation License''.
 @title GlusterFS 2.0 User Guide [DRAFT]
 @subtitle January 15, 2008
 @author http://gluster.org/core-team.php
-@author @email{@b{Z}} @b{Research}
-
+@author @email{@b{Gluster}} 
 @page
 @vskip 0pt plus 1filll
 @insertcopying
@@ -143,7 +142,7 @@ Jacques Mattheij - for Europe mirror.
 Patrick Negri - for TCP non-blocking connect.
 @flushright
 http://gluster.org/core-team.php (@email{list-hacking@@gluster.com})
-@email{@b{Z}} Research
+@email{@b{Gluster}} 
 @end flushright
 
 @node Introduction
@@ -178,7 +177,7 @@ channel on Freenode (@indicateurl{irc.freenode.net}).
 The GlusterFS documentation wiki is also useful: @*
 @indicateurl{http://gluster.org/docs/index.php/GlusterFS}
 
-For commercial support, you can contact @email{@b{Z}} Research at:
+For commercial support, you can contact @email{@b{Gluster}} at:
 @cindex commercial support
 @cindex Gluster, Inc.
 
diff --git a/extras/Solaris/pkginfo b/extras/Solaris/pkginfo
index a598b21aa..0da4907d8 100644
--- a/extras/Solaris/pkginfo
+++ b/extras/Solaris/pkginfo
@@ -4,7 +4,7 @@ VERSION="2.0.0rc1"
 ARCH="i386"
 CLASSES="none"
 CATEGORY="system"
-VENDOR="ZResearch Inc"
+VENDOR="Gluster Inc"
 PSTAMP="16thJan08"
 EMAIL="harsha@gluster.com"
 ISTATES="S s 1 2 3"
diff --git a/libglusterfs/src/rbthash.c b/libglusterfs/src/rbthash.c
index 63d083858..33e80224a 100644
--- a/libglusterfs/src/rbthash.c
+++ b/libglusterfs/src/rbthash.c
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2008-2009 Z RESEARCH, Inc. <http://www.zresearch.com>
+  Copyright (c) 2008-2009 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
   GlusterFS is free software; you can redistribute it and/or modify
diff --git a/libglusterfs/src/rbthash.h b/libglusterfs/src/rbthash.h
index 535dccad9..e4c11e51c 100644
--- a/libglusterfs/src/rbthash.h
+++ b/libglusterfs/src/rbthash.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2008-2009 Z RESEARCH, Inc. <http://www.zresearch.com>
+  Copyright (c) 2008-2009 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
   GlusterFS is free software; you can redistribute it and/or modify
diff --git a/xlators/features/trash/src/trash.h b/xlators/features/trash/src/trash.h
index 48d5196bd..e1a1c314d 100644
--- a/xlators/features/trash/src/trash.h
+++ b/xlators/features/trash/src/trash.h
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006, 2007, 2008 Z RESEARCH, Inc. <http://www.zresearch.com>
+  Copyright (c) 2006-2009 Gluster, Inc. <http://www.gluster.com>
   This file is part of GlusterFS.
 
   GlusterFS is free software; you can redistribute it and/or modify