diff --git a/Xext/geext.c b/Xext/geext.c
index afede22c7..e49e71f66 100644
--- a/Xext/geext.c
+++ b/Xext/geext.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xext/geint.h b/Xext/geint.h
index 2e0eb094c..60cba7d72 100644
--- a/Xext/geint.h
+++ b/Xext/geint.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 #ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
diff --git a/Xi/chaccess.c b/Xi/chaccess.c
index 3ef29fc71..a6798b793 100644
--- a/Xi/chaccess.c
+++ b/Xi/chaccess.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #define	 NEED_EVENTS
diff --git a/Xi/chaccess.h b/Xi/chaccess.h
index 090258c9f..baea69ca2 100644
--- a/Xi/chaccess.h
+++ b/Xi/chaccess.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xi/chdevcur.c b/Xi/chdevcur.c
index 867bf9787..121f7921d 100644
--- a/Xi/chdevcur.c
+++ b/Xi/chdevcur.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 /***********************************************************************
diff --git a/Xi/chdevcur.h b/Xi/chdevcur.h
index af8627913..e6df9eb89 100644
--- a/Xi/chdevcur.h
+++ b/Xi/chdevcur.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xi/chdevhier.c b/Xi/chdevhier.c
index 1d5784364..99957fe0c 100644
--- a/Xi/chdevhier.c
+++ b/Xi/chdevhier.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 /***********************************************************************
diff --git a/Xi/chdevhier.h b/Xi/chdevhier.h
index 85c1a39a7..07afd53ec 100644
--- a/Xi/chdevhier.h
+++ b/Xi/chdevhier.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 /***********************************************************************
diff --git a/Xi/extgrbdev.c b/Xi/extgrbdev.c
index c92c31dcd..1a2584fb6 100644
--- a/Xi/extgrbdev.c
+++ b/Xi/extgrbdev.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 /***********************************************************************
diff --git a/Xi/extgrbdev.h b/Xi/extgrbdev.h
index 7e2b0ea83..6e3e371a5 100644
--- a/Xi/extgrbdev.h
+++ b/Xi/extgrbdev.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xi/getcptr.c b/Xi/getcptr.c
index c85fced68..ae45b13ae 100644
--- a/Xi/getcptr.c
+++ b/Xi/getcptr.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #define	 NEED_EVENTS
diff --git a/Xi/getcptr.h b/Xi/getcptr.h
index cf8cd2e45..27458338d 100644
--- a/Xi/getcptr.h
+++ b/Xi/getcptr.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xi/qryacces.c b/Xi/qryacces.c
index b3cc27a39..99221ea7e 100644
--- a/Xi/qryacces.c
+++ b/Xi/qryacces.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #define	 NEED_EVENTS
diff --git a/Xi/qryacces.h b/Xi/qryacces.h
index 085d93a8b..238cdba9a 100644
--- a/Xi/qryacces.h
+++ b/Xi/qryacces.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xi/querydp.c b/Xi/querydp.c
index bd0a1c54e..d63bed144 100644
--- a/Xi/querydp.c
+++ b/Xi/querydp.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 /***********************************************************************
diff --git a/Xi/querydp.h b/Xi/querydp.h
index e8c5165ba..5370ed49a 100644
--- a/Xi/querydp.h
+++ b/Xi/querydp.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xi/setcptr.c b/Xi/setcptr.c
index f73a44cb0..81ce66bd5 100644
--- a/Xi/setcptr.c
+++ b/Xi/setcptr.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 /***********************************************************************
diff --git a/Xi/setcptr.h b/Xi/setcptr.h
index 114623cc4..df38addee 100644
--- a/Xi/setcptr.h
+++ b/Xi/setcptr.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xi/warpdevp.c b/Xi/warpdevp.c
index 5ea613205..3720441d9 100644
--- a/Xi/warpdevp.c
+++ b/Xi/warpdevp.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 /***********************************************************************
diff --git a/Xi/warpdevp.h b/Xi/warpdevp.h
index 7034e163a..00a4dffad 100644
--- a/Xi/warpdevp.h
+++ b/Xi/warpdevp.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/Xi/xiselev.c b/Xi/xiselev.c
index fc0a0f0f5..0f8433451 100644
--- a/Xi/xiselev.c
+++ b/Xi/xiselev.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #define	 NEED_EVENTS
diff --git a/Xi/xiselev.h b/Xi/xiselev.h
index e84640744..b751c5d1b 100644
--- a/Xi/xiselev.h
+++ b/Xi/xiselev.h
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 #ifdef HAVE_DIX_CONFIG_H
diff --git a/dix/access.c b/dix/access.c
index e29ab867f..f71b3cc8b 100644
--- a/dix/access.c
+++ b/dix/access.c
@@ -20,7 +20,7 @@
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
  *
- * Author: Peter Hutterer, UniSA, NICTA
+ * Author: Peter Hutterer, University of South Australia, NICTA
  */
 
 /* This file controls the access control lists for each window.