Use the full and proper company name for Swinburne University of Technology

throughout the source tree.

Requested by:	Grenville Armitage, Director of CAIA at Swinburne University of
			Technology
MFC after:	3 days

31 files changed, 172 insertions, 165 deletions

diff --git a/share/man/man4/cc.4 b/share/man/man4/cc.4
index eac1c88..32da741 100644
--- a/share/man/man4/cc.4
+++ b/share/man/man4/cc.4
@@ -3,8 +3,9 @@
 .\" All rights reserved.
 .\"
 .\" This documentation was written at the Centre for Advanced Internet
-.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes and
-.\" Lawrence Stewart under sponsorship from the FreeBSD Foundation.
+.\" Architectures, Swinburne University of Technology, Melbourne, Australia by
+.\" David Hayes and Lawrence Stewart under sponsorship from the FreeBSD
+.\" Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -93,10 +94,10 @@ modular congestion control framework first appeared in
 .Fx 9.0 .
 .Pp
 The framework was first released in 2007 by James Healy and Lawrence Stewart
-whilst working on the NewTCP research project at Swinburne University's Centre
-for Advanced Internet Architectures, Melbourne, Australia, which was made
-possible in part by a grant from the Cisco University Research Program Fund at
-Community Foundation Silicon Valley.
+whilst working on the NewTCP research project at Swinburne University of
+Technology's Centre for Advanced Internet Architectures, Melbourne, Australia,
+which was made possible in part by a grant from the Cisco University Research
+Program Fund at Community Foundation Silicon Valley.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man4/cc_chd.4 b/share/man/man4/cc_chd.4
index 0953162..9a1f762 100644
--- a/share/man/man4/cc_chd.4
+++ b/share/man/man4/cc_chd.4
@@ -3,8 +3,8 @@
 .\" All rights reserved.
 .\"
 .\" This documentation was written at the Centre for Advanced Internet
-.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes
-.\" under sponsorship from the FreeBSD Foundation.
+.\" Architectures, Swinburne University of Technology, Melbourne, Australia by
+.\" David Hayes under sponsorship from the FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -115,8 +115,8 @@ congestion control module first appeared in
 .Fx 9.0 .
 .Pp
 The module was first released in 2010 by David Hayes whilst working on the
-NewTCP research project at Swinburne University's Centre for Advanced Internet
-Architectures, Melbourne, Australia.
+NewTCP research project at Swinburne University of Technology's Centre for
+Advanced Internet Architectures, Melbourne, Australia.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man4/cc_cubic.4 b/share/man/man4/cc_cubic.4
index 8955df3..be5684c 100644
--- a/share/man/man4/cc_cubic.4
+++ b/share/man/man4/cc_cubic.4
@@ -4,8 +4,8 @@
 .\" All rights reserved.
 .\"
 .\" Portions of this documentation were written at the Centre for Advanced
-.\" Internet Architectures, Swinburne University, Melbourne, Australia by
-.\" David Hayes under sponsorship from the FreeBSD Foundation.
+.\" Internet Architectures, Swinburne University of Technology, Melbourne,
+.\" Australia by David Hayes under sponsorship from the FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -99,8 +99,8 @@ congestion control module first appeared in
 .Fx 9.0 .
 .Pp
 The module was first released in 2009 by Lawrence Stewart whilst studying at
-Swinburne University's Centre for Advanced Internet Architectures, Melbourne,
-Australia.
+Swinburne University of Technology's Centre for Advanced Internet Architectures,
+Melbourne, Australia.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man4/cc_hd.4 b/share/man/man4/cc_hd.4
index b8c473d..d761539 100644
--- a/share/man/man4/cc_hd.4
+++ b/share/man/man4/cc_hd.4
@@ -3,8 +3,8 @@
 .\" All rights reserved.
 .\"
 .\" This documentation was written at the Centre for Advanced Internet
