diff --git a/src/warden-client/bin/receiver.pl b/src/warden-client/bin/receiver.pl
index 81a6e46c9810061f36a6276b527891549293b558..6250436897331db2917974ccbb0a1f258ba44726 100755
--- a/src/warden-client/bin/receiver.pl
+++ b/src/warden-client/bin/receiver.pl
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-client/bin/sender.pl b/src/warden-client/bin/sender.pl
index 0328da197e0e649e5defd9b091effcc0e04e0581..e2fdaf7cc6f786be64fc581364d368984034946a 100755
--- a/src/warden-client/bin/sender.pl
+++ b/src/warden-client/bin/sender.pl
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-client/doc/LICENSE b/src/warden-client/doc/LICENSE
index 175c210d7a288c014913f9dfa96ded9404e356d2..ec047e7c63ede903c326a6e4bf7e3bfa821625b2 100644
--- a/src/warden-client/doc/LICENSE
+++ b/src/warden-client/doc/LICENSE
@@ -18,7 +18,7 @@ are permitted provided that the following conditions are met:
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COMPANY BE LIABLE FOR ANY DIRECT, INDIRECT,
+DISCLAIMED. IN NO EVENT SHALL THE Cesnet z.s.p.o BE LIABLE FOR ANY DIRECT, INDIRECT,
 INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
 OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
diff --git a/src/warden-client/doc/example-receiver.pl.txt b/src/warden-client/doc/example-receiver.pl.txt
index f8142a7f091b07f88f17b154edaeb3287e67a8b1..ac119919874efe14ce8d09420b8db157aec899e5 100644
--- a/src/warden-client/doc/example-receiver.pl.txt
+++ b/src/warden-client/doc/example-receiver.pl.txt
@@ -20,7 +20,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-client/doc/example-sender.pl.txt b/src/warden-client/doc/example-sender.pl.txt
index 1383dff846647c48061a97cb45c320659d040bad..98b1b69cf91441f2ed6c526e5febfc065d968348 100644
--- a/src/warden-client/doc/example-sender.pl.txt
+++ b/src/warden-client/doc/example-sender.pl.txt
@@ -20,7 +20,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-client/lib/WardenClientConf.pm b/src/warden-client/lib/WardenClientConf.pm
index 73b84c1530e6a7b0429843caa8b1fe341bb668af..9c7776e38f1f2e15b2a89ee73a24ec40d853abea 100755
--- a/src/warden-client/lib/WardenClientConf.pm
+++ b/src/warden-client/lib/WardenClientConf.pm
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-client/lib/WardenClientReceive.pm b/src/warden-client/lib/WardenClientReceive.pm
index a90f72568b526e96cc1419d6eee0c10671126817..779b461f0acd1063c4ae8db1c547d3025fc3ae4b 100755
--- a/src/warden-client/lib/WardenClientReceive.pm
+++ b/src/warden-client/lib/WardenClientReceive.pm
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-client/lib/WardenClientSend.pm b/src/warden-client/lib/WardenClientSend.pm
index 5644e29fb5d6dae944550df374007bd39406e29b..f0a7e879799b06532cc5e13017df99a01c0765bd 100755
--- a/src/warden-client/lib/WardenClientSend.pm
+++ b/src/warden-client/lib/WardenClientSend.pm
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-client/sh/install.sh b/src/warden-client/sh/install.sh
index 1ebe9a1e9759c6e0b782f9ae054a2220cbd7d89c..ee9c1d5f481318679318ff131bb90f412eaf944f 100755
--- a/src/warden-client/sh/install.sh
+++ b/src/warden-client/sh/install.sh
@@ -15,14 +15,14 @@
 #    notice, this list of conditions and the following disclaimer in
 #    the documentation and/or other materials provided with the
 #    distribution.