-.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes
-.\" under sponsorship from the FreeBSD Foundation.
+.\" Architectures, Swinburne University of Technology, Melbourne, Australia by
+.\" David Hayes under sponsorship from the FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -107,8 +107,8 @@ congestion control module first appeared in
 .Fx 9.0 .
 .Pp
 The module was first released in 2010 by David Hayes whilst working on the
-NewTCP research project at Swinburne University's Centre for Advanced Internet
-Architectures, Melbourne, Australia.
+NewTCP research project at Swinburne University of Technology's Centre for
+Advanced Internet Architectures, Melbourne, Australia.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man4/cc_htcp.4 b/share/man/man4/cc_htcp.4
index 5199996..6e916b9 100644
--- a/share/man/man4/cc_htcp.4
+++ b/share/man/man4/cc_htcp.4
@@ -4,8 +4,8 @@
 .\" All rights reserved.
 .\"
 .\" Portions of this documentation were written at the Centre for Advanced
-.\" Internet Architectures, Swinburne University, Melbourne, Australia by
-.\" David Hayes under sponsorship from the FreeBSD Foundation.
+.\" Internet Architectures, Swinburne University of Technology, Melbourne,
+.\" Australia by David Hayes under sponsorship from the FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -114,10 +114,10 @@ congestion control module first appeared in
 .Fx 9.0 .
 .Pp
 The module was first released in 2007 by James Healy and Lawrence Stewart whilst
-working on the NewTCP research project at Swinburne University's Centre for
-Advanced Internet Architectures, Melbourne, Australia, which was made possible
-in part by a grant from the Cisco University Research Program Fund at Community
-Foundation Silicon Valley.
+working on the NewTCP research project at Swinburne University of Technology's
+Centre for Advanced Internet Architectures, Melbourne, Australia, which was made
+possible in part by a grant from the Cisco University Research Program Fund at
+Community Foundation Silicon Valley.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man4/cc_newreno.4 b/share/man/man4/cc_newreno.4
index e119ec7..c09b362 100644
--- a/share/man/man4/cc_newreno.4
+++ b/share/man/man4/cc_newreno.4
@@ -4,8 +4,8 @@
 .\" All rights reserved.
 .\"
 .\" Portions of this documentation were written at the Centre for Advanced
-.\" Internet Architectures, Swinburne University, Melbourne, Australia by
-.\" Lawrence Stewart under sponsorship from the FreeBSD Foundation.
+.\" Internet Architectures, Swinburne University of Technology, Melbourne,
+.\" Australia by Lawrence Stewart under sponsorship from the FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -61,10 +61,10 @@ congestion control algorithm first appeared in its modular form in
 .Fx 9.0 .
 .Pp
 The module was first released in 2007 by James Healy and Lawrence Stewart whilst
-working on the NewTCP research project at Swinburne University's Centre for
-Advanced Internet Architectures, Melbourne, Australia, which was made possible
-in part by a grant from the Cisco University Research Program Fund at Community
-Foundation Silicon Valley.
+working on the NewTCP research project at Swinburne University of Technology's
+Centre for Advanced Internet Architectures, Melbourne, Australia, which was made
+possible in part by a grant from the Cisco University Research Program Fund at
+Community Foundation Silicon Valley.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man4/cc_vegas.4 b/share/man/man4/cc_vegas.4
index fa14a119..ce55723 100644
--- a/share/man/man4/cc_vegas.4
+++ b/share/man/man4/cc_vegas.4
@@ -3,8 +3,8 @@
 .\" All rights reserved.
 .\"
 .\" This documentation was written at the Centre for Advanced Internet
-.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes
-.\" under sponsorship from the FreeBSD Foundation.
+.\" Architectures, Swinburne University of Technology, Melbourne, Australia by
+.\" David Hayes under sponsorship from the FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -125,8 +125,8 @@ congestion control module first appeared in
 .Fx 9.0 .
 .Pp
 The module was first released in 2010 by David Hayes whilst working on the
-NewTCP research project at Swinburne University's Centre for Advanced Internet
-Architectures, Melbourne, Australia.
+NewTCP research project at Swinburne University of Technology's Centre for
+Advanced Internet Architectures, Melbourne, Australia.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man4/h_ertt.4 b/share/man/man4/h_ertt.4
index b6504c2..ed7461e 100644
--- a/share/man/man4/h_ertt.4
+++ b/share/man/man4/h_ertt.4
@@ -3,8 +3,8 @@
 .\" All rights reserved.
 .\"
 .\" This documentation was written at the Centre for Advanced Internet
-.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes
-.\" under sponsorship from the FreeBSD Foundation.
+.\" Architectures, Swinburne University of Technology, Melbourne, Australia by
+.\" David Hayes under sponsorship from the FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -125,8 +125,8 @@ module first appeared in
 .Fx 9.0 .
 .Pp
 The module was first released in 2010 by David Hayes whilst working on the
-NewTCP research project at Swinburne University's Centre for Advanced Internet
-Architectures, Melbourne, Australia.
+NewTCP research project at Swinburne University of Technology's Centre for
+Advanced Internet Architectures, Melbourne, Australia.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man4/siftr.4 b/share/man/man4/siftr.4
index 0e6f544..d8a6e75 100644
--- a/share/man/man4/siftr.4
+++ b/share/man/man4/siftr.4
@@ -616,10 +616,10 @@ and
 .Pp
 .Nm
 was first released in 2007 by Lawrence Stewart and James Healy whilst working on
-the NewTCP research project at Swinburne University's Centre for Advanced
-Internet Architectures, Melbourne, Australia, which was made possible in part by
-a grant from the Cisco University Research Program Fund at Community Foundation
-Silicon Valley.
+the NewTCP research project at Swinburne University of Technology's Centre for
+Advanced Internet Architectures, Melbourne, Australia, which was made possible
+in part by a grant from the Cisco University Research Program Fund at Community
+Foundation Silicon Valley.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man9/cc.9 b/share/man/man9/cc.9
index 92bf001..6a37984 100644
--- a/share/man/man9/cc.9
+++ b/share/man/man9/cc.9
@@ -4,8 +4,8 @@
 .\" All rights reserved.
 .\"
 .\" Portions of this documentation were written at the Centre for Advanced
-.\" Internet Architectures, Swinburne University, Melbourne, Australia by
-.\" David Hayes and Lawrence Stewart under sponsorship from the
+.\" Internet Architectures, Swinburne University of Technology, Melbourne,
+.\" Australia by David Hayes and Lawrence Stewart under sponsorship from the
 .\" FreeBSD Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -310,10 +310,10 @@ The modular Congestion Control (CC) framework first appeared in
 .Fx 9.0 .
 .Pp
 The framework was first released in 2007 by James Healy and Lawrence Stewart
-whilst working on the NewTCP research project at Swinburne University's Centre
-for Advanced Internet Architectures, Melbourne, Australia, which was made
-possible in part by a grant from the Cisco University Research Program Fund at
-Community Foundation Silicon Valley.
+whilst working on the NewTCP research project at Swinburne University of
+Technology's Centre for Advanced Internet Architectures, Melbourne, Australia,
+which was made possible in part by a grant from the Cisco University Research
+Program Fund at Community Foundation Silicon Valley.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man9/hhook.9 b/share/man/man9/hhook.9
index a67a317..1dd391f 100644
--- a/share/man/man9/hhook.9
+++ b/share/man/man9/hhook.9
@@ -3,8 +3,9 @@
 .\" All rights reserved.
 .\"
 .\" This documentation was written at the Centre for Advanced Internet
-.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes and
-.\" Lawrence Stewart under sponsorship from the FreeBSD Foundation.
+.\" Architectures, Swinburne University of Technology, Melbourne, Australia by
+.\" David Hayes and Lawrence Stewart under sponsorship from the FreeBSD
+.\" Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -363,8 +364,8 @@ framework first appeared in
 The
 .Nm
 framework was first released in 2010 by Lawrence Stewart whilst studying at