-# 3. Neither the name of the Company nor the names of its
+# 3. Neither the name of the Cesnet z.s.p.o nor the names of its
 #    contributors may be used to endorse or promote products derived from
 #     this software without specific prior written permission.
 #
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/bin/getClients.pl b/src/warden-server/bin/getClients.pl
index 434a0a1370f23e1d570fe4684d035e2296e12a82..b1640a1b0d29f65bbfd01b592949fe807ae36edf 100755
--- a/src/warden-server/bin/getClients.pl
+++ b/src/warden-server/bin/getClients.pl
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/bin/getStatus.pl b/src/warden-server/bin/getStatus.pl
index 57d3c8c29ebeeedf0403e5ed57d58219104d509e..1549b3c20a0ddb40b4ae8d69898d7c31ecb348ac 100755
--- a/src/warden-server/bin/getStatus.pl
+++ b/src/warden-server/bin/getStatus.pl
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/bin/registerReceiver.pl b/src/warden-server/bin/registerReceiver.pl
index 83a21a4ef621e6619f2d29c992d1915e4a57f194..cada0681b167e0c69d3e6fd08007461ca5581d40 100755
--- a/src/warden-server/bin/registerReceiver.pl
+++ b/src/warden-server/bin/registerReceiver.pl
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/bin/registerSender.pl b/src/warden-server/bin/registerSender.pl
index 0b7af9573119182a333f1d8ab99dd1d550bed3d8..053c1f772c9bccc5f118b3793d95bdebaecf09cd 100755
--- a/src/warden-server/bin/registerSender.pl
+++ b/src/warden-server/bin/registerSender.pl
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/bin/unregisterClient.pl b/src/warden-server/bin/unregisterClient.pl
index a69f1acd984162b0c8329268653ba549f6f54f00..028f2ecc4eb7372964440479d16a8663f3c2fe73 100755
--- a/src/warden-server/bin/unregisterClient.pl
+++ b/src/warden-server/bin/unregisterClient.pl
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/bin/warden-server.pl b/src/warden-server/bin/warden-server.pl
index bd4d1febb4de4985bdb907f1eb584f5840c0ec7d..bf95e145b89dbc8be1b8588e251897b0fecd9c07 100755
--- a/src/warden-server/bin/warden-server.pl
+++ b/src/warden-server/bin/warden-server.pl
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/bin/wardend b/src/warden-server/bin/wardend
index 2c9ddb2a76864b9c045a367a7a2e458d455189ba..e334b7704446e3c57cb88ffbd8701d55e52786d3 100755
--- a/src/warden-server/bin/wardend
+++ b/src/warden-server/bin/wardend
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/lib/WardenConf.pm b/src/warden-server/lib/WardenConf.pm
index 4b86eff94024a7eeb1ae3254221a213d13e04230..bdb64ca7dda233ab82bf0f790395dafbe9ad5e92 100755
--- a/src/warden-server/lib/WardenConf.pm
+++ b/src/warden-server/lib/WardenConf.pm
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/lib/WardenReg.pm b/src/warden-server/lib/WardenReg.pm
index b32562ad2d9c9d329ca3cd8006b23d3ba6002259..ec442bfb3f3d0967948194d8f70642e25230e34c 100755
--- a/src/warden-server/lib/WardenReg.pm
+++ b/src/warden-server/lib/WardenReg.pm
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/lib/WardenStatus.pm b/src/warden-server/lib/WardenStatus.pm
index 440676796e36146385ecc2ec16bf24a3574614c4..e13868abd891a503d05b5562f3f29618a5e30f58 100755
--- a/src/warden-server/lib/WardenStatus.pm
+++ b/src/warden-server/lib/WardenStatus.pm
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/sh/create_table-clients.sh b/src/warden-server/sh/create_table-clients.sh
index 9c3e1a5103f267b858990e92bdbcc238f64b4d78..ce018f9527299f35807c6cc267f95ac6b54306dd 100755
--- a/src/warden-server/sh/create_table-clients.sh
+++ b/src/warden-server/sh/create_table-clients.sh
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business
diff --git a/src/warden-server/sh/create_table-events.sh b/src/warden-server/sh/create_table-events.sh
index 60ce357bed19ca90293db616733c12c89cf1758c..280caf411a6cf18194b62afbcd0b7e8b43683888 100755
--- a/src/warden-server/sh/create_table-events.sh
+++ b/src/warden-server/sh/create_table-events.sh
@@ -22,7 +22,7 @@
 # This software is provided ``as is'', and any express or implied
 # warranties, including, but not limited to, the implied warranties of
 # merchantability and fitness for a particular purpose are disclaimed.
-# In no event shall the Masaryk University or contributors be liable for
+# In no event shall the Cesnet z.s.p.o or contributors be liable for
 # any direct, indirect, incidental, special, exemplary, or consequential
 # damages (including, but not limited to, procurement of substitute
 # goods or services; loss of use, data, or profits; or business