-Swinburne University's Centre for Advanced Internet Architectures, Melbourne,
-Australia.
+Swinburne University of Technology's Centre for Advanced Internet Architectures,
+Melbourne, Australia.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/share/man/man9/khelp.9 b/share/man/man9/khelp.9
index 5926420..25125c0 100644
--- a/share/man/man9/khelp.9
+++ b/share/man/man9/khelp.9
@@ -3,8 +3,9 @@
 .\" All rights reserved.
 .\"
 .\" This documentation was written at the Centre for Advanced Internet
-.\" Architectures, Swinburne University, Melbourne, Australia by David Hayes and
-.\" Lawrence Stewart under sponsorship from the FreeBSD Foundation.
+.\" Architectures, Swinburne University of Technology, Melbourne, Australia by
+.\" David Hayes and Lawrence Stewart under sponsorship from the FreeBSD
+.\" Foundation.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -419,8 +420,8 @@ kernel helper framework first appeared in
 The
 .Nm
 framework was first released in 2010 by Lawrence Stewart whilst studying at
-Swinburne University's Centre for Advanced Internet Architectures, Melbourne,
-Australia.
+Swinburne University of Technology's Centre for Advanced Internet Architectures,
+Melbourne, Australia.
 More details are available at:
 .Pp
 http://caia.swin.edu.au/urp/newtcp/
diff --git a/sys/kern/kern_hhook.c b/sys/kern/kern_hhook.c
index 443a787..4786755 100644
--- a/sys/kern/kern_hhook.c
+++ b/sys/kern/kern_hhook.c
@@ -4,9 +4,9 @@
  * All rights reserved.
  *
  * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University, made possible in
- * part by grants from the FreeBSD Foundation and Cisco University Research
- * Program Fund at Community Foundation Silicon Valley.
+ * for Advanced Internet Architectures, Swinburne University of Technology,
+ * made possible in part by grants from the FreeBSD Foundation and Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
diff --git a/sys/kern/kern_khelp.c b/sys/kern/kern_khelp.c
index f6ae3e2..1d335b3 100644
--- a/sys/kern/kern_khelp.c
+++ b/sys/kern/kern_khelp.c
@@ -4,9 +4,9 @@
  * All rights reserved.
  *
  * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University, made possible in
- * part by grants from the FreeBSD Foundation and Cisco University Research
- * Program Fund at Community Foundation Silicon Valley.
+ * for Advanced Internet Architectures, Swinburne University of Technology,
+ * made possible in part by grants from the FreeBSD Foundation and Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
diff --git a/sys/netinet/cc.h b/sys/netinet/cc.h
index 332e51c..14b4a9d 100644
--- a/sys/netinet/cc.h
+++ b/sys/netinet/cc.h
@@ -6,9 +6,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by Lawrence Stewart and James Healy,
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by Lawrence Stewart and
+ * James Healy, made possible in part by a grant from the Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
@@ -40,10 +40,11 @@
 
 /*
  * This software was first released in 2007 by James Healy and Lawrence Stewart
- * whilst working on the NewTCP research project at Swinburne University's
- * Centre for Advanced Internet Architectures, Melbourne, Australia, which was
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley. More details are available at:
+ * whilst working on the NewTCP research project at Swinburne University of
+ * Technology's Centre for Advanced Internet Architectures, Melbourne,
+ * Australia, which was made possible in part by a grant from the Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
+ * More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/cc/cc.c b/sys/netinet/cc/cc.c
index cfcbfa6..d6f978a 100644
--- a/sys/netinet/cc/cc.c
+++ b/sys/netinet/cc/cc.c
@@ -6,9 +6,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by Lawrence Stewart and James Healy,
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by Lawrence Stewart and
+ * James Healy, made possible in part by a grant from the Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
@@ -38,10 +38,11 @@
 
 /*
  * This software was first released in 2007 by James Healy and Lawrence Stewart
- * whilst working on the NewTCP research project at Swinburne University's
- * Centre for Advanced Internet Architectures, Melbourne, Australia, which was
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley. More details are available at:
+ * whilst working on the NewTCP research project at Swinburne University of
+ * Technology's Centre for Advanced Internet Architectures, Melbourne,
+ * Australia, which was made possible in part by a grant from the Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
+ * More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/cc/cc_chd.c b/sys/netinet/cc/cc_chd.c
index 4b1d2c4..9152a0b 100644
--- a/sys/netinet/cc/cc_chd.c
+++ b/sys/netinet/cc/cc_chd.c
@@ -5,9 +5,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by David Hayes and Lawrence Stewart,
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by David Hayes and
+ * Lawrence Stewart, made possible in part by a grant from the Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced Internet
  * Architectures, Swinburne University of Technology, Melbourne, Australia by
@@ -43,10 +43,10 @@
  * 11-14 October 2010.
  *
  * Originally released as part of the NewTCP research project at Swinburne
- * University's Centre for Advanced Internet Architectures, Melbourne,
- * Australia, which was made possible in part by a grant from the Cisco
- * University Research Program Fund at Community Foundation Silicon Valley. More
- * details are available at:
+ * University of Technology's Centre for Advanced Internet Architectures,
+ * Melbourne, Australia, which was made possible in part by a grant from the
+ * Cisco University Research Program Fund at Community Foundation Silicon
+ * Valley. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/cc/cc_cubic.c b/sys/netinet/cc/cc_cubic.c
index 17b4ad6..2c5d82c 100644
--- a/sys/netinet/cc/cc_cubic.c
+++ b/sys/netinet/cc/cc_cubic.c
@@ -4,9 +4,9 @@
  * All rights reserved.
  *
  * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University, made possible in
- * part by a grant from the Cisco University Research Program Fund at Community
- * Foundation Silicon Valley.
+ * for Advanced Internet Architectures, Swinburne University of Technology, made
+ * possible in part by a grant from the Cisco University Research Program Fund
+ * at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
@@ -38,10 +38,10 @@
  * An implementation of the CUBIC congestion control algorithm for FreeBSD,
  * based on the Internet Draft "draft-rhee-tcpm-cubic-02" by Rhee, Xu and Ha.
  * Originally released as part of the NewTCP research project at Swinburne
- * University's Centre for Advanced Internet Architectures, Melbourne,
- * Australia, which was made possible in part by a grant from the Cisco
- * University Research Program Fund at Community Foundation Silicon Valley. More
- * details are available at:
+ * University of Technology's Centre for Advanced Internet Architectures,
+ * Melbourne, Australia, which was made possible in part by a grant from the
+ * Cisco University Research Program Fund at Community Foundation Silicon
+ * Valley. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/cc/cc_cubic.h b/sys/netinet/cc/cc_cubic.h
index cf3470b..6158249 100644
--- a/sys/netinet/cc/cc_cubic.h
+++ b/sys/netinet/cc/cc_cubic.h
@@ -4,9 +4,9 @@
  * All rights reserved.
  *
  * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University, made possible in
- * part by a grant from the Cisco University Research Program Fund at Community
- * Foundation Silicon Valley.
+ * for Advanced Internet Architectures, Swinburne University of Technology, made
+ * possible in part by a grant from the Cisco University Research Program Fund
+ * at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
diff --git a/sys/netinet/cc/cc_hd.c b/sys/netinet/cc/cc_hd.c
index b33fb2c..1578afd 100644
--- a/sys/netinet/cc/cc_hd.c
+++ b/sys/netinet/cc/cc_hd.c
@@ -6,9 +6,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by David Hayes and Lawrence Stewart,
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by David Hayes and
+ * Lawrence Stewart, made possible in part by a grant from the Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced Internet
  * Architectures, Swinburne University of Technology, Melbourne, Australia by
@@ -44,10 +44,10 @@
  * 2009.
  *
  * Originally released as part of the NewTCP research project at Swinburne
- * University's Centre for Advanced Internet Architectures, Melbourne,
- * Australia, which was made possible in part by a grant from the Cisco
- * University Research Program Fund at Community Foundation Silicon Valley. More
- * details are available at:
+ * University of Technology's Centre for Advanced Internet Architectures,
+ * Melbourne, Australia, which was made possible in part by a grant from the
+ * Cisco University Research Program Fund at Community Foundation Silicon
+ * Valley. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/cc/cc_htcp.c b/sys/netinet/cc/cc_htcp.c
index 5cbda9f..4ada9d9 100644
--- a/sys/netinet/cc/cc_htcp.c
+++ b/sys/netinet/cc/cc_htcp.c
@@ -6,9 +6,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by Lawrence Stewart and James Healy,
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by Lawrence Stewart and
+ * James Healy, made possible in part by a grant from the Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
@@ -40,10 +40,10 @@
  * An implementation of the H-TCP congestion control algorithm for FreeBSD,
  * based on the Internet Draft "draft-leith-tcp-htcp-06.txt" by Leith and
  * Shorten. Originally released as part of the NewTCP research project at
- * Swinburne University's Centre for Advanced Internet Architectures, Melbourne,
- * Australia, which was made possible in part by a grant from the Cisco
- * University Research Program Fund at Community Foundation Silicon Valley. More
- * details are available at:
+ * Swinburne University of Technology's Centre for Advanced Internet
+ * Architectures, Melbourne, Australia, which was made possible in part by a
+ * grant from the Cisco University Research Program Fund at Community Foundation
+ * Silicon Valley. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/cc/cc_module.h b/sys/netinet/cc/cc_module.h
index f3fe752..6da10df 100644
--- a/sys/netinet/cc/cc_module.h
+++ b/sys/netinet/cc/cc_module.h
@@ -3,9 +3,9 @@
  * All rights reserved.
  *
  * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University, made possible in
- * part by a grant from the Cisco University Research Program Fund at Community
- * Foundation Silicon Valley.
+ * for Advanced Internet Architectures, Swinburne University of Technology, made
+ * possible in part by a grant from the Cisco University Research Program Fund
+ * at Community Foundation Silicon Valley.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,10 +33,10 @@
 
 /*
  * This software was first released in 2009 by Lawrence Stewart as part of the
- * NewTCP research project at Swinburne University's Centre for Advanced
- * Internet Architectures, Melbourne, Australia, which was made possible in part
- * by a grant from the Cisco University Research Program Fund at Community
- * Foundation Silicon Valley. More details are available at:
+ * NewTCP research project at Swinburne University of Technology's Centre for
+ * Advanced Internet Architectures, Melbourne, Australia, which was made
+ * possible in part by a grant from the Cisco University Research Program Fund
+ * at Community Foundation Silicon Valley. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/cc/cc_newreno.c b/sys/netinet/cc/cc_newreno.c
index f26553d..96d64fe 100644
--- a/sys/netinet/cc/cc_newreno.c
+++ b/sys/netinet/cc/cc_newreno.c
@@ -8,9 +8,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by Lawrence Stewart, James Healy and
- * David Hayes, made possible in part by a grant from the Cisco University
- * Research Program Fund at Community Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by Lawrence Stewart, James
+ * Healy and David Hayes, made possible in part by a grant from the Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
@@ -40,10 +40,11 @@
 
 /*
  * This software was first released in 2007 by James Healy and Lawrence Stewart
- * whilst working on the NewTCP research project at Swinburne University's
- * Centre for Advanced Internet Architectures, Melbourne, Australia, which was
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley. More details are available at:
+ * whilst working on the NewTCP research project at Swinburne University of
+ * Technology's Centre for Advanced Internet Architectures, Melbourne,
+ * Australia, which was made possible in part by a grant from the Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
+ * More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/cc/cc_vegas.c b/sys/netinet/cc/cc_vegas.c
index d22424f..ac3c89f 100644
--- a/sys/netinet/cc/cc_vegas.c
+++ b/sys/netinet/cc/cc_vegas.c
@@ -6,9 +6,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by David Hayes and Lawrence Stewart,
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by David Hayes and
+ * Lawrence Stewart, made possible in part by a grant from the Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced Internet
  * Architectures, Swinburne University of Technology, Melbourne, Australia by
@@ -46,10 +46,10 @@
  * the original paper.
  *
  * Originally released as part of the NewTCP research project at Swinburne
- * University's Centre for Advanced Internet Architectures, Melbourne,
- * Australia, which was made possible in part by a grant from the Cisco
- * University Research Program Fund at Community Foundation Silicon Valley. More
- * details are available at:
+ * University of Technology's Centre for Advanced Internet Architectures,
+ * Melbourne, Australia, which was made possible in part by a grant from the
+ * Cisco University Research Program Fund at Community Foundation Silicon
+ * Valley. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/khelp/h_ertt.c b/sys/netinet/khelp/h_ertt.c
index b5dcfe0..7ce195c 100644
--- a/sys/netinet/khelp/h_ertt.c
+++ b/sys/netinet/khelp/h_ertt.c
@@ -6,9 +6,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by David Hayes, made possible in part by
- * a grant from the Cisco University Research Program Fund at Community
- * Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by David Hayes, made
+ * possible in part by a grant from the Cisco University Research Program Fund
+ * at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
diff --git a/sys/netinet/khelp/h_ertt.h b/sys/netinet/khelp/h_ertt.h
index 8051a6c..de6e826 100644
--- a/sys/netinet/khelp/h_ertt.h
+++ b/sys/netinet/khelp/h_ertt.h
@@ -5,9 +5,9 @@
  * All rights reserved.
  *
  * This software was developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by David Hayes, made possible in part by
- * a grant from the Cisco University Research Program Fund at Community
- * Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by David Hayes, made
+ * possible in part by a grant from the Cisco University Research Program Fund
+ * at Community Foundation Silicon Valley.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -41,12 +41,12 @@
  * "struct ertt".
  *
  * This software was first released in 2010 by David Hayes and Lawrence Stewart
- * whilst working on the NewTCP research project at Swinburne University's
- * Centre for Advanced Internet Architectures, Melbourne, Australia, which was
- * made possible in part by a grant from the Cisco University Research Program
- * Fund at Community Foundation Silicon Valley. Testing and development was
- * further assisted by a grant from the FreeBSD Foundation. More details are
- * available at:
+ * whilst working on the NewTCP research project at Swinburne University of
+ * Technology's Centre for Advanced Internet Architectures, Melbourne,
+ * Australia, which was made possible in part by a grant from the Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
+ * Testing and development was further assisted by a grant from the FreeBSD
+ * Foundation. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/netinet/siftr.c b/sys/netinet/siftr.c
index b5db118..9fca662 100644
--- a/sys/netinet/siftr.c
+++ b/sys/netinet/siftr.c
@@ -38,10 +38,11 @@
  * for experimental, debugging and performance analysis purposes.
  *
  * SIFTR was first released in 2007 by James Healy and Lawrence Stewart whilst
- * working on the NewTCP research project at Swinburne University's Centre for
- * Advanced Internet Architectures, Melbourne, Australia, which was made
- * possible in part by a grant from the Cisco University Research Program Fund
- * at Community Foundation Silicon Valley. More details are available at:
+ * working on the NewTCP research project at Swinburne University of
+ * Technology's Centre for Advanced Internet Architectures, Melbourne,
+ * Australia, which was made possible in part by a grant from the Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
+ * More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  *
  * Work on SIFTR v1.2.x was sponsored by the FreeBSD Foundation as part of
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 44ee416..cb9453f 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -8,9 +8,9 @@
  * All rights reserved.
  *
  * Portions of this software were developed at the Centre for Advanced Internet
- * Architectures, Swinburne University, by Lawrence Stewart, James Healy and
- * David Hayes, made possible in part by a grant from the Cisco University
- * Research Program Fund at Community Foundation Silicon Valley.
+ * Architectures, Swinburne University of Technology, by Lawrence Stewart,
+ * James Healy and David Hayes, made possible in part by a grant from the Cisco
+ * University Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
diff --git a/sys/sys/hhook.h b/sys/sys/hhook.h
index 8cca8a0..d43e479 100644
--- a/sys/sys/hhook.h
+++ b/sys/sys/hhook.h
@@ -4,9 +4,9 @@
  * All rights reserved.
  *
  * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University, made possible in
- * part by grants from the FreeBSD Foundation and Cisco University Research
- * Program Fund at Community Foundation Silicon Valley.
+ * for Advanced Internet Architectures, Swinburne University of Technology, made
+ * possible in part by grants from the FreeBSD Foundation and Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
@@ -39,10 +39,10 @@
 /*
  * A KPI modelled on the pfil framework for instantiating helper hook points
  * within the kernel for use by Khelp modules. Originally released as part of
- * the NewTCP research project at Swinburne University's Centre for Advanced
- * Internet Architectures, Melbourne, Australia, which was made possible in part
- * by a grant from the Cisco University Research Program Fund at Community
- * Foundation Silicon Valley. More details are available at:
+ * the NewTCP research project at Swinburne University of Technology's Centre
+ * for Advanced Internet Architectures, Melbourne, Australia, which was made
+ * possible in part by a grant from the Cisco University Research Program Fund
+ * at Community Foundation Silicon Valley. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/sys/khelp.h b/sys/sys/khelp.h
index 9b3ae1d..db12d6b 100644
--- a/sys/sys/khelp.h
+++ b/sys/sys/khelp.h
@@ -4,9 +4,9 @@
  * All rights reserved.
  *
  * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University, made possible in
- * part by grants from the FreeBSD Foundation and Cisco University Research
- * Program Fund at Community Foundation Silicon Valley.
+ * for Advanced Internet Architectures, Swinburne University of Technology, made
+ * possible in part by grants from the FreeBSD Foundation and Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,
@@ -38,11 +38,11 @@
 
 /*
  * A KPI for managing kernel helper modules which perform useful functionality
- * within the kernel. Originally released as part of the NewTCP research
- * project at Swinburne University's Centre for Advanced Internet Architectures,
- * Melbourne, Australia, which was made possible in part by a grant from the
- * Cisco University Research Program Fund at Community Foundation Silicon
- * Valley. More details are available at:
+ * within the kernel. Originally released as part of the NewTCP research project
+ * at Swinburne University of Technology's Centre for Advanced Internet
+ * Architectures, Melbourne, Australia, which was made possible in part by a
+ * grant from the Cisco University Research Program Fund at Community Foundation
+ * Silicon Valley. More details are available at:
  *   http://caia.swin.edu.au/urp/newtcp/
  */
 
diff --git a/sys/sys/module_khelp.h b/sys/sys/module_khelp.h
index 39e2591..9a7f507d 100644
--- a/sys/sys/module_khelp.h
+++ b/sys/sys/module_khelp.h
@@ -4,9 +4,9 @@
  * All rights reserved.
  *
  * This software was developed by Lawrence Stewart while studying at the Centre
- * for Advanced Internet Architectures, Swinburne University, made possible in
- * part by grants from the FreeBSD Foundation and Cisco University Research
- * Program Fund at Community Foundation Silicon Valley.
+ * for Advanced Internet Architectures, Swinburne University of Technology, made
+ * possible in part by grants from the FreeBSD Foundation and Cisco University
+ * Research Program Fund at Community Foundation Silicon Valley.
  *
  * Portions of this software were developed at the Centre for Advanced
  * Internet Architectures, Swinburne University of Technology, Melbourne,