summaryrefslogtreecommitdiff
path: root/objective-c
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-01-19 13:12:29 +0100
committerJose <jose@zeroc.com>2019-01-19 13:12:29 +0100
commit7a7d495fb0c5a63e404eb62a0461bbafb06d6175 (patch)
treee0877720ce67950b8b0eaaef410631013c3cf2a4 /objective-c
parentRemove anonymous cipher usage in IceSSL/configuration (diff)
downloadice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.tar.bz2
ice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.tar.xz
ice-7a7d495fb0c5a63e404eb62a0461bbafb06d6175.zip
Copyright header simplication
Diffstat (limited to 'objective-c')
-rw-r--r--objective-c/Makefile4
-rwxr-xr-xobjective-c/allTests.py4
-rw-r--r--objective-c/config/Make.rules4
-rw-r--r--objective-c/config/Make.xcodesdk.rules4
-rw-r--r--objective-c/include/objc/Glacier2.h4
-rw-r--r--objective-c/include/objc/Glacier2/Glacier2.h4
-rw-r--r--objective-c/include/objc/Ice.h4
-rw-r--r--objective-c/include/objc/Ice/Config.h4
-rw-r--r--objective-c/include/objc/Ice/DispatchInterceptor.h4
-rw-r--r--objective-c/include/objc/Ice/Exception.h4
-rw-r--r--objective-c/include/objc/Ice/Format.h4
-rw-r--r--objective-c/include/objc/Ice/Ice.h4
-rw-r--r--objective-c/include/objc/Ice/Initialize.h4
-rw-r--r--objective-c/include/objc/Ice/LocalObject.h4
-rw-r--r--objective-c/include/objc/Ice/NativePropertiesAdmin.h4
-rw-r--r--objective-c/include/objc/Ice/Object.h4
-rw-r--r--objective-c/include/objc/Ice/ObjectFactory.h4
-rw-r--r--objective-c/include/objc/Ice/Proxy.h4
-rw-r--r--objective-c/include/objc/Ice/SlicedData.h4
-rw-r--r--objective-c/include/objc/Ice/Stream.h4
-rw-r--r--objective-c/include/objc/Ice/ValueFactory.h4
-rw-r--r--objective-c/include/objc/IceGrid.h4
-rw-r--r--objective-c/include/objc/IceGrid/IceGrid.h4
-rw-r--r--objective-c/include/objc/IceIAP.h4
-rw-r--r--objective-c/include/objc/IceIAP/IceIAP.h4
-rw-r--r--objective-c/include/objc/IceSSL.h4
-rw-r--r--objective-c/include/objc/IceSSL/IceSSL.h4
-rw-r--r--objective-c/include/objc/IceStorm.h4
-rw-r--r--objective-c/src/Glacier2/Makefile.mk4
-rw-r--r--objective-c/src/Ice/BatchRequestInterceptor.mm4
-rw-r--r--objective-c/src/Ice/BatchRequestInterceptorI.h4
-rw-r--r--objective-c/src/Ice/CommunicatorI.h4
-rw-r--r--objective-c/src/Ice/CommunicatorI.mm4
-rw-r--r--objective-c/src/Ice/ConnectionI.h4
-rw-r--r--objective-c/src/Ice/ConnectionI.mm4
-rw-r--r--objective-c/src/Ice/CurrentI.h4
-rw-r--r--objective-c/src/Ice/CurrentI.mm4
-rw-r--r--objective-c/src/Ice/DispatchInterceptor.m4
-rw-r--r--objective-c/src/Ice/Dispatcher.mm4
-rw-r--r--objective-c/src/Ice/DispatcherI.h4
-rw-r--r--objective-c/src/Ice/EndpointI.h4
-rw-r--r--objective-c/src/Ice/EndpointI.mm4
-rw-r--r--objective-c/src/Ice/Exception.mm4
-rw-r--r--objective-c/src/Ice/ExceptionI.h4
-rw-r--r--objective-c/src/Ice/IdentityI.h4
-rw-r--r--objective-c/src/Ice/IdentityI.mm4
-rw-r--r--objective-c/src/Ice/ImplicitContextI.h4
-rw-r--r--objective-c/src/Ice/ImplicitContextI.mm4
-rw-r--r--objective-c/src/Ice/Initialize.mm4
-rw-r--r--objective-c/src/Ice/InitializeI.h4
-rw-r--r--objective-c/src/Ice/LocalObject.mm4
-rw-r--r--objective-c/src/Ice/LocalObjectI.h4
-rw-r--r--objective-c/src/Ice/LoggerI.h4
-rw-r--r--objective-c/src/Ice/LoggerI.mm4
-rw-r--r--objective-c/src/Ice/Makefile.mk4
-rw-r--r--objective-c/src/Ice/Object.mm4
-rw-r--r--objective-c/src/Ice/ObjectAdapterI.h4
-rw-r--r--objective-c/src/Ice/ObjectAdapterI.mm4
-rw-r--r--objective-c/src/Ice/ObjectI.h4
-rw-r--r--objective-c/src/Ice/PropertiesI.h4
-rw-r--r--objective-c/src/Ice/PropertiesI.mm4
-rw-r--r--objective-c/src/Ice/Proxy.mm4
-rw-r--r--objective-c/src/Ice/ProxyI.h4
-rw-r--r--objective-c/src/Ice/Request.h4
-rw-r--r--objective-c/src/Ice/Request.m4
-rw-r--r--objective-c/src/Ice/SlicedData.mm4
-rw-r--r--objective-c/src/Ice/SlicedDataI.h4
-rw-r--r--objective-c/src/Ice/Stream.mm4
-rw-r--r--objective-c/src/Ice/StreamI.h4
-rw-r--r--objective-c/src/Ice/Util.h4
-rw-r--r--objective-c/src/Ice/Util.mm4
-rw-r--r--objective-c/src/Ice/ValueFactoryI.h4
-rw-r--r--objective-c/src/Ice/ValueFactoryI.mm4
-rw-r--r--objective-c/src/Ice/VersionI.h4
-rw-r--r--objective-c/src/Ice/VersionI.mm4
-rw-r--r--objective-c/src/IceGrid/Makefile.mk4
-rw-r--r--objective-c/src/IceIAP/ConnectionInfoI.mm4
-rw-r--r--objective-c/src/IceIAP/EndpointInfoI.mm4
-rw-r--r--objective-c/src/IceIAP/Makefile.mk4
-rw-r--r--objective-c/src/IceSSL/ConnectionInfoI.mm4
-rw-r--r--objective-c/src/IceSSL/EndpointInfoI.mm4
-rw-r--r--objective-c/src/IceSSL/Makefile.mk4
-rw-r--r--objective-c/src/IceStorm/Makefile.mk4
-rw-r--r--objective-c/test/Common/Makefile.mk4
-rw-r--r--objective-c/test/Common/TestCommon.m4
-rw-r--r--objective-c/test/Ice/acm/ACMTest.ice4
-rw-r--r--objective-c/test/Ice/acm/AllTests.m4
-rw-r--r--objective-c/test/Ice/acm/Client.m4
-rw-r--r--objective-c/test/Ice/acm/Server.m4
-rw-r--r--objective-c/test/Ice/acm/TestI.h4
-rw-r--r--objective-c/test/Ice/acm/TestI.m4
-rw-r--r--objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice4
-rw-r--r--objective-c/test/Ice/adapterDeactivation/AllTests.m4
-rw-r--r--objective-c/test/Ice/adapterDeactivation/Client.m4
-rw-r--r--objective-c/test/Ice/adapterDeactivation/Collocated.m4
-rw-r--r--objective-c/test/Ice/adapterDeactivation/Server.m4
-rw-r--r--objective-c/test/Ice/adapterDeactivation/TestI.h4
-rw-r--r--objective-c/test/Ice/adapterDeactivation/TestI.m4
-rw-r--r--objective-c/test/Ice/admin/AdminTest.ice4
-rw-r--r--objective-c/test/Ice/admin/AllTests.m4
-rw-r--r--objective-c/test/Ice/admin/Client.m4
-rw-r--r--objective-c/test/Ice/admin/Makefile.mk4
-rw-r--r--objective-c/test/Ice/admin/Server.m4
-rw-r--r--objective-c/test/Ice/admin/TestI.h4
-rw-r--r--objective-c/test/Ice/admin/TestI.m4
-rw-r--r--objective-c/test/Ice/ami/AMITest.ice4
-rw-r--r--objective-c/test/Ice/ami/AllTests.m4
-rw-r--r--objective-c/test/Ice/ami/Client.m4
-rw-r--r--objective-c/test/Ice/ami/Collocated.m4
-rw-r--r--objective-c/test/Ice/ami/Server.m4
-rw-r--r--objective-c/test/Ice/ami/TestI.h4
-rw-r--r--objective-c/test/Ice/ami/TestI.m4
-rw-r--r--objective-c/test/Ice/binding/AllTests.m4
-rw-r--r--objective-c/test/Ice/binding/BindingTest.ice4
-rw-r--r--objective-c/test/Ice/binding/Client.m4
-rw-r--r--objective-c/test/Ice/binding/Server.m4
-rw-r--r--objective-c/test/Ice/binding/TestI.h4
-rw-r--r--objective-c/test/Ice/binding/TestI.m4
-rw-r--r--objective-c/test/Ice/defaultServant/Client.m4
-rw-r--r--objective-c/test/Ice/defaultServant/DefaultServantTest.ice4
-rw-r--r--objective-c/test/Ice/defaultServant/Makefile.mk4
-rw-r--r--objective-c/test/Ice/defaultServant/TestI.h4
-rw-r--r--objective-c/test/Ice/defaultServant/TestI.m4
-rw-r--r--objective-c/test/Ice/defaultValue/AllTests.m4
-rw-r--r--objective-c/test/Ice/defaultValue/Client.m4
-rw-r--r--objective-c/test/Ice/defaultValue/DefaultValueTest.ice4
-rw-r--r--objective-c/test/Ice/dispatcher/AllTests.m4
-rw-r--r--objective-c/test/Ice/dispatcher/Client.m4
-rw-r--r--objective-c/test/Ice/dispatcher/Collocated.m4
-rw-r--r--objective-c/test/Ice/dispatcher/DispatcherTest.ice4
-rw-r--r--objective-c/test/Ice/dispatcher/Server.m4
-rw-r--r--objective-c/test/Ice/dispatcher/TestI.h4
-rw-r--r--objective-c/test/Ice/dispatcher/TestI.m4
-rw-r--r--objective-c/test/Ice/enums/AllTests.m4
-rw-r--r--objective-c/test/Ice/enums/Client.m4
-rw-r--r--objective-c/test/Ice/enums/EnumTest.ice4
-rw-r--r--objective-c/test/Ice/enums/Server.m4
-rw-r--r--objective-c/test/Ice/enums/TestI.h4
-rw-r--r--objective-c/test/Ice/enums/TestI.m4
-rw-r--r--objective-c/test/Ice/exceptions/AllTests.m4
-rw-r--r--objective-c/test/Ice/exceptions/Client.m4
-rw-r--r--objective-c/test/Ice/exceptions/Collocated.m4
-rw-r--r--objective-c/test/Ice/exceptions/ExceptionsTest.ice4
-rw-r--r--objective-c/test/Ice/exceptions/Server.m4
-rw-r--r--objective-c/test/Ice/exceptions/TestI.h4
-rw-r--r--objective-c/test/Ice/exceptions/TestI.m4
-rw-r--r--objective-c/test/Ice/facets/AllTests.m4
-rw-r--r--objective-c/test/Ice/facets/Client.m4
-rw-r--r--objective-c/test/Ice/facets/Collocated.m4
-rw-r--r--objective-c/test/Ice/facets/FacetsTest.ice4
-rw-r--r--objective-c/test/Ice/facets/Server.m4
-rw-r--r--objective-c/test/Ice/facets/TestI.h4
-rw-r--r--objective-c/test/Ice/facets/TestI.m4
-rw-r--r--objective-c/test/Ice/faultTolerance/AllTests.m4
-rw-r--r--objective-c/test/Ice/faultTolerance/Client.m4
-rw-r--r--objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice4
-rw-r--r--objective-c/test/Ice/faultTolerance/Server.m4
-rw-r--r--objective-c/test/Ice/faultTolerance/TestI.h4
-rw-r--r--objective-c/test/Ice/faultTolerance/TestI.m4
-rw-r--r--objective-c/test/Ice/hash/AllTests.m4
-rw-r--r--objective-c/test/Ice/hash/Client.m4
-rw-r--r--objective-c/test/Ice/hash/HashTest.ice4
-rw-r--r--objective-c/test/Ice/hold/AllTests.m4
-rw-r--r--objective-c/test/Ice/hold/Client.m4
-rw-r--r--objective-c/test/Ice/hold/HoldTest.ice4
-rw-r--r--objective-c/test/Ice/hold/Server.m4
-rw-r--r--objective-c/test/Ice/hold/TestI.h4
-rw-r--r--objective-c/test/Ice/hold/TestI.m4
-rw-r--r--objective-c/test/Ice/info/AllTests.m4
-rw-r--r--objective-c/test/Ice/info/Client.m4
-rw-r--r--objective-c/test/Ice/info/InfoTest.ice4
-rw-r--r--objective-c/test/Ice/info/Makefile.mk4
-rw-r--r--objective-c/test/Ice/info/Server.m4
-rw-r--r--objective-c/test/Ice/info/TestI.h4
-rw-r--r--objective-c/test/Ice/info/TestI.m4
-rw-r--r--objective-c/test/Ice/inheritance/AllTests.m4
-rw-r--r--objective-c/test/Ice/inheritance/Client.m4
-rw-r--r--objective-c/test/Ice/inheritance/Collocated.m4
-rw-r--r--objective-c/test/Ice/inheritance/InheritanceTest.ice4
-rw-r--r--objective-c/test/Ice/inheritance/Server.m4
-rw-r--r--objective-c/test/Ice/inheritance/TestI.h4
-rw-r--r--objective-c/test/Ice/inheritance/TestI.m4
-rw-r--r--objective-c/test/Ice/interceptor/Client.m4
-rw-r--r--objective-c/test/Ice/interceptor/InterceptorI.h4
-rw-r--r--objective-c/test/Ice/interceptor/InterceptorI.m4
-rw-r--r--objective-c/test/Ice/interceptor/InterceptorTest.ice4
-rw-r--r--objective-c/test/Ice/interceptor/Makefile.mk4
-rw-r--r--objective-c/test/Ice/interceptor/MyObjectI.h4
-rw-r--r--objective-c/test/Ice/interceptor/MyObjectI.m4
-rw-r--r--objective-c/test/Ice/invoke/AllTests.m4
-rw-r--r--objective-c/test/Ice/invoke/BlobjectI.h4
-rw-r--r--objective-c/test/Ice/invoke/BlobjectI.m4
-rw-r--r--objective-c/test/Ice/invoke/Client.m4
-rw-r--r--objective-c/test/Ice/invoke/InvokeTest.ice4
-rw-r--r--objective-c/test/Ice/invoke/Makefile.mk4
-rw-r--r--objective-c/test/Ice/invoke/Server.m4
-rw-r--r--objective-c/test/Ice/location/AllTests.m4
-rw-r--r--objective-c/test/Ice/location/Client.m4
-rw-r--r--objective-c/test/Ice/location/LocationTest.ice4
-rw-r--r--objective-c/test/Ice/location/Makefile.mk4
-rw-r--r--objective-c/test/Ice/location/Server.m4
-rw-r--r--objective-c/test/Ice/location/ServerLocator.h4
-rw-r--r--objective-c/test/Ice/location/ServerLocator.m4
-rw-r--r--objective-c/test/Ice/location/TestI.h4
-rw-r--r--objective-c/test/Ice/location/TestI.m4
-rw-r--r--objective-c/test/Ice/metrics/AllTests.m4
-rw-r--r--objective-c/test/Ice/metrics/Client.m4
-rw-r--r--objective-c/test/Ice/metrics/MetricsTest.ice4
-rw-r--r--objective-c/test/Ice/metrics/Server.m4
-rw-r--r--objective-c/test/Ice/metrics/TestI.h4
-rw-r--r--objective-c/test/Ice/metrics/TestI.m4
-rw-r--r--objective-c/test/Ice/objects/AllTests.m4
-rw-r--r--objective-c/test/Ice/objects/Client.m4
-rw-r--r--objective-c/test/Ice/objects/Collocated.m4
-rw-r--r--objective-c/test/Ice/objects/Makefile.mk4
-rw-r--r--objective-c/test/Ice/objects/ObjectsDerived.ice4
-rw-r--r--objective-c/test/Ice/objects/ObjectsDerivedEx.ice4
-rw-r--r--objective-c/test/Ice/objects/ObjectsTest.ice4
-rw-r--r--objective-c/test/Ice/objects/Server.m4
-rw-r--r--objective-c/test/Ice/objects/TestI.h4
-rw-r--r--objective-c/test/Ice/objects/TestI.m4
-rw-r--r--objective-c/test/Ice/objects/TestIntfI.m4
-rw-r--r--objective-c/test/Ice/operations/AllTests.m4
-rw-r--r--objective-c/test/Ice/operations/BatchOneways.m4
-rw-r--r--objective-c/test/Ice/operations/BatchOnewaysAMI.m4
-rw-r--r--objective-c/test/Ice/operations/Client.m4
-rw-r--r--objective-c/test/Ice/operations/Collocated.m4
-rw-r--r--objective-c/test/Ice/operations/Makefile.mk4
-rw-r--r--objective-c/test/Ice/operations/Oneways.m4
-rw-r--r--objective-c/test/Ice/operations/OnewaysAMI.m4
-rw-r--r--objective-c/test/Ice/operations/OperationsTest.ice4
-rw-r--r--objective-c/test/Ice/operations/Server.m4
-rw-r--r--objective-c/test/Ice/operations/TestI.h4
-rw-r--r--objective-c/test/Ice/operations/TestI.m4
-rw-r--r--objective-c/test/Ice/operations/Twoways.m4
-rw-r--r--objective-c/test/Ice/operations/TwowaysAMI.m4
-rw-r--r--objective-c/test/Ice/optional/AllTests.m4
-rw-r--r--objective-c/test/Ice/optional/Client.m4
-rw-r--r--objective-c/test/Ice/optional/OptionalTest.ice4
-rw-r--r--objective-c/test/Ice/optional/Server.m4
-rw-r--r--objective-c/test/Ice/optional/TestI.h4
-rw-r--r--objective-c/test/Ice/optional/TestI.m4
-rw-r--r--objective-c/test/Ice/proxy/AllTests.m4
-rw-r--r--objective-c/test/Ice/proxy/Client.m4
-rw-r--r--objective-c/test/Ice/proxy/Collocated.m4
-rw-r--r--objective-c/test/Ice/proxy/ProxyTest.ice4
-rw-r--r--objective-c/test/Ice/proxy/Server.m4
-rw-r--r--objective-c/test/Ice/proxy/TestI.h4
-rw-r--r--objective-c/test/Ice/proxy/TestI.m4
-rw-r--r--objective-c/test/Ice/retry/AllTests.m4
-rw-r--r--objective-c/test/Ice/retry/Client.m4
-rw-r--r--objective-c/test/Ice/retry/Collocated.m4
-rw-r--r--objective-c/test/Ice/retry/RetryTest.ice4
-rw-r--r--objective-c/test/Ice/retry/Server.m4
-rw-r--r--objective-c/test/Ice/retry/TestI.h4
-rw-r--r--objective-c/test/Ice/retry/TestI.m4
-rw-r--r--objective-c/test/Ice/servantLocator/AllTests.m4
-rw-r--r--objective-c/test/Ice/servantLocator/Client.m4
-rw-r--r--objective-c/test/Ice/servantLocator/Collocated.m4
-rw-r--r--objective-c/test/Ice/servantLocator/Makefile.mk4
-rw-r--r--objective-c/test/Ice/servantLocator/ServantLocatorI.h4
-rw-r--r--objective-c/test/Ice/servantLocator/ServantLocatorI.m4
-rw-r--r--objective-c/test/Ice/servantLocator/ServantLocatorTest.ice4
-rw-r--r--objective-c/test/Ice/servantLocator/Server.m4
-rw-r--r--objective-c/test/Ice/servantLocator/TestI.h4
-rw-r--r--objective-c/test/Ice/servantLocator/TestI.m4
-rw-r--r--objective-c/test/Ice/services/AllTests.m4
-rw-r--r--objective-c/test/Ice/services/Client.m4
-rw-r--r--objective-c/test/Ice/services/Makefile.mk4
-rw-r--r--objective-c/test/Ice/services/ServicesTest.ice4
-rw-r--r--objective-c/test/Ice/slicing/exceptions/AllTests.m4
-rw-r--r--objective-c/test/Ice/slicing/exceptions/Client.m4
-rw-r--r--objective-c/test/Ice/slicing/exceptions/Makefile.mk4
-rw-r--r--objective-c/test/Ice/slicing/exceptions/Server.m4
-rw-r--r--objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice4
-rw-r--r--objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice4
-rw-r--r--objective-c/test/Ice/slicing/exceptions/TestI.h4
-rw-r--r--objective-c/test/Ice/slicing/exceptions/TestI.m4
-rw-r--r--objective-c/test/Ice/slicing/objects/AllTests.m4
-rw-r--r--objective-c/test/Ice/slicing/objects/Client.m4
-rw-r--r--objective-c/test/Ice/slicing/objects/Makefile.mk4
-rw-r--r--objective-c/test/Ice/slicing/objects/Server.m4
-rw-r--r--objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice4
-rw-r--r--objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice4
-rw-r--r--objective-c/test/Ice/slicing/objects/TestI.h4
-rw-r--r--objective-c/test/Ice/slicing/objects/TestI.m4
-rw-r--r--objective-c/test/Ice/stream/Client.m4
-rw-r--r--objective-c/test/Ice/stream/StreamTest.ice4
-rw-r--r--objective-c/test/Ice/timeout/AllTests.m4
-rw-r--r--objective-c/test/Ice/timeout/Client.m4
-rw-r--r--objective-c/test/Ice/timeout/Server.m4
-rw-r--r--objective-c/test/Ice/timeout/TestI.h4
-rw-r--r--objective-c/test/Ice/timeout/TestI.m4
-rw-r--r--objective-c/test/Ice/timeout/TimeoutTest.ice4
-rw-r--r--objective-c/test/Slice/escape/Clash.ice4
-rw-r--r--objective-c/test/Slice/escape/Client.m4
-rw-r--r--objective-c/test/Slice/escape/Inherit.ice4
-rw-r--r--objective-c/test/Slice/escape/Key.ice4
-rw-r--r--objective-c/test/Slice/escape/Makefile.mk4
-rw-r--r--objective-c/test/include/TestCommon.h4
-rw-r--r--objective-c/test/ios/controller/Classes/AppDelegate.h4
-rw-r--r--objective-c/test/ios/controller/Classes/AppDelegate.m4
-rw-r--r--objective-c/test/ios/controller/Classes/ViewController.h4
-rw-r--r--objective-c/test/ios/controller/Classes/ViewController.m4
-rw-r--r--objective-c/test/ios/controller/Classes/main.m4
-rw-r--r--objective-c/test/ios/controller/Makefile.mk4
306 files changed, 306 insertions, 918 deletions
diff --git a/objective-c/Makefile b/objective-c/Makefile
index c9d486850a1..6310f19cb5c 100644
--- a/objective-c/Makefile
+++ b/objective-c/Makefile
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
top_srcdir := ..
lang_srcdir := $(top_srcdir)/$(notdir $(patsubst %/,%,$(dir $(lastword $(abspath $(MAKEFILE_LIST))))))
diff --git a/objective-c/allTests.py b/objective-c/allTests.py
index 0a12ee46165..5e7b075e397 100755
--- a/objective-c/allTests.py
+++ b/objective-c/allTests.py
@@ -1,9 +1,7 @@
#!/usr/bin/env python
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
import os, sys
sys.path.append(os.path.join(os.path.dirname(__file__), "..", "scripts"))
diff --git a/objective-c/config/Make.rules b/objective-c/config/Make.rules
index cbc6ef8c9f0..d699f2c11a0 100644
--- a/objective-c/config/Make.rules
+++ b/objective-c/config/Make.rules
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
# ----------------------------------------------------------------------
# Don't change anything below this line!
diff --git a/objective-c/config/Make.xcodesdk.rules b/objective-c/config/Make.xcodesdk.rules
index 21993238891..c3f3ef458e1 100644
--- a/objective-c/config/Make.xcodesdk.rules
+++ b/objective-c/config/Make.xcodesdk.rules
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
include $(top_srcdir)/config/Make.xcodesdk.rules
diff --git a/objective-c/include/objc/Glacier2.h b/objective-c/include/objc/Glacier2.h
index 16677646b48..1521fa974c3 100644
--- a/objective-c/include/objc/Glacier2.h
+++ b/objective-c/include/objc/Glacier2.h
@@ -1,7 +1,5 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Glacier2/Glacier2.h>
diff --git a/objective-c/include/objc/Glacier2/Glacier2.h b/objective-c/include/objc/Glacier2/Glacier2.h
index 3903e40da72..f43eb0ff577 100644
--- a/objective-c/include/objc/Glacier2/Glacier2.h
+++ b/objective-c/include/objc/Glacier2/Glacier2.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Glacier2/Metrics.h>
#import <objc/Glacier2/PermissionsVerifier.h>
diff --git a/objective-c/include/objc/Ice.h b/objective-c/include/objc/Ice.h
index c93dbf117ae..ce73a140c40 100644
--- a/objective-c/include/objc/Ice.h
+++ b/objective-c/include/objc/Ice.h
@@ -1,7 +1,5 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Ice.h>
diff --git a/objective-c/include/objc/Ice/Config.h b/objective-c/include/objc/Ice/Config.h
index 46cf20d1623..a8d671b0ae0 100644
--- a/objective-c/include/objc/Ice/Config.h
+++ b/objective-c/include/objc/Ice/Config.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
//
// Some import files we need almost everywhere
diff --git a/objective-c/include/objc/Ice/DispatchInterceptor.h b/objective-c/include/objc/Ice/DispatchInterceptor.h
index e16eed78c55..b4e3898617e 100644
--- a/objective-c/include/objc/Ice/DispatchInterceptor.h
+++ b/objective-c/include/objc/Ice/DispatchInterceptor.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Object.h>
diff --git a/objective-c/include/objc/Ice/Exception.h b/objective-c/include/objc/Ice/Exception.h
index d2839e8531b..0fac5e9f7c6 100644
--- a/objective-c/include/objc/Ice/Exception.h
+++ b/objective-c/include/objc/Ice/Exception.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
diff --git a/objective-c/include/objc/Ice/Format.h b/objective-c/include/objc/Ice/Format.h
index 620e5fcfec4..aa061abb463 100644
--- a/objective-c/include/objc/Ice/Format.h
+++ b/objective-c/include/objc/Ice/Format.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
typedef enum
{
diff --git a/objective-c/include/objc/Ice/Ice.h b/objective-c/include/objc/Ice/Ice.h
index a5c52e64d81..f97395c8057 100644
--- a/objective-c/include/objc/Ice/Ice.h
+++ b/objective-c/include/objc/Ice/Ice.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Communicator.h>
#import <objc/Ice/Connection.h>
diff --git a/objective-c/include/objc/Ice/Initialize.h b/objective-c/include/objc/Ice/Initialize.h
index ee8f288e384..0e157f2f0f7 100644
--- a/objective-c/include/objc/Ice/Initialize.h
+++ b/objective-c/include/objc/Ice/Initialize.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
diff --git a/objective-c/include/objc/Ice/LocalObject.h b/objective-c/include/objc/Ice/LocalObject.h
index e9aeeb6d8cb..acbd5b1482c 100644
--- a/objective-c/include/objc/Ice/LocalObject.h
+++ b/objective-c/include/objc/Ice/LocalObject.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
diff --git a/objective-c/include/objc/Ice/NativePropertiesAdmin.h b/objective-c/include/objc/Ice/NativePropertiesAdmin.h
index 9fe4ca723c5..c466b1098fa 100644
--- a/objective-c/include/objc/Ice/NativePropertiesAdmin.h
+++ b/objective-c/include/objc/Ice/NativePropertiesAdmin.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
#import <objc/Ice/PropertiesAdmin.h>
diff --git a/objective-c/include/objc/Ice/Object.h b/objective-c/include/objc/Ice/Object.h
index e6c83a0cf97..6c47e39d2c3 100644
--- a/objective-c/include/objc/Ice/Object.h
+++ b/objective-c/include/objc/Ice/Object.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
diff --git a/objective-c/include/objc/Ice/ObjectFactory.h b/objective-c/include/objc/Ice/ObjectFactory.h
index 5cb4d7035bd..ab8d4e1a18b 100644
--- a/objective-c/include/objc/Ice/ObjectFactory.h
+++ b/objective-c/include/objc/Ice/ObjectFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
diff --git a/objective-c/include/objc/Ice/Proxy.h b/objective-c/include/objc/Ice/Proxy.h
index 79f54ddbd8a..64ae023b3e1 100644
--- a/objective-c/include/objc/Ice/Proxy.h
+++ b/objective-c/include/objc/Ice/Proxy.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
diff --git a/objective-c/include/objc/Ice/SlicedData.h b/objective-c/include/objc/Ice/SlicedData.h
index 2b8d7b04929..4f9c4bcbc38 100644
--- a/objective-c/include/objc/Ice/SlicedData.h
+++ b/objective-c/include/objc/Ice/SlicedData.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
diff --git a/objective-c/include/objc/Ice/Stream.h b/objective-c/include/objc/Ice/Stream.h
index 25784895358..9942c23e9f4 100644
--- a/objective-c/include/objc/Ice/Stream.h
+++ b/objective-c/include/objc/Ice/Stream.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
#import <objc/Ice/Format.h> // for ICEFormatType
diff --git a/objective-c/include/objc/Ice/ValueFactory.h b/objective-c/include/objc/Ice/ValueFactory.h
index 94737f88382..fde5fc2ec65 100644
--- a/objective-c/include/objc/Ice/ValueFactory.h
+++ b/objective-c/include/objc/Ice/ValueFactory.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Config.h>
#import <objc/Ice/Object.h>
diff --git a/objective-c/include/objc/IceGrid.h b/objective-c/include/objc/IceGrid.h
index cbd968d3e1e..38b69062a8d 100644
--- a/objective-c/include/objc/IceGrid.h
+++ b/objective-c/include/objc/IceGrid.h
@@ -1,7 +1,5 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceGrid/IceGrid.h>
diff --git a/objective-c/include/objc/IceGrid/IceGrid.h b/objective-c/include/objc/IceGrid/IceGrid.h
index ffed308fc2d..b9de5769b38 100644
--- a/objective-c/include/objc/IceGrid/IceGrid.h
+++ b/objective-c/include/objc/IceGrid/IceGrid.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceGrid/Admin.h>
#import <objc/IceGrid/Exception.h>
diff --git a/objective-c/include/objc/IceIAP.h b/objective-c/include/objc/IceIAP.h
index a29446b0382..f409978738f 100644
--- a/objective-c/include/objc/IceIAP.h
+++ b/objective-c/include/objc/IceIAP.h
@@ -1,7 +1,5 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceIAP/IceIAP.h>
diff --git a/objective-c/include/objc/IceIAP/IceIAP.h b/objective-c/include/objc/IceIAP/IceIAP.h
index 4aafd360895..e219d729597 100644
--- a/objective-c/include/objc/IceIAP/IceIAP.h
+++ b/objective-c/include/objc/IceIAP/IceIAP.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceIAP/EndpointInfo.h>
#import <objc/IceIAP/ConnectionInfo.h>
diff --git a/objective-c/include/objc/IceSSL.h b/objective-c/include/objc/IceSSL.h
index b2d0af40fd6..38ac95f7ec0 100644
--- a/objective-c/include/objc/IceSSL.h
+++ b/objective-c/include/objc/IceSSL.h
@@ -1,7 +1,5 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceSSL/IceSSL.h>
diff --git a/objective-c/include/objc/IceSSL/IceSSL.h b/objective-c/include/objc/IceSSL/IceSSL.h
index 64f5489ef1b..8964672f9b4 100644
--- a/objective-c/include/objc/IceSSL/IceSSL.h
+++ b/objective-c/include/objc/IceSSL/IceSSL.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceSSL/EndpointInfo.h>
#import <objc/IceSSL/ConnectionInfo.h>
diff --git a/objective-c/include/objc/IceStorm.h b/objective-c/include/objc/IceStorm.h
index 722b001a963..40bf96040dc 100644
--- a/objective-c/include/objc/IceStorm.h
+++ b/objective-c/include/objc/IceStorm.h
@@ -1,7 +1,5 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceStorm/IceStorm.h>
diff --git a/objective-c/src/Glacier2/Makefile.mk b/objective-c/src/Glacier2/Makefile.mk
index e3fc9b9483d..c757201cdd2 100644
--- a/objective-c/src/Glacier2/Makefile.mk
+++ b/objective-c/src/Glacier2/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = Glacier2ObjC
diff --git a/objective-c/src/Ice/BatchRequestInterceptor.mm b/objective-c/src/Ice/BatchRequestInterceptor.mm
index 6804c9e665c..29333ba5da9 100644
--- a/objective-c/src/Ice/BatchRequestInterceptor.mm
+++ b/objective-c/src/Ice/BatchRequestInterceptor.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <BatchRequestInterceptorI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/BatchRequestInterceptorI.h b/objective-c/src/Ice/BatchRequestInterceptorI.h
index c6dcc33dc01..f63c67c8ad1 100644
--- a/objective-c/src/Ice/BatchRequestInterceptorI.h
+++ b/objective-c/src/Ice/BatchRequestInterceptorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Initialize.h>
diff --git a/objective-c/src/Ice/CommunicatorI.h b/objective-c/src/Ice/CommunicatorI.h
index 96dcaac107d..46fa12f9076 100644
--- a/objective-c/src/Ice/CommunicatorI.h
+++ b/objective-c/src/Ice/CommunicatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Communicator.h>
#import <objc/Ice/LocalObject.h>
diff --git a/objective-c/src/Ice/CommunicatorI.mm b/objective-c/src/Ice/CommunicatorI.mm
index 3cc2ae84397..4c31795b72b 100644
--- a/objective-c/src/Ice/CommunicatorI.mm
+++ b/objective-c/src/Ice/CommunicatorI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <CommunicatorI.h>
#import <PropertiesI.h>
diff --git a/objective-c/src/Ice/ConnectionI.h b/objective-c/src/Ice/ConnectionI.h
index 9c5e183d3aa..adf8700f434 100644
--- a/objective-c/src/Ice/ConnectionI.h
+++ b/objective-c/src/Ice/ConnectionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Connection.h>
#import <objc/Ice/LocalObject.h>
diff --git a/objective-c/src/Ice/ConnectionI.mm b/objective-c/src/Ice/ConnectionI.mm
index ee988953367..24086819e3f 100644
--- a/objective-c/src/Ice/ConnectionI.mm
+++ b/objective-c/src/Ice/ConnectionI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ConnectionI.h>
#import <EndpointI.h>
diff --git a/objective-c/src/Ice/CurrentI.h b/objective-c/src/Ice/CurrentI.h
index e38990e6021..704afa37ef2 100644
--- a/objective-c/src/Ice/CurrentI.h
+++ b/objective-c/src/Ice/CurrentI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Current.h>
diff --git a/objective-c/src/Ice/CurrentI.mm b/objective-c/src/Ice/CurrentI.mm
index c90a70f9914..a7fa74f0874 100644
--- a/objective-c/src/Ice/CurrentI.mm
+++ b/objective-c/src/Ice/CurrentI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <CurrentI.h>
#import <VersionI.h>
diff --git a/objective-c/src/Ice/DispatchInterceptor.m b/objective-c/src/Ice/DispatchInterceptor.m
index 1a945ed175a..f49909c42e1 100644
--- a/objective-c/src/Ice/DispatchInterceptor.m
+++ b/objective-c/src/Ice/DispatchInterceptor.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/DispatchInterceptor.h>
diff --git a/objective-c/src/Ice/Dispatcher.mm b/objective-c/src/Ice/Dispatcher.mm
index a542c8b37fb..52f00911f70 100644
--- a/objective-c/src/Ice/Dispatcher.mm
+++ b/objective-c/src/Ice/Dispatcher.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <DispatcherI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/DispatcherI.h b/objective-c/src/Ice/DispatcherI.h
index cc377f29c2c..6f88bb91abe 100644
--- a/objective-c/src/Ice/DispatcherI.h
+++ b/objective-c/src/Ice/DispatcherI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Initialize.h>
#import <objc/Ice/Connection.h>
diff --git a/objective-c/src/Ice/EndpointI.h b/objective-c/src/Ice/EndpointI.h
index 2a3a117e67a..e0869ac5f4a 100644
--- a/objective-c/src/Ice/EndpointI.h
+++ b/objective-c/src/Ice/EndpointI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Endpoint.h>
#import <objc/Ice/LocalObject.h>
diff --git a/objective-c/src/Ice/EndpointI.mm b/objective-c/src/Ice/EndpointI.mm
index d5b9f49269c..e6eb68d08a1 100644
--- a/objective-c/src/Ice/EndpointI.mm
+++ b/objective-c/src/Ice/EndpointI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <EndpointI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/Exception.mm b/objective-c/src/Ice/Exception.mm
index c2c6e865d8e..38153460bea 100644
--- a/objective-c/src/Ice/Exception.mm
+++ b/objective-c/src/Ice/Exception.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ExceptionI.h>
#import <IdentityI.h>
diff --git a/objective-c/src/Ice/ExceptionI.h b/objective-c/src/Ice/ExceptionI.h
index 41372f49684..d15e56526ed 100644
--- a/objective-c/src/Ice/ExceptionI.h
+++ b/objective-c/src/Ice/ExceptionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Exception.h>
diff --git a/objective-c/src/Ice/IdentityI.h b/objective-c/src/Ice/IdentityI.h
index 34b93e7d935..962886d3790 100644
--- a/objective-c/src/Ice/IdentityI.h
+++ b/objective-c/src/Ice/IdentityI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Identity.h>
diff --git a/objective-c/src/Ice/IdentityI.mm b/objective-c/src/Ice/IdentityI.mm
index 03eb10a07d6..451e14e27bb 100644
--- a/objective-c/src/Ice/IdentityI.mm
+++ b/objective-c/src/Ice/IdentityI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <IdentityI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/ImplicitContextI.h b/objective-c/src/Ice/ImplicitContextI.h
index 525b53e8b7d..cc521ba3025 100644
--- a/objective-c/src/Ice/ImplicitContextI.h
+++ b/objective-c/src/Ice/ImplicitContextI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/ImplicitContext.h>
diff --git a/objective-c/src/Ice/ImplicitContextI.mm b/objective-c/src/Ice/ImplicitContextI.mm
index 35cd463eaae..bcd6749397e 100644
--- a/objective-c/src/Ice/ImplicitContextI.mm
+++ b/objective-c/src/Ice/ImplicitContextI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ImplicitContextI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/Initialize.mm b/objective-c/src/Ice/Initialize.mm
index 85147f13ea0..4a753fc43f8 100644
--- a/objective-c/src/Ice/Initialize.mm
+++ b/objective-c/src/Ice/Initialize.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <InitializeI.h>
#import <PropertiesI.h>
diff --git a/objective-c/src/Ice/InitializeI.h b/objective-c/src/Ice/InitializeI.h
index 92a44458176..dfce2a6586d 100644
--- a/objective-c/src/Ice/InitializeI.h
+++ b/objective-c/src/Ice/InitializeI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Initialize.h>
diff --git a/objective-c/src/Ice/LocalObject.mm b/objective-c/src/Ice/LocalObject.mm
index 9172a3c888f..6d4778681a3 100644
--- a/objective-c/src/Ice/LocalObject.mm
+++ b/objective-c/src/Ice/LocalObject.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <LocalObjectI.h>
diff --git a/objective-c/src/Ice/LocalObjectI.h b/objective-c/src/Ice/LocalObjectI.h
index 3645a66ef0b..f062e39a131 100644
--- a/objective-c/src/Ice/LocalObjectI.h
+++ b/objective-c/src/Ice/LocalObjectI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/LocalObject.h>
diff --git a/objective-c/src/Ice/LoggerI.h b/objective-c/src/Ice/LoggerI.h
index 985feef8a0b..46bc307d371 100644
--- a/objective-c/src/Ice/LoggerI.h
+++ b/objective-c/src/Ice/LoggerI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Logger.h>
diff --git a/objective-c/src/Ice/LoggerI.mm b/objective-c/src/Ice/LoggerI.mm
index ff5a7a0ba91..7129e8ac09f 100644
--- a/objective-c/src/Ice/LoggerI.mm
+++ b/objective-c/src/Ice/LoggerI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <LoggerI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/Makefile.mk b/objective-c/src/Ice/Makefile.mk
index 0e803e77043..67866920915 100644
--- a/objective-c/src/Ice/Makefile.mk
+++ b/objective-c/src/Ice/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceObjC
diff --git a/objective-c/src/Ice/Object.mm b/objective-c/src/Ice/Object.mm
index c29243fe6cc..888c0dfb352 100644
--- a/objective-c/src/Ice/Object.mm
+++ b/objective-c/src/Ice/Object.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ObjectI.h>
#import <StreamI.h>
diff --git a/objective-c/src/Ice/ObjectAdapterI.h b/objective-c/src/Ice/ObjectAdapterI.h
index 7624028bcc3..4f129a47592 100644
--- a/objective-c/src/Ice/ObjectAdapterI.h
+++ b/objective-c/src/Ice/ObjectAdapterI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/ObjectAdapter.h>
diff --git a/objective-c/src/Ice/ObjectAdapterI.mm b/objective-c/src/Ice/ObjectAdapterI.mm
index 1023cf881be..bc26fc42013 100644
--- a/objective-c/src/Ice/ObjectAdapterI.mm
+++ b/objective-c/src/Ice/ObjectAdapterI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ObjectAdapterI.h>
#import <CommunicatorI.h>
diff --git a/objective-c/src/Ice/ObjectI.h b/objective-c/src/Ice/ObjectI.h
index 3a70bd83ee8..3c1019cf1c0 100644
--- a/objective-c/src/Ice/ObjectI.h
+++ b/objective-c/src/Ice/ObjectI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Object.h>
diff --git a/objective-c/src/Ice/PropertiesI.h b/objective-c/src/Ice/PropertiesI.h
index 30a9dad0e82..b83d8eec551 100644
--- a/objective-c/src/Ice/PropertiesI.h
+++ b/objective-c/src/Ice/PropertiesI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Properties.h>
diff --git a/objective-c/src/Ice/PropertiesI.mm b/objective-c/src/Ice/PropertiesI.mm
index 4ba2db5fc0d..451c8d09f53 100644
--- a/objective-c/src/Ice/PropertiesI.mm
+++ b/objective-c/src/Ice/PropertiesI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <PropertiesI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/Proxy.mm b/objective-c/src/Ice/Proxy.mm
index 0782f802d65..fab4ceb94c1 100644
--- a/objective-c/src/Ice/Proxy.mm
+++ b/objective-c/src/Ice/Proxy.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ProxyI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/ProxyI.h b/objective-c/src/Ice/ProxyI.h
index ddf6800398f..2b2ccd31b05 100644
--- a/objective-c/src/Ice/ProxyI.h
+++ b/objective-c/src/Ice/ProxyI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Proxy.h>
diff --git a/objective-c/src/Ice/Request.h b/objective-c/src/Ice/Request.h
index ad8a33ec4d2..965f9ac54ff 100644
--- a/objective-c/src/Ice/Request.h
+++ b/objective-c/src/Ice/Request.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Object.h>
diff --git a/objective-c/src/Ice/Request.m b/objective-c/src/Ice/Request.m
index c8394c20914..66aa87a7795 100644
--- a/objective-c/src/Ice/Request.m
+++ b/objective-c/src/Ice/Request.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <Request.h>
diff --git a/objective-c/src/Ice/SlicedData.mm b/objective-c/src/Ice/SlicedData.mm
index 9e1d58274ef..152443f766d 100644
--- a/objective-c/src/Ice/SlicedData.mm
+++ b/objective-c/src/Ice/SlicedData.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <SlicedDataI.h>
#import <Util.h>
diff --git a/objective-c/src/Ice/SlicedDataI.h b/objective-c/src/Ice/SlicedDataI.h
index da2ce124e0f..24dbdbb6207 100644
--- a/objective-c/src/Ice/SlicedDataI.h
+++ b/objective-c/src/Ice/SlicedDataI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/SlicedData.h>
diff --git a/objective-c/src/Ice/Stream.mm b/objective-c/src/Ice/Stream.mm
index fcef269f775..ec323da9038 100644
--- a/objective-c/src/Ice/Stream.mm
+++ b/objective-c/src/Ice/Stream.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <StreamI.h>
#import <CommunicatorI.h>
diff --git a/objective-c/src/Ice/StreamI.h b/objective-c/src/Ice/StreamI.h
index 7d57d794ca4..e83ab6de1c5 100644
--- a/objective-c/src/Ice/StreamI.h
+++ b/objective-c/src/Ice/StreamI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Stream.h>
#import <objc/Ice/LocalObject.h>
diff --git a/objective-c/src/Ice/Util.h b/objective-c/src/Ice/Util.h
index 040da3621d9..7fce38929ac 100644
--- a/objective-c/src/Ice/Util.h
+++ b/objective-c/src/Ice/Util.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <Foundation/NSException.h>
diff --git a/objective-c/src/Ice/Util.mm b/objective-c/src/Ice/Util.mm
index e384ee7586c..e6fbe9eb33e 100644
--- a/objective-c/src/Ice/Util.mm
+++ b/objective-c/src/Ice/Util.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <Util.h>
#import <ExceptionI.h>
diff --git a/objective-c/src/Ice/ValueFactoryI.h b/objective-c/src/Ice/ValueFactoryI.h
index a4d546a2ffa..edcfd43d177 100644
--- a/objective-c/src/Ice/ValueFactoryI.h
+++ b/objective-c/src/Ice/ValueFactoryI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/ValueFactory.h>
diff --git a/objective-c/src/Ice/ValueFactoryI.mm b/objective-c/src/Ice/ValueFactoryI.mm
index 188f7fdceb7..6faa2fb16a7 100644
--- a/objective-c/src/Ice/ValueFactoryI.mm
+++ b/objective-c/src/Ice/ValueFactoryI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#include <Ice/ObjectFactory.h>
diff --git a/objective-c/src/Ice/VersionI.h b/objective-c/src/Ice/VersionI.h
index f824d6b9c5c..8efc5df7ede 100644
--- a/objective-c/src/Ice/VersionI.h
+++ b/objective-c/src/Ice/VersionI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice/Version.h>
diff --git a/objective-c/src/Ice/VersionI.mm b/objective-c/src/Ice/VersionI.mm
index 0e980de721b..7ccc1780478 100644
--- a/objective-c/src/Ice/VersionI.mm
+++ b/objective-c/src/Ice/VersionI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <VersionI.h>
#import <Util.h>
diff --git a/objective-c/src/IceGrid/Makefile.mk b/objective-c/src/IceGrid/Makefile.mk
index ddef59a5dfc..771ac4ac075 100644
--- a/objective-c/src/IceGrid/Makefile.mk
+++ b/objective-c/src/IceGrid/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceGridObjC
diff --git a/objective-c/src/IceIAP/ConnectionInfoI.mm b/objective-c/src/IceIAP/ConnectionInfoI.mm
index 83cc7e4195d..96e3c9fb504 100644
--- a/objective-c/src/IceIAP/ConnectionInfoI.mm
+++ b/objective-c/src/IceIAP/ConnectionInfoI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceIAP/ConnectionInfo.h>
#import <ConnectionI.h>
diff --git a/objective-c/src/IceIAP/EndpointInfoI.mm b/objective-c/src/IceIAP/EndpointInfoI.mm
index 8e087945a58..289a57320ba 100644
--- a/objective-c/src/IceIAP/EndpointInfoI.mm
+++ b/objective-c/src/IceIAP/EndpointInfoI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceIAP/EndpointInfo.h>
#import <EndpointI.h>
diff --git a/objective-c/src/IceIAP/Makefile.mk b/objective-c/src/IceIAP/Makefile.mk
index 60d264755a8..fe8028c69b0 100644
--- a/objective-c/src/IceIAP/Makefile.mk
+++ b/objective-c/src/IceIAP/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceIAPObjC
diff --git a/objective-c/src/IceSSL/ConnectionInfoI.mm b/objective-c/src/IceSSL/ConnectionInfoI.mm
index 7f3f722f845..2cfbf148da6 100644
--- a/objective-c/src/IceSSL/ConnectionInfoI.mm
+++ b/objective-c/src/IceSSL/ConnectionInfoI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceSSL/ConnectionInfo.h>
#import <ConnectionI.h>
diff --git a/objective-c/src/IceSSL/EndpointInfoI.mm b/objective-c/src/IceSSL/EndpointInfoI.mm
index 9ed99445671..83710be720c 100644
--- a/objective-c/src/IceSSL/EndpointInfoI.mm
+++ b/objective-c/src/IceSSL/EndpointInfoI.mm
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/IceSSL/EndpointInfo.h>
#import <EndpointI.h>
diff --git a/objective-c/src/IceSSL/Makefile.mk b/objective-c/src/IceSSL/Makefile.mk
index d07d2e18b81..a6022f3b07b 100644
--- a/objective-c/src/IceSSL/Makefile.mk
+++ b/objective-c/src/IceSSL/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceSSLObjC
diff --git a/objective-c/src/IceStorm/Makefile.mk b/objective-c/src/IceStorm/Makefile.mk
index 1a376efd407..77b831b9f94 100644
--- a/objective-c/src/IceStorm/Makefile.mk
+++ b/objective-c/src/IceStorm/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = IceStormObjC
diff --git a/objective-c/test/Common/Makefile.mk b/objective-c/test/Common/Makefile.mk
index c938e958430..250d91d79eb 100644
--- a/objective-c/test/Common/Makefile.mk
+++ b/objective-c/test/Common/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_libraries = TestCommonObjC
$(project)_caninstall = no
diff --git a/objective-c/test/Common/TestCommon.m b/objective-c/test/Common/TestCommon.m
index 4b296ee9347..6688a6dc7b7 100644
--- a/objective-c/test/Common/TestCommon.m
+++ b/objective-c/test/Common/TestCommon.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#ifndef TEST_API_EXPORTS
# define TEST_API_EXPORTS
diff --git a/objective-c/test/Ice/acm/ACMTest.ice b/objective-c/test/Ice/acm/ACMTest.ice
index 78e029e4ad7..e85975e78eb 100644
--- a/objective-c/test/Ice/acm/ACMTest.ice
+++ b/objective-c/test/Ice/acm/ACMTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/acm/AllTests.m b/objective-c/test/Ice/acm/AllTests.m
index 9e1ea16f134..2ef6672720d 100644
--- a/objective-c/test/Ice/acm/AllTests.m
+++ b/objective-c/test/Ice/acm/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/acm/Client.m b/objective-c/test/Ice/acm/Client.m
index 372fd6c1f92..67134c0fe62 100644
--- a/objective-c/test/Ice/acm/Client.m
+++ b/objective-c/test/Ice/acm/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/acm/Server.m b/objective-c/test/Ice/acm/Server.m
index a3d0bb188ff..b56990116d3 100644
--- a/objective-c/test/Ice/acm/Server.m
+++ b/objective-c/test/Ice/acm/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <acm/TestI.h>
diff --git a/objective-c/test/Ice/acm/TestI.h b/objective-c/test/Ice/acm/TestI.h
index ce77636ccb4..2789cbdfc25 100644
--- a/objective-c/test/Ice/acm/TestI.h
+++ b/objective-c/test/Ice/acm/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <ACMTest.h>
diff --git a/objective-c/test/Ice/acm/TestI.m b/objective-c/test/Ice/acm/TestI.m
index c689c625db9..855a4d0d8c2 100644
--- a/objective-c/test/Ice/acm/TestI.m
+++ b/objective-c/test/Ice/acm/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <acm/TestI.h>
diff --git a/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice b/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
index 8a6d4e2a796..0b513f17d66 100644
--- a/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
+++ b/objective-c/test/Ice/adapterDeactivation/AdapterDeactivationTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/adapterDeactivation/AllTests.m b/objective-c/test/Ice/adapterDeactivation/AllTests.m
index dc167d65a6d..40813086142 100644
--- a/objective-c/test/Ice/adapterDeactivation/AllTests.m
+++ b/objective-c/test/Ice/adapterDeactivation/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/adapterDeactivation/Client.m b/objective-c/test/Ice/adapterDeactivation/Client.m
index ceff1041c11..96b1c4ff737 100644
--- a/objective-c/test/Ice/adapterDeactivation/Client.m
+++ b/objective-c/test/Ice/adapterDeactivation/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/adapterDeactivation/Collocated.m b/objective-c/test/Ice/adapterDeactivation/Collocated.m
index c79f4b4d1a7..377a24c17d8 100644
--- a/objective-c/test/Ice/adapterDeactivation/Collocated.m
+++ b/objective-c/test/Ice/adapterDeactivation/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <adapterDeactivation/TestI.h>
diff --git a/objective-c/test/Ice/adapterDeactivation/Server.m b/objective-c/test/Ice/adapterDeactivation/Server.m
index 2aeae322f11..265d6e5a54a 100644
--- a/objective-c/test/Ice/adapterDeactivation/Server.m
+++ b/objective-c/test/Ice/adapterDeactivation/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <adapterDeactivation/TestI.h>
diff --git a/objective-c/test/Ice/adapterDeactivation/TestI.h b/objective-c/test/Ice/adapterDeactivation/TestI.h
index 2004607da7e..dd1e2fe3b01 100644
--- a/objective-c/test/Ice/adapterDeactivation/TestI.h
+++ b/objective-c/test/Ice/adapterDeactivation/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <AdapterDeactivationTest.h>
diff --git a/objective-c/test/Ice/adapterDeactivation/TestI.m b/objective-c/test/Ice/adapterDeactivation/TestI.m
index a8ec3341574..09a7858b4c8 100644
--- a/objective-c/test/Ice/adapterDeactivation/TestI.m
+++ b/objective-c/test/Ice/adapterDeactivation/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <adapterDeactivation/TestI.h>
diff --git a/objective-c/test/Ice/admin/AdminTest.ice b/objective-c/test/Ice/admin/AdminTest.ice
index 609e1a425a2..19407fddd56 100644
--- a/objective-c/test/Ice/admin/AdminTest.ice
+++ b/objective-c/test/Ice/admin/AdminTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/admin/AllTests.m b/objective-c/test/Ice/admin/AllTests.m
index f795f2aa5f5..01b223f8ccd 100644
--- a/objective-c/test/Ice/admin/AllTests.m
+++ b/objective-c/test/Ice/admin/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/admin/Client.m b/objective-c/test/Ice/admin/Client.m
index 1b0afe28043..79814e91a32 100644
--- a/objective-c/test/Ice/admin/Client.m
+++ b/objective-c/test/Ice/admin/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/admin/Makefile.mk b/objective-c/test/Ice/admin/Makefile.mk
index 476050682be..102fa7007d1 100644
--- a/objective-c/test/Ice/admin/Makefile.mk
+++ b/objective-c/test/Ice/admin/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = $(test-client-sources) TestI.m
diff --git a/objective-c/test/Ice/admin/Server.m b/objective-c/test/Ice/admin/Server.m
index 52cab232507..cbbf53162a4 100644
--- a/objective-c/test/Ice/admin/Server.m
+++ b/objective-c/test/Ice/admin/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <admin/TestI.h>
diff --git a/objective-c/test/Ice/admin/TestI.h b/objective-c/test/Ice/admin/TestI.h
index 192cf6563d2..808421f4341 100644
--- a/objective-c/test/Ice/admin/TestI.h
+++ b/objective-c/test/Ice/admin/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <AdminTest.h>
diff --git a/objective-c/test/Ice/admin/TestI.m b/objective-c/test/Ice/admin/TestI.m
index 5a43ed171fc..f6709a69af3 100644
--- a/objective-c/test/Ice/admin/TestI.m
+++ b/objective-c/test/Ice/admin/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <admin/TestI.h>
diff --git a/objective-c/test/Ice/ami/AMITest.ice b/objective-c/test/Ice/ami/AMITest.ice
index 5cc9ac5bb4c..c5a6171c89c 100644
--- a/objective-c/test/Ice/ami/AMITest.ice
+++ b/objective-c/test/Ice/ami/AMITest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/ami/AllTests.m b/objective-c/test/Ice/ami/AllTests.m
index 4b6a6d216f8..2c42b7f7864 100644
--- a/objective-c/test/Ice/ami/AllTests.m
+++ b/objective-c/test/Ice/ami/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/ami/Client.m b/objective-c/test/Ice/ami/Client.m
index b6fe2806ac7..2bd873a519a 100644
--- a/objective-c/test/Ice/ami/Client.m
+++ b/objective-c/test/Ice/ami/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/ami/Collocated.m b/objective-c/test/Ice/ami/Collocated.m
index ea99ebd33cb..5620ca440e2 100644
--- a/objective-c/test/Ice/ami/Collocated.m
+++ b/objective-c/test/Ice/ami/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <ami/TestI.h>
diff --git a/objective-c/test/Ice/ami/Server.m b/objective-c/test/Ice/ami/Server.m
index ed4c2e83271..b98c458ea7a 100644
--- a/objective-c/test/Ice/ami/Server.m
+++ b/objective-c/test/Ice/ami/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <ami/TestI.h>
diff --git a/objective-c/test/Ice/ami/TestI.h b/objective-c/test/Ice/ami/TestI.h
index 9fc109d3d86..18052a3359b 100644
--- a/objective-c/test/Ice/ami/TestI.h
+++ b/objective-c/test/Ice/ami/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <AMITest.h>
#import <Foundation/Foundation.h>
diff --git a/objective-c/test/Ice/ami/TestI.m b/objective-c/test/Ice/ami/TestI.m
index 0faed929c71..114cd0d289f 100644
--- a/objective-c/test/Ice/ami/TestI.m
+++ b/objective-c/test/Ice/ami/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
diff --git a/objective-c/test/Ice/binding/AllTests.m b/objective-c/test/Ice/binding/AllTests.m
index 82962830d92..e3df5180c1e 100644
--- a/objective-c/test/Ice/binding/AllTests.m
+++ b/objective-c/test/Ice/binding/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/binding/BindingTest.ice b/objective-c/test/Ice/binding/BindingTest.ice
index 6fa9f03a8eb..c27d60f9ab8 100644
--- a/objective-c/test/Ice/binding/BindingTest.ice
+++ b/objective-c/test/Ice/binding/BindingTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/binding/Client.m b/objective-c/test/Ice/binding/Client.m
index 631b7fe2cda..a68f11acab6 100644
--- a/objective-c/test/Ice/binding/Client.m
+++ b/objective-c/test/Ice/binding/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/binding/Server.m b/objective-c/test/Ice/binding/Server.m
index cabde712b61..3d166dbc447 100644
--- a/objective-c/test/Ice/binding/Server.m
+++ b/objective-c/test/Ice/binding/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <binding/TestI.h>
diff --git a/objective-c/test/Ice/binding/TestI.h b/objective-c/test/Ice/binding/TestI.h
index b523842b0f4..f627562380a 100644
--- a/objective-c/test/Ice/binding/TestI.h
+++ b/objective-c/test/Ice/binding/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <BindingTest.h>
diff --git a/objective-c/test/Ice/binding/TestI.m b/objective-c/test/Ice/binding/TestI.m
index b7c9ca39d84..fc83438029d 100644
--- a/objective-c/test/Ice/binding/TestI.m
+++ b/objective-c/test/Ice/binding/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <binding/TestI.h>
diff --git a/objective-c/test/Ice/defaultServant/Client.m b/objective-c/test/Ice/defaultServant/Client.m
index 12327e203d4..35c462b1a4d 100644
--- a/objective-c/test/Ice/defaultServant/Client.m
+++ b/objective-c/test/Ice/defaultServant/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/defaultServant/DefaultServantTest.ice b/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
index b54d2ed4333..75c0b0dd245 100644
--- a/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
+++ b/objective-c/test/Ice/defaultServant/DefaultServantTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/defaultServant/Makefile.mk b/objective-c/test/Ice/defaultServant/Makefile.mk
index 759f978721c..5dbde60e086 100644
--- a/objective-c/test/Ice/defaultServant/Makefile.mk
+++ b/objective-c/test/Ice/defaultServant/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = DefaultServantTest.ice Client.m TestI.m
diff --git a/objective-c/test/Ice/defaultServant/TestI.h b/objective-c/test/Ice/defaultServant/TestI.h
index 52cbdf49f5b..260061f4879 100644
--- a/objective-c/test/Ice/defaultServant/TestI.h
+++ b/objective-c/test/Ice/defaultServant/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <DefaultServantTest.h>
diff --git a/objective-c/test/Ice/defaultServant/TestI.m b/objective-c/test/Ice/defaultServant/TestI.m
index 2df6142527a..60775c56093 100644
--- a/objective-c/test/Ice/defaultServant/TestI.m
+++ b/objective-c/test/Ice/defaultServant/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <defaultServant/TestI.h>
diff --git a/objective-c/test/Ice/defaultValue/AllTests.m b/objective-c/test/Ice/defaultValue/AllTests.m
index 1849e6efd02..fa05cf5bdaf 100644
--- a/objective-c/test/Ice/defaultValue/AllTests.m
+++ b/objective-c/test/Ice/defaultValue/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/defaultValue/Client.m b/objective-c/test/Ice/defaultValue/Client.m
index b0f78c8b996..bc36e6977ee 100644
--- a/objective-c/test/Ice/defaultValue/Client.m
+++ b/objective-c/test/Ice/defaultValue/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/defaultValue/DefaultValueTest.ice b/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
index eb356932ec3..a183427c9c6 100644
--- a/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
+++ b/objective-c/test/Ice/defaultValue/DefaultValueTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/dispatcher/AllTests.m b/objective-c/test/Ice/dispatcher/AllTests.m
index 0cfe980daf4..f237c0492c8 100644
--- a/objective-c/test/Ice/dispatcher/AllTests.m
+++ b/objective-c/test/Ice/dispatcher/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/dispatcher/Client.m b/objective-c/test/Ice/dispatcher/Client.m
index 39a65a7b22b..f53c690afee 100644
--- a/objective-c/test/Ice/dispatcher/Client.m
+++ b/objective-c/test/Ice/dispatcher/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/dispatcher/Collocated.m b/objective-c/test/Ice/dispatcher/Collocated.m
index 5b8398de9cf..5fda2fcb1e1 100644
--- a/objective-c/test/Ice/dispatcher/Collocated.m
+++ b/objective-c/test/Ice/dispatcher/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <dispatcher/TestI.h>
diff --git a/objective-c/test/Ice/dispatcher/DispatcherTest.ice b/objective-c/test/Ice/dispatcher/DispatcherTest.ice
index 10d311a809c..11ac75f5672 100644
--- a/objective-c/test/Ice/dispatcher/DispatcherTest.ice
+++ b/objective-c/test/Ice/dispatcher/DispatcherTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/dispatcher/Server.m b/objective-c/test/Ice/dispatcher/Server.m
index 0e907d5f4c0..bade4244fbd 100644
--- a/objective-c/test/Ice/dispatcher/Server.m
+++ b/objective-c/test/Ice/dispatcher/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <dispatcher/TestI.h>
diff --git a/objective-c/test/Ice/dispatcher/TestI.h b/objective-c/test/Ice/dispatcher/TestI.h
index 015d961c30e..e3796bc5854 100644
--- a/objective-c/test/Ice/dispatcher/TestI.h
+++ b/objective-c/test/Ice/dispatcher/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <DispatcherTest.h>
diff --git a/objective-c/test/Ice/dispatcher/TestI.m b/objective-c/test/Ice/dispatcher/TestI.m
index 0fcf60b99be..f5a30601c73 100644
--- a/objective-c/test/Ice/dispatcher/TestI.m
+++ b/objective-c/test/Ice/dispatcher/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <dispatcher/TestI.h>
diff --git a/objective-c/test/Ice/enums/AllTests.m b/objective-c/test/Ice/enums/AllTests.m
index 9a5451eefce..dd8c8477a64 100644
--- a/objective-c/test/Ice/enums/AllTests.m
+++ b/objective-c/test/Ice/enums/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/enums/Client.m b/objective-c/test/Ice/enums/Client.m
index fcb78d54728..b944c68fe89 100644
--- a/objective-c/test/Ice/enums/Client.m
+++ b/objective-c/test/Ice/enums/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/enums/EnumTest.ice b/objective-c/test/Ice/enums/EnumTest.ice
index ac7826e806f..d9bb1852092 100644
--- a/objective-c/test/Ice/enums/EnumTest.ice
+++ b/objective-c/test/Ice/enums/EnumTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/enums/Server.m b/objective-c/test/Ice/enums/Server.m
index 5bd98c67f8b..e5dd6f9a4ef 100644
--- a/objective-c/test/Ice/enums/Server.m
+++ b/objective-c/test/Ice/enums/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <enums/TestI.h>
diff --git a/objective-c/test/Ice/enums/TestI.h b/objective-c/test/Ice/enums/TestI.h
index 6c5eb206032..e3995464d82 100644
--- a/objective-c/test/Ice/enums/TestI.h
+++ b/objective-c/test/Ice/enums/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <EnumTest.h>
diff --git a/objective-c/test/Ice/enums/TestI.m b/objective-c/test/Ice/enums/TestI.m
index 3f38e121f50..bed615ac2ce 100644
--- a/objective-c/test/Ice/enums/TestI.m
+++ b/objective-c/test/Ice/enums/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <enums/TestI.h>
diff --git a/objective-c/test/Ice/exceptions/AllTests.m b/objective-c/test/Ice/exceptions/AllTests.m
index 7b7114b2ff0..18eebfae3db 100644
--- a/objective-c/test/Ice/exceptions/AllTests.m
+++ b/objective-c/test/Ice/exceptions/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/exceptions/Client.m b/objective-c/test/Ice/exceptions/Client.m
index a7a999e7578..d3d28319e1b 100644
--- a/objective-c/test/Ice/exceptions/Client.m
+++ b/objective-c/test/Ice/exceptions/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/exceptions/Collocated.m b/objective-c/test/Ice/exceptions/Collocated.m
index 05acbff0f56..974e47519af 100644
--- a/objective-c/test/Ice/exceptions/Collocated.m
+++ b/objective-c/test/Ice/exceptions/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <exceptions/TestI.h>
diff --git a/objective-c/test/Ice/exceptions/ExceptionsTest.ice b/objective-c/test/Ice/exceptions/ExceptionsTest.ice
index ad41e5fae68..034500b62d0 100644
--- a/objective-c/test/Ice/exceptions/ExceptionsTest.ice
+++ b/objective-c/test/Ice/exceptions/ExceptionsTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/exceptions/Server.m b/objective-c/test/Ice/exceptions/Server.m
index 4eb8fa27e3c..270f701dbb0 100644
--- a/objective-c/test/Ice/exceptions/Server.m
+++ b/objective-c/test/Ice/exceptions/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <exceptions/TestI.h>
diff --git a/objective-c/test/Ice/exceptions/TestI.h b/objective-c/test/Ice/exceptions/TestI.h
index 0f0c017d3a1..4b3518ccea8 100644
--- a/objective-c/test/Ice/exceptions/TestI.h
+++ b/objective-c/test/Ice/exceptions/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ExceptionsTest.h>
diff --git a/objective-c/test/Ice/exceptions/TestI.m b/objective-c/test/Ice/exceptions/TestI.m
index c11723333ac..17463a7d8d4 100644
--- a/objective-c/test/Ice/exceptions/TestI.m
+++ b/objective-c/test/Ice/exceptions/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
diff --git a/objective-c/test/Ice/facets/AllTests.m b/objective-c/test/Ice/facets/AllTests.m
index 062b322183f..51423814953 100644
--- a/objective-c/test/Ice/facets/AllTests.m
+++ b/objective-c/test/Ice/facets/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/facets/Client.m b/objective-c/test/Ice/facets/Client.m
index 097dc3f2b23..e999f3b7685 100644
--- a/objective-c/test/Ice/facets/Client.m
+++ b/objective-c/test/Ice/facets/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/facets/Collocated.m b/objective-c/test/Ice/facets/Collocated.m
index b48e031b9d0..4c0fd744203 100644
--- a/objective-c/test/Ice/facets/Collocated.m
+++ b/objective-c/test/Ice/facets/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <facets/TestI.h>
diff --git a/objective-c/test/Ice/facets/FacetsTest.ice b/objective-c/test/Ice/facets/FacetsTest.ice
index b06b71c8d80..142a188f0b2 100644
--- a/objective-c/test/Ice/facets/FacetsTest.ice
+++ b/objective-c/test/Ice/facets/FacetsTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/facets/Server.m b/objective-c/test/Ice/facets/Server.m
index 402368d32b7..6284dc8425b 100644
--- a/objective-c/test/Ice/facets/Server.m
+++ b/objective-c/test/Ice/facets/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <facets/TestI.h>
diff --git a/objective-c/test/Ice/facets/TestI.h b/objective-c/test/Ice/facets/TestI.h
index 7f5fa67f4e3..bba2f5cd96c 100644
--- a/objective-c/test/Ice/facets/TestI.h
+++ b/objective-c/test/Ice/facets/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <FacetsTest.h>
diff --git a/objective-c/test/Ice/facets/TestI.m b/objective-c/test/Ice/facets/TestI.m
index 4887a59f518..25a427f2ecf 100644
--- a/objective-c/test/Ice/facets/TestI.m
+++ b/objective-c/test/Ice/facets/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <facets/TestI.h>
diff --git a/objective-c/test/Ice/faultTolerance/AllTests.m b/objective-c/test/Ice/faultTolerance/AllTests.m
index e650dde3593..ffd6eef9997 100644
--- a/objective-c/test/Ice/faultTolerance/AllTests.m
+++ b/objective-c/test/Ice/faultTolerance/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/faultTolerance/Client.m b/objective-c/test/Ice/faultTolerance/Client.m
index c60d1ae936c..52008df27d0 100644
--- a/objective-c/test/Ice/faultTolerance/Client.m
+++ b/objective-c/test/Ice/faultTolerance/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice b/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice
index 7d155bcd297..72226e6ac2a 100644
--- a/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice
+++ b/objective-c/test/Ice/faultTolerance/FaultToleranceTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/faultTolerance/Server.m b/objective-c/test/Ice/faultTolerance/Server.m
index a2970edbd6c..acc377f03e2 100644
--- a/objective-c/test/Ice/faultTolerance/Server.m
+++ b/objective-c/test/Ice/faultTolerance/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <faultTolerance/TestI.h>
diff --git a/objective-c/test/Ice/faultTolerance/TestI.h b/objective-c/test/Ice/faultTolerance/TestI.h
index 3933ca5334b..e732ef49ffc 100644
--- a/objective-c/test/Ice/faultTolerance/TestI.h
+++ b/objective-c/test/Ice/faultTolerance/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <FaultToleranceTest.h>
diff --git a/objective-c/test/Ice/faultTolerance/TestI.m b/objective-c/test/Ice/faultTolerance/TestI.m
index 5ffd542a0cf..072967c85b9 100644
--- a/objective-c/test/Ice/faultTolerance/TestI.m
+++ b/objective-c/test/Ice/faultTolerance/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <faultTolerance/TestI.h>
diff --git a/objective-c/test/Ice/hash/AllTests.m b/objective-c/test/Ice/hash/AllTests.m
index d331d148e55..c5da614c8b4 100644
--- a/objective-c/test/Ice/hash/AllTests.m
+++ b/objective-c/test/Ice/hash/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/hash/Client.m b/objective-c/test/Ice/hash/Client.m
index 13c33a31920..867593665b6 100644
--- a/objective-c/test/Ice/hash/Client.m
+++ b/objective-c/test/Ice/hash/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/hash/HashTest.ice b/objective-c/test/Ice/hash/HashTest.ice
index 0e7f2d1a75f..d7db74c9bf6 100644
--- a/objective-c/test/Ice/hash/HashTest.ice
+++ b/objective-c/test/Ice/hash/HashTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/hold/AllTests.m b/objective-c/test/Ice/hold/AllTests.m
index f50950657c9..0d7398c0b94 100644
--- a/objective-c/test/Ice/hold/AllTests.m
+++ b/objective-c/test/Ice/hold/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/hold/Client.m b/objective-c/test/Ice/hold/Client.m
index a2444584648..326434dbc74 100644
--- a/objective-c/test/Ice/hold/Client.m
+++ b/objective-c/test/Ice/hold/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/hold/HoldTest.ice b/objective-c/test/Ice/hold/HoldTest.ice
index 215f4d0f61b..d8201707e31 100644
--- a/objective-c/test/Ice/hold/HoldTest.ice
+++ b/objective-c/test/Ice/hold/HoldTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/hold/Server.m b/objective-c/test/Ice/hold/Server.m
index 8d904d0c9d5..df331f5526d 100644
--- a/objective-c/test/Ice/hold/Server.m
+++ b/objective-c/test/Ice/hold/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <hold/TestI.h>
diff --git a/objective-c/test/Ice/hold/TestI.h b/objective-c/test/Ice/hold/TestI.h
index 92c038ffb6b..aaae54597b0 100644
--- a/objective-c/test/Ice/hold/TestI.h
+++ b/objective-c/test/Ice/hold/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <HoldTest.h>
diff --git a/objective-c/test/Ice/hold/TestI.m b/objective-c/test/Ice/hold/TestI.m
index 430b60a2a77..0213fb0d165 100644
--- a/objective-c/test/Ice/hold/TestI.m
+++ b/objective-c/test/Ice/hold/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <hold/TestI.h>
diff --git a/objective-c/test/Ice/info/AllTests.m b/objective-c/test/Ice/info/AllTests.m
index ad67f5c032c..162998a35ac 100644
--- a/objective-c/test/Ice/info/AllTests.m
+++ b/objective-c/test/Ice/info/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <objc/IceSSL.h>
diff --git a/objective-c/test/Ice/info/Client.m b/objective-c/test/Ice/info/Client.m
index 447252e08c6..88dade0c588 100644
--- a/objective-c/test/Ice/info/Client.m
+++ b/objective-c/test/Ice/info/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/info/InfoTest.ice b/objective-c/test/Ice/info/InfoTest.ice
index 4e880120e8f..55809f33309 100644
--- a/objective-c/test/Ice/info/InfoTest.ice
+++ b/objective-c/test/Ice/info/InfoTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/info/Makefile.mk b/objective-c/test/Ice/info/Makefile.mk
index 618f645cdba..99ab531d5c2 100644
--- a/objective-c/test/Ice/info/Makefile.mk
+++ b/objective-c/test/Ice/info/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = IceSSLObjC IceObjC TestCommonObjC
diff --git a/objective-c/test/Ice/info/Server.m b/objective-c/test/Ice/info/Server.m
index f17e466efc3..6b392f9313e 100644
--- a/objective-c/test/Ice/info/Server.m
+++ b/objective-c/test/Ice/info/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <info/TestI.h>
diff --git a/objective-c/test/Ice/info/TestI.h b/objective-c/test/Ice/info/TestI.h
index adca206bdfe..187378dc634 100644
--- a/objective-c/test/Ice/info/TestI.h
+++ b/objective-c/test/Ice/info/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <InfoTest.h>
diff --git a/objective-c/test/Ice/info/TestI.m b/objective-c/test/Ice/info/TestI.m
index 0c6453921bc..799c9fd3a2f 100644
--- a/objective-c/test/Ice/info/TestI.m
+++ b/objective-c/test/Ice/info/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <objc/IceSSL.h>
diff --git a/objective-c/test/Ice/inheritance/AllTests.m b/objective-c/test/Ice/inheritance/AllTests.m
index 5d2d70f95d7..3c062301488 100644
--- a/objective-c/test/Ice/inheritance/AllTests.m
+++ b/objective-c/test/Ice/inheritance/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/inheritance/Client.m b/objective-c/test/Ice/inheritance/Client.m
index d37812e6681..976550abc45 100644
--- a/objective-c/test/Ice/inheritance/Client.m
+++ b/objective-c/test/Ice/inheritance/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/inheritance/Collocated.m b/objective-c/test/Ice/inheritance/Collocated.m
index 7b23a9bec71..58f8e3b6d6c 100644
--- a/objective-c/test/Ice/inheritance/Collocated.m
+++ b/objective-c/test/Ice/inheritance/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <inheritance/TestI.h>
diff --git a/objective-c/test/Ice/inheritance/InheritanceTest.ice b/objective-c/test/Ice/inheritance/InheritanceTest.ice
index 091bdbeb90f..98260b45c2c 100644
--- a/objective-c/test/Ice/inheritance/InheritanceTest.ice
+++ b/objective-c/test/Ice/inheritance/InheritanceTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/inheritance/Server.m b/objective-c/test/Ice/inheritance/Server.m
index c43522be8a8..6ad2008acf8 100644
--- a/objective-c/test/Ice/inheritance/Server.m
+++ b/objective-c/test/Ice/inheritance/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <inheritance/TestI.h>
diff --git a/objective-c/test/Ice/inheritance/TestI.h b/objective-c/test/Ice/inheritance/TestI.h
index 588e5bdb965..2d519db39ec 100644
--- a/objective-c/test/Ice/inheritance/TestI.h
+++ b/objective-c/test/Ice/inheritance/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <InheritanceTest.h>
diff --git a/objective-c/test/Ice/inheritance/TestI.m b/objective-c/test/Ice/inheritance/TestI.m
index ea758e8fe08..b6d1bd77dd6 100644
--- a/objective-c/test/Ice/inheritance/TestI.m
+++ b/objective-c/test/Ice/inheritance/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <inheritance/TestI.h>
diff --git a/objective-c/test/Ice/interceptor/Client.m b/objective-c/test/Ice/interceptor/Client.m
index 8b35fbc66ff..2a17900711c 100644
--- a/objective-c/test/Ice/interceptor/Client.m
+++ b/objective-c/test/Ice/interceptor/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/interceptor/InterceptorI.h b/objective-c/test/Ice/interceptor/InterceptorI.h
index 0ecdc20a5af..44efafc937d 100644
--- a/objective-c/test/Ice/interceptor/InterceptorI.h
+++ b/objective-c/test/Ice/interceptor/InterceptorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
diff --git a/objective-c/test/Ice/interceptor/InterceptorI.m b/objective-c/test/Ice/interceptor/InterceptorI.m
index acb8407a512..f1b0a6f68b6 100644
--- a/objective-c/test/Ice/interceptor/InterceptorI.m
+++ b/objective-c/test/Ice/interceptor/InterceptorI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <interceptor/InterceptorI.h>
#import <InterceptorTest.h>
diff --git a/objective-c/test/Ice/interceptor/InterceptorTest.ice b/objective-c/test/Ice/interceptor/InterceptorTest.ice
index cafdecf8e8b..c4a3b9ec41b 100644
--- a/objective-c/test/Ice/interceptor/InterceptorTest.ice
+++ b/objective-c/test/Ice/interceptor/InterceptorTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/interceptor/Makefile.mk b/objective-c/test/Ice/interceptor/Makefile.mk
index fb1019d6e53..b20e451f889 100644
--- a/objective-c/test/Ice/interceptor/Makefile.mk
+++ b/objective-c/test/Ice/interceptor/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = InterceptorTest.ice Client.m InterceptorI.m MyObjectI.m
diff --git a/objective-c/test/Ice/interceptor/MyObjectI.h b/objective-c/test/Ice/interceptor/MyObjectI.h
index db9e140689f..8f0fb03a782 100644
--- a/objective-c/test/Ice/interceptor/MyObjectI.h
+++ b/objective-c/test/Ice/interceptor/MyObjectI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <InterceptorTest.h>
diff --git a/objective-c/test/Ice/interceptor/MyObjectI.m b/objective-c/test/Ice/interceptor/MyObjectI.m
index 0ebf0677285..c9f4750dc6e 100644
--- a/objective-c/test/Ice/interceptor/MyObjectI.m
+++ b/objective-c/test/Ice/interceptor/MyObjectI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <interceptor/MyObjectI.h>
diff --git a/objective-c/test/Ice/invoke/AllTests.m b/objective-c/test/Ice/invoke/AllTests.m
index 8e77566e97e..92d1962e6bb 100644
--- a/objective-c/test/Ice/invoke/AllTests.m
+++ b/objective-c/test/Ice/invoke/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/invoke/BlobjectI.h b/objective-c/test/Ice/invoke/BlobjectI.h
index 678828c5066..887387f7688 100644
--- a/objective-c/test/Ice/invoke/BlobjectI.h
+++ b/objective-c/test/Ice/invoke/BlobjectI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <InvokeTest.h>
diff --git a/objective-c/test/Ice/invoke/BlobjectI.m b/objective-c/test/Ice/invoke/BlobjectI.m
index ad1749fe752..20723bbeb24 100644
--- a/objective-c/test/Ice/invoke/BlobjectI.m
+++ b/objective-c/test/Ice/invoke/BlobjectI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <invoke/BlobjectI.h>
diff --git a/objective-c/test/Ice/invoke/Client.m b/objective-c/test/Ice/invoke/Client.m
index a2a8153777e..e2f109f1e44 100644
--- a/objective-c/test/Ice/invoke/Client.m
+++ b/objective-c/test/Ice/invoke/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/invoke/InvokeTest.ice b/objective-c/test/Ice/invoke/InvokeTest.ice
index e907ae55fa2..399f0a023cc 100644
--- a/objective-c/test/Ice/invoke/InvokeTest.ice
+++ b/objective-c/test/Ice/invoke/InvokeTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/invoke/Makefile.mk b/objective-c/test/Ice/invoke/Makefile.mk
index ae8f5c58b7e..f16625cc4a3 100644
--- a/objective-c/test/Ice/invoke/Makefile.mk
+++ b/objective-c/test/Ice/invoke/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_server_sources = InvokeTest.ice Server.m BlobjectI.m
diff --git a/objective-c/test/Ice/invoke/Server.m b/objective-c/test/Ice/invoke/Server.m
index 9205bb5f58b..7f3d065095c 100644
--- a/objective-c/test/Ice/invoke/Server.m
+++ b/objective-c/test/Ice/invoke/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <invoke/BlobjectI.h>
diff --git a/objective-c/test/Ice/location/AllTests.m b/objective-c/test/Ice/location/AllTests.m
index 72dbbf7110e..eeaedeecb46 100644
--- a/objective-c/test/Ice/location/AllTests.m
+++ b/objective-c/test/Ice/location/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/location/Client.m b/objective-c/test/Ice/location/Client.m
index a5f758be7fc..d3a9d1160ed 100644
--- a/objective-c/test/Ice/location/Client.m
+++ b/objective-c/test/Ice/location/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/location/LocationTest.ice b/objective-c/test/Ice/location/LocationTest.ice
index 5fc9b8a42fc..0dc8c1541c5 100644
--- a/objective-c/test/Ice/location/LocationTest.ice
+++ b/objective-c/test/Ice/location/LocationTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/location/Makefile.mk b/objective-c/test/Ice/location/Makefile.mk
index ddc0d860a9b..e3bce71c599 100644
--- a/objective-c/test/Ice/location/Makefile.mk
+++ b/objective-c/test/Ice/location/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_server_sources = LocationTest.ice ServerLocator.m Server.m TestI.m
diff --git a/objective-c/test/Ice/location/Server.m b/objective-c/test/Ice/location/Server.m
index 8fe129f5b16..8c0424f8482 100644
--- a/objective-c/test/Ice/location/Server.m
+++ b/objective-c/test/Ice/location/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <location/ServerLocator.h>
diff --git a/objective-c/test/Ice/location/ServerLocator.h b/objective-c/test/Ice/location/ServerLocator.h
index 457dda893b7..638690c6c60 100644
--- a/objective-c/test/Ice/location/ServerLocator.h
+++ b/objective-c/test/Ice/location/ServerLocator.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <LocationTest.h>
diff --git a/objective-c/test/Ice/location/ServerLocator.m b/objective-c/test/Ice/location/ServerLocator.m
index 1224d92fe50..82771e2eee9 100644
--- a/objective-c/test/Ice/location/ServerLocator.m
+++ b/objective-c/test/Ice/location/ServerLocator.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <location/ServerLocator.h>
diff --git a/objective-c/test/Ice/location/TestI.h b/objective-c/test/Ice/location/TestI.h
index 40b64a5d508..fa7ef585b86 100644
--- a/objective-c/test/Ice/location/TestI.h
+++ b/objective-c/test/Ice/location/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <LocationTest.h>
#import <location/ServerLocator.h>
diff --git a/objective-c/test/Ice/location/TestI.m b/objective-c/test/Ice/location/TestI.m
index 7db5e15a8cd..207e9f0c7df 100644
--- a/objective-c/test/Ice/location/TestI.m
+++ b/objective-c/test/Ice/location/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <location/TestI.h>
diff --git a/objective-c/test/Ice/metrics/AllTests.m b/objective-c/test/Ice/metrics/AllTests.m
index fd602d76ccf..6e4049afb62 100644
--- a/objective-c/test/Ice/metrics/AllTests.m
+++ b/objective-c/test/Ice/metrics/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/metrics/Client.m b/objective-c/test/Ice/metrics/Client.m
index 9b0635d3f06..973668e09d0 100644
--- a/objective-c/test/Ice/metrics/Client.m
+++ b/objective-c/test/Ice/metrics/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/metrics/MetricsTest.ice b/objective-c/test/Ice/metrics/MetricsTest.ice
index 52409ed4562..2f141f178fc 100644
--- a/objective-c/test/Ice/metrics/MetricsTest.ice
+++ b/objective-c/test/Ice/metrics/MetricsTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/metrics/Server.m b/objective-c/test/Ice/metrics/Server.m
index 1b044cc470c..d1bd89c9630 100644
--- a/objective-c/test/Ice/metrics/Server.m
+++ b/objective-c/test/Ice/metrics/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <metrics/TestI.h>
diff --git a/objective-c/test/Ice/metrics/TestI.h b/objective-c/test/Ice/metrics/TestI.h
index 84b71cff25d..9fab97c9c8a 100644
--- a/objective-c/test/Ice/metrics/TestI.h
+++ b/objective-c/test/Ice/metrics/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <MetricsTest.h>
diff --git a/objective-c/test/Ice/metrics/TestI.m b/objective-c/test/Ice/metrics/TestI.m
index a5e4ea99320..3df61e059b3 100644
--- a/objective-c/test/Ice/metrics/TestI.m
+++ b/objective-c/test/Ice/metrics/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <metrics/TestI.h>
diff --git a/objective-c/test/Ice/objects/AllTests.m b/objective-c/test/Ice/objects/AllTests.m
index d2efa268eab..3e148570879 100644
--- a/objective-c/test/Ice/objects/AllTests.m
+++ b/objective-c/test/Ice/objects/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/objects/Client.m b/objective-c/test/Ice/objects/Client.m
index 4e4cd6cfe6a..fc3354caec1 100644
--- a/objective-c/test/Ice/objects/Client.m
+++ b/objective-c/test/Ice/objects/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/objects/Collocated.m b/objective-c/test/Ice/objects/Collocated.m
index 29547d06192..da6cdb14706 100644
--- a/objective-c/test/Ice/objects/Collocated.m
+++ b/objective-c/test/Ice/objects/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/objects/Makefile.mk b/objective-c/test/Ice/objects/Makefile.mk
index 8551c8ca7ac..391c8265c3b 100644
--- a/objective-c/test/Ice/objects/Makefile.mk
+++ b/objective-c/test/Ice/objects/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_sliceflags := -I$(test)
$(test)_client_sources = Client.m ObjectsTest.ice ObjectsDerived.ice ObjectsDerivedEx.ice TestI.m AllTests.m
diff --git a/objective-c/test/Ice/objects/ObjectsDerived.ice b/objective-c/test/Ice/objects/ObjectsDerived.ice
index 66dcf2735f6..8dd4a12e6f3 100644
--- a/objective-c/test/Ice/objects/ObjectsDerived.ice
+++ b/objective-c/test/Ice/objects/ObjectsDerived.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/objects/ObjectsDerivedEx.ice b/objective-c/test/Ice/objects/ObjectsDerivedEx.ice
index a9d53faf4ad..53cd6c434fe 100644
--- a/objective-c/test/Ice/objects/ObjectsDerivedEx.ice
+++ b/objective-c/test/Ice/objects/ObjectsDerivedEx.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/objects/ObjectsTest.ice b/objective-c/test/Ice/objects/ObjectsTest.ice
index 0c24ea78bee..d7bfeabc1f0 100644
--- a/objective-c/test/Ice/objects/ObjectsTest.ice
+++ b/objective-c/test/Ice/objects/ObjectsTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/objects/Server.m b/objective-c/test/Ice/objects/Server.m
index fd52e3a39b0..1d2e0bf9061 100644
--- a/objective-c/test/Ice/objects/Server.m
+++ b/objective-c/test/Ice/objects/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/objects/TestI.h b/objective-c/test/Ice/objects/TestI.h
index 6310e9e2ebd..c39c241acae 100644
--- a/objective-c/test/Ice/objects/TestI.h
+++ b/objective-c/test/Ice/objects/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ObjectsTest.h>
diff --git a/objective-c/test/Ice/objects/TestI.m b/objective-c/test/Ice/objects/TestI.m
index d535c3e2e70..5b86e3e94be 100644
--- a/objective-c/test/Ice/objects/TestI.m
+++ b/objective-c/test/Ice/objects/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <objects/TestI.h>
diff --git a/objective-c/test/Ice/objects/TestIntfI.m b/objective-c/test/Ice/objects/TestIntfI.m
index f8ab7d06470..4b270add294 100644
--- a/objective-c/test/Ice/objects/TestIntfI.m
+++ b/objective-c/test/Ice/objects/TestIntfI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <objects/TestI.h>
diff --git a/objective-c/test/Ice/operations/AllTests.m b/objective-c/test/Ice/operations/AllTests.m
index f24325bf098..9a11a26fb63 100644
--- a/objective-c/test/Ice/operations/AllTests.m
+++ b/objective-c/test/Ice/operations/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/operations/BatchOneways.m b/objective-c/test/Ice/operations/BatchOneways.m
index b6dc386eeee..9ff460b3f25 100644
--- a/objective-c/test/Ice/operations/BatchOneways.m
+++ b/objective-c/test/Ice/operations/BatchOneways.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/operations/BatchOnewaysAMI.m b/objective-c/test/Ice/operations/BatchOnewaysAMI.m
index c7ee456a290..c5e50adee5f 100644
--- a/objective-c/test/Ice/operations/BatchOnewaysAMI.m
+++ b/objective-c/test/Ice/operations/BatchOnewaysAMI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/operations/Client.m b/objective-c/test/Ice/operations/Client.m
index cefecaa3029..588f6b7ea5f 100644
--- a/objective-c/test/Ice/operations/Client.m
+++ b/objective-c/test/Ice/operations/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/operations/Collocated.m b/objective-c/test/Ice/operations/Collocated.m
index 76fc5330bb2..d4c66690c47 100644
--- a/objective-c/test/Ice/operations/Collocated.m
+++ b/objective-c/test/Ice/operations/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <operations/TestI.h>
diff --git a/objective-c/test/Ice/operations/Makefile.mk b/objective-c/test/Ice/operations/Makefile.mk
index 2d86854124a..37304ea597d 100644
--- a/objective-c/test/Ice/operations/Makefile.mk
+++ b/objective-c/test/Ice/operations/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = $(test-client-sources) \
Twoways.m \
diff --git a/objective-c/test/Ice/operations/Oneways.m b/objective-c/test/Ice/operations/Oneways.m
index e8629918971..bf02d227efc 100644
--- a/objective-c/test/Ice/operations/Oneways.m
+++ b/objective-c/test/Ice/operations/Oneways.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/operations/OnewaysAMI.m b/objective-c/test/Ice/operations/OnewaysAMI.m
index 50b5d48ee53..20242f76aec 100644
--- a/objective-c/test/Ice/operations/OnewaysAMI.m
+++ b/objective-c/test/Ice/operations/OnewaysAMI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/operations/OperationsTest.ice b/objective-c/test/Ice/operations/OperationsTest.ice
index 6d412974420..7e5ddbce33b 100644
--- a/objective-c/test/Ice/operations/OperationsTest.ice
+++ b/objective-c/test/Ice/operations/OperationsTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/operations/Server.m b/objective-c/test/Ice/operations/Server.m
index fde08ca833b..d4baa538ba0 100644
--- a/objective-c/test/Ice/operations/Server.m
+++ b/objective-c/test/Ice/operations/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <operations/TestI.h>
diff --git a/objective-c/test/Ice/operations/TestI.h b/objective-c/test/Ice/operations/TestI.h
index 46b77ca8620..2609c1bb03f 100644
--- a/objective-c/test/Ice/operations/TestI.h
+++ b/objective-c/test/Ice/operations/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <OperationsTest.h>
#import <Foundation/Foundation.h>
diff --git a/objective-c/test/Ice/operations/TestI.m b/objective-c/test/Ice/operations/TestI.m
index 8a3e2fe0397..8c279ee4069 100644
--- a/objective-c/test/Ice/operations/TestI.m
+++ b/objective-c/test/Ice/operations/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
diff --git a/objective-c/test/Ice/operations/Twoways.m b/objective-c/test/Ice/operations/Twoways.m
index e9023381d42..8c4177e7551 100644
--- a/objective-c/test/Ice/operations/Twoways.m
+++ b/objective-c/test/Ice/operations/Twoways.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/operations/TwowaysAMI.m b/objective-c/test/Ice/operations/TwowaysAMI.m
index 17f5953f180..1a111534990 100644
--- a/objective-c/test/Ice/operations/TwowaysAMI.m
+++ b/objective-c/test/Ice/operations/TwowaysAMI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/optional/AllTests.m b/objective-c/test/Ice/optional/AllTests.m
index c2f8d434323..7e561e97a16 100644
--- a/objective-c/test/Ice/optional/AllTests.m
+++ b/objective-c/test/Ice/optional/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/optional/Client.m b/objective-c/test/Ice/optional/Client.m
index b22bcab4a83..9712a99604e 100644
--- a/objective-c/test/Ice/optional/Client.m
+++ b/objective-c/test/Ice/optional/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/optional/OptionalTest.ice b/objective-c/test/Ice/optional/OptionalTest.ice
index 8221a446576..a70e547608d 100644
--- a/objective-c/test/Ice/optional/OptionalTest.ice
+++ b/objective-c/test/Ice/optional/OptionalTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/optional/Server.m b/objective-c/test/Ice/optional/Server.m
index 6da716d647f..9f9b9ccd75d 100644
--- a/objective-c/test/Ice/optional/Server.m
+++ b/objective-c/test/Ice/optional/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <optional/TestI.h>
diff --git a/objective-c/test/Ice/optional/TestI.h b/objective-c/test/Ice/optional/TestI.h
index ae1bba8158e..670738b077b 100644
--- a/objective-c/test/Ice/optional/TestI.h
+++ b/objective-c/test/Ice/optional/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <OptionalTest.h>
diff --git a/objective-c/test/Ice/optional/TestI.m b/objective-c/test/Ice/optional/TestI.m
index a2532b49f64..70ead6565ec 100644
--- a/objective-c/test/Ice/optional/TestI.m
+++ b/objective-c/test/Ice/optional/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <optional/TestI.h>
#import <objc/Ice.h>
diff --git a/objective-c/test/Ice/proxy/AllTests.m b/objective-c/test/Ice/proxy/AllTests.m
index 6a18f8e30d3..50fc2cbb7bd 100644
--- a/objective-c/test/Ice/proxy/AllTests.m
+++ b/objective-c/test/Ice/proxy/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/proxy/Client.m b/objective-c/test/Ice/proxy/Client.m
index c3b9fc0c099..d23f3923f2a 100644
--- a/objective-c/test/Ice/proxy/Client.m
+++ b/objective-c/test/Ice/proxy/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/proxy/Collocated.m b/objective-c/test/Ice/proxy/Collocated.m
index 71ae39e23ca..57bdfc5503f 100644
--- a/objective-c/test/Ice/proxy/Collocated.m
+++ b/objective-c/test/Ice/proxy/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <proxy/TestI.h>
diff --git a/objective-c/test/Ice/proxy/ProxyTest.ice b/objective-c/test/Ice/proxy/ProxyTest.ice
index 7f3a1c88296..e451bd78e2e 100644
--- a/objective-c/test/Ice/proxy/ProxyTest.ice
+++ b/objective-c/test/Ice/proxy/ProxyTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/proxy/Server.m b/objective-c/test/Ice/proxy/Server.m
index 88e5880a517..6343be0a91c 100644
--- a/objective-c/test/Ice/proxy/Server.m
+++ b/objective-c/test/Ice/proxy/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <proxy/TestI.h>
diff --git a/objective-c/test/Ice/proxy/TestI.h b/objective-c/test/Ice/proxy/TestI.h
index 2cadb98a9f4..c61700cda95 100644
--- a/objective-c/test/Ice/proxy/TestI.h
+++ b/objective-c/test/Ice/proxy/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ProxyTest.h>
diff --git a/objective-c/test/Ice/proxy/TestI.m b/objective-c/test/Ice/proxy/TestI.m
index 66fab4a00b5..f54d2f53672 100644
--- a/objective-c/test/Ice/proxy/TestI.m
+++ b/objective-c/test/Ice/proxy/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <proxy/TestI.h>
diff --git a/objective-c/test/Ice/retry/AllTests.m b/objective-c/test/Ice/retry/AllTests.m
index 7b8ac40cc90..0bb8c8e8e1a 100644
--- a/objective-c/test/Ice/retry/AllTests.m
+++ b/objective-c/test/Ice/retry/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/retry/Client.m b/objective-c/test/Ice/retry/Client.m
index a6026663cf6..1065ad97e25 100644
--- a/objective-c/test/Ice/retry/Client.m
+++ b/objective-c/test/Ice/retry/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/retry/Collocated.m b/objective-c/test/Ice/retry/Collocated.m
index 9368ce8258c..8b5add2da29 100644
--- a/objective-c/test/Ice/retry/Collocated.m
+++ b/objective-c/test/Ice/retry/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <retry/TestI.h>
diff --git a/objective-c/test/Ice/retry/RetryTest.ice b/objective-c/test/Ice/retry/RetryTest.ice
index dbe80561c8e..dd545a56dc4 100644
--- a/objective-c/test/Ice/retry/RetryTest.ice
+++ b/objective-c/test/Ice/retry/RetryTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/retry/Server.m b/objective-c/test/Ice/retry/Server.m
index 1f5208a0f34..bd4e9b70775 100644
--- a/objective-c/test/Ice/retry/Server.m
+++ b/objective-c/test/Ice/retry/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <retry/TestI.h>
diff --git a/objective-c/test/Ice/retry/TestI.h b/objective-c/test/Ice/retry/TestI.h
index f197900c3f1..75d00934117 100644
--- a/objective-c/test/Ice/retry/TestI.h
+++ b/objective-c/test/Ice/retry/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <RetryTest.h>
diff --git a/objective-c/test/Ice/retry/TestI.m b/objective-c/test/Ice/retry/TestI.m
index b78e492d9a8..88897a7bab6 100644
--- a/objective-c/test/Ice/retry/TestI.m
+++ b/objective-c/test/Ice/retry/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <retry/TestI.h>
diff --git a/objective-c/test/Ice/servantLocator/AllTests.m b/objective-c/test/Ice/servantLocator/AllTests.m
index 5490c03fb88..94e4b67763c 100644
--- a/objective-c/test/Ice/servantLocator/AllTests.m
+++ b/objective-c/test/Ice/servantLocator/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/servantLocator/Client.m b/objective-c/test/Ice/servantLocator/Client.m
index 6b78aab4a7f..b1ed431848c 100644
--- a/objective-c/test/Ice/servantLocator/Client.m
+++ b/objective-c/test/Ice/servantLocator/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/servantLocator/Collocated.m b/objective-c/test/Ice/servantLocator/Collocated.m
index d7a9b1765a1..8cac361f394 100644
--- a/objective-c/test/Ice/servantLocator/Collocated.m
+++ b/objective-c/test/Ice/servantLocator/Collocated.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <servantLocator/TestI.h>
diff --git a/objective-c/test/Ice/servantLocator/Makefile.mk b/objective-c/test/Ice/servantLocator/Makefile.mk
index 568948d759a..21652b89404 100644
--- a/objective-c/test/Ice/servantLocator/Makefile.mk
+++ b/objective-c/test/Ice/servantLocator/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_server_sources = $(test-server-sources) ServantLocatorI.m
diff --git a/objective-c/test/Ice/servantLocator/ServantLocatorI.h b/objective-c/test/Ice/servantLocator/ServantLocatorI.h
index aac8cc62f6d..ed9dafb3982 100644
--- a/objective-c/test/Ice/servantLocator/ServantLocatorI.h
+++ b/objective-c/test/Ice/servantLocator/ServantLocatorI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
diff --git a/objective-c/test/Ice/servantLocator/ServantLocatorI.m b/objective-c/test/Ice/servantLocator/ServantLocatorI.m
index c0e125eeb0b..fd94a5c6411 100644
--- a/objective-c/test/Ice/servantLocator/ServantLocatorI.m
+++ b/objective-c/test/Ice/servantLocator/ServantLocatorI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <ServantLocatorTest.h>
#import <servantLocator/ServantLocatorI.h>
diff --git a/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice b/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
index 90684dcc9b9..fc336ee9bce 100644
--- a/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
+++ b/objective-c/test/Ice/servantLocator/ServantLocatorTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/servantLocator/Server.m b/objective-c/test/Ice/servantLocator/Server.m
index 578801af794..ecfe3456bd0 100644
--- a/objective-c/test/Ice/servantLocator/Server.m
+++ b/objective-c/test/Ice/servantLocator/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <servantLocator/TestI.h>
diff --git a/objective-c/test/Ice/servantLocator/TestI.h b/objective-c/test/Ice/servantLocator/TestI.h
index 4b3eeb12c13..29bd5c64b03 100644
--- a/objective-c/test/Ice/servantLocator/TestI.h
+++ b/objective-c/test/Ice/servantLocator/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <ServantLocatorTest.h>
diff --git a/objective-c/test/Ice/servantLocator/TestI.m b/objective-c/test/Ice/servantLocator/TestI.m
index 96cb83b2f09..53c8592978f 100644
--- a/objective-c/test/Ice/servantLocator/TestI.m
+++ b/objective-c/test/Ice/servantLocator/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <servantLocator/TestI.h>
diff --git a/objective-c/test/Ice/services/AllTests.m b/objective-c/test/Ice/services/AllTests.m
index 358e7d82248..4d9be09dd7b 100644
--- a/objective-c/test/Ice/services/AllTests.m
+++ b/objective-c/test/Ice/services/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <objc/Glacier2.h>
diff --git a/objective-c/test/Ice/services/Client.m b/objective-c/test/Ice/services/Client.m
index bc7acb82dc7..b1651b2ea30 100644
--- a/objective-c/test/Ice/services/Client.m
+++ b/objective-c/test/Ice/services/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/services/Makefile.mk b/objective-c/test/Ice/services/Makefile.mk
index a6ccb5f3d25..359820b1aa6 100644
--- a/objective-c/test/Ice/services/Makefile.mk
+++ b/objective-c/test/Ice/services/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_dependencies = IceObjC IceGridObjC Glacier2ObjC IceStormObjC TestCommonObjC
diff --git a/objective-c/test/Ice/services/ServicesTest.ice b/objective-c/test/Ice/services/ServicesTest.ice
index 5ec53a8603f..22b5b38cea9 100644
--- a/objective-c/test/Ice/services/ServicesTest.ice
+++ b/objective-c/test/Ice/services/ServicesTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/slicing/exceptions/AllTests.m b/objective-c/test/Ice/slicing/exceptions/AllTests.m
index e7f538babbb..5b1be7bee65 100644
--- a/objective-c/test/Ice/slicing/exceptions/AllTests.m
+++ b/objective-c/test/Ice/slicing/exceptions/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/slicing/exceptions/Client.m b/objective-c/test/Ice/slicing/exceptions/Client.m
index 8db6d8feb0a..d264ca0cffb 100644
--- a/objective-c/test/Ice/slicing/exceptions/Client.m
+++ b/objective-c/test/Ice/slicing/exceptions/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/slicing/exceptions/Makefile.mk b/objective-c/test/Ice/slicing/exceptions/Makefile.mk
index 1c6bbd7a1db..4243ba45878 100644
--- a/objective-c/test/Ice/slicing/exceptions/Makefile.mk
+++ b/objective-c/test/Ice/slicing/exceptions/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.m AllTests.m SlicingExceptionsTestClient.ice
$(test)_server_sources = Server.m TestI.m SlicingExceptionsTestServer.ice
diff --git a/objective-c/test/Ice/slicing/exceptions/Server.m b/objective-c/test/Ice/slicing/exceptions/Server.m
index 6a8382f358e..933e39fec8c 100644
--- a/objective-c/test/Ice/slicing/exceptions/Server.m
+++ b/objective-c/test/Ice/slicing/exceptions/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <slicing/exceptions/TestI.h>
diff --git a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
index f377683aac7..8d1178b0713 100644
--- a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
+++ b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestClient.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
index 5a0991c6477..74e98679b7b 100644
--- a/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
+++ b/objective-c/test/Ice/slicing/exceptions/SlicingExceptionsTestServer.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/slicing/exceptions/TestI.h b/objective-c/test/Ice/slicing/exceptions/TestI.h
index 203b67caffe..c8a4016f154 100644
--- a/objective-c/test/Ice/slicing/exceptions/TestI.h
+++ b/objective-c/test/Ice/slicing/exceptions/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <SlicingExceptionsTestServer.h>
diff --git a/objective-c/test/Ice/slicing/exceptions/TestI.m b/objective-c/test/Ice/slicing/exceptions/TestI.m
index ff951f7dc71..ea4599297f2 100644
--- a/objective-c/test/Ice/slicing/exceptions/TestI.m
+++ b/objective-c/test/Ice/slicing/exceptions/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <slicing/exceptions/TestI.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/slicing/objects/AllTests.m b/objective-c/test/Ice/slicing/objects/AllTests.m
index da44f92ea03..0dc911dfbbe 100644
--- a/objective-c/test/Ice/slicing/objects/AllTests.m
+++ b/objective-c/test/Ice/slicing/objects/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/slicing/objects/Client.m b/objective-c/test/Ice/slicing/objects/Client.m
index 6f0db4661a4..689c70963d1 100644
--- a/objective-c/test/Ice/slicing/objects/Client.m
+++ b/objective-c/test/Ice/slicing/objects/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/slicing/objects/Makefile.mk b/objective-c/test/Ice/slicing/objects/Makefile.mk
index b1d1cde44c1..788c5216be9 100644
--- a/objective-c/test/Ice/slicing/objects/Makefile.mk
+++ b/objective-c/test/Ice/slicing/objects/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.m AllTests.m SlicingObjectsTestClient.ice SlicingObjectsForwardClient.ice
$(test)_server_sources = Server.m TestI.m SlicingObjectsTestServer.ice SlicingObjectsForwardServer.ice
diff --git a/objective-c/test/Ice/slicing/objects/Server.m b/objective-c/test/Ice/slicing/objects/Server.m
index 1194204ff6d..f02440acd49 100644
--- a/objective-c/test/Ice/slicing/objects/Server.m
+++ b/objective-c/test/Ice/slicing/objects/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <slicing/objects/TestI.h>
diff --git a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
index afb4e9f425f..7f9f000ad6b 100644
--- a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
+++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestClient.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
index aa7f381af32..4ee23db134d 100644
--- a/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
+++ b/objective-c/test/Ice/slicing/objects/SlicingObjectsTestServer.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/slicing/objects/TestI.h b/objective-c/test/Ice/slicing/objects/TestI.h
index c2ebf2868ff..e3a3be6b81a 100644
--- a/objective-c/test/Ice/slicing/objects/TestI.h
+++ b/objective-c/test/Ice/slicing/objects/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <SlicingObjectsTestServer.h>
diff --git a/objective-c/test/Ice/slicing/objects/TestI.m b/objective-c/test/Ice/slicing/objects/TestI.m
index 15db3e95525..0bde9921668 100644
--- a/objective-c/test/Ice/slicing/objects/TestI.m
+++ b/objective-c/test/Ice/slicing/objects/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <slicing/objects/TestI.h>
diff --git a/objective-c/test/Ice/stream/Client.m b/objective-c/test/Ice/stream/Client.m
index 071c09d2326..0fd785433d8 100644
--- a/objective-c/test/Ice/stream/Client.m
+++ b/objective-c/test/Ice/stream/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/stream/StreamTest.ice b/objective-c/test/Ice/stream/StreamTest.ice
index 34a850c324e..b351e6055f8 100644
--- a/objective-c/test/Ice/stream/StreamTest.ice
+++ b/objective-c/test/Ice/stream/StreamTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Ice/timeout/AllTests.m b/objective-c/test/Ice/timeout/AllTests.m
index c3ac31187d0..24de082b966 100644
--- a/objective-c/test/Ice/timeout/AllTests.m
+++ b/objective-c/test/Ice/timeout/AllTests.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/timeout/Client.m b/objective-c/test/Ice/timeout/Client.m
index df775498f39..05659c69a1a 100644
--- a/objective-c/test/Ice/timeout/Client.m
+++ b/objective-c/test/Ice/timeout/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Ice/timeout/Server.m b/objective-c/test/Ice/timeout/Server.m
index c437842bfd8..252d633e23c 100644
--- a/objective-c/test/Ice/timeout/Server.m
+++ b/objective-c/test/Ice/timeout/Server.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <timeout/TestI.h>
diff --git a/objective-c/test/Ice/timeout/TestI.h b/objective-c/test/Ice/timeout/TestI.h
index df0af5309ab..7a5526fe0f3 100644
--- a/objective-c/test/Ice/timeout/TestI.h
+++ b/objective-c/test/Ice/timeout/TestI.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <TimeoutTest.h>
diff --git a/objective-c/test/Ice/timeout/TestI.m b/objective-c/test/Ice/timeout/TestI.m
index 46dc7157c8f..315ce028bd9 100644
--- a/objective-c/test/Ice/timeout/TestI.m
+++ b/objective-c/test/Ice/timeout/TestI.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <timeout/TestI.h>
#import <objc/Ice.h>
diff --git a/objective-c/test/Ice/timeout/TimeoutTest.ice b/objective-c/test/Ice/timeout/TimeoutTest.ice
index 601913f0ec9..f8fa75f24bd 100644
--- a/objective-c/test/Ice/timeout/TimeoutTest.ice
+++ b/objective-c/test/Ice/timeout/TimeoutTest.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#pragma once
diff --git a/objective-c/test/Slice/escape/Clash.ice b/objective-c/test/Slice/escape/Clash.ice
index 95e22480527..b04f2e5c11b 100644
--- a/objective-c/test/Slice/escape/Clash.ice
+++ b/objective-c/test/Slice/escape/Clash.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["underscore"]]
diff --git a/objective-c/test/Slice/escape/Client.m b/objective-c/test/Slice/escape/Client.m
index 1620a039475..bc18968677e 100644
--- a/objective-c/test/Slice/escape/Client.m
+++ b/objective-c/test/Slice/escape/Client.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <objc/Ice.h>
#import <TestCommon.h>
diff --git a/objective-c/test/Slice/escape/Inherit.ice b/objective-c/test/Slice/escape/Inherit.ice
index 73667d872ce..4b231efb515 100644
--- a/objective-c/test/Slice/escape/Inherit.ice
+++ b/objective-c/test/Slice/escape/Inherit.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
// Test overridding inherited names
module Test
diff --git a/objective-c/test/Slice/escape/Key.ice b/objective-c/test/Slice/escape/Key.ice
index 652c81e1d0d..7ad6918ca93 100644
--- a/objective-c/test/Slice/escape/Key.ice
+++ b/objective-c/test/Slice/escape/Key.ice
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
[["suppress-warning:deprecated"]] // For class that implements interface
diff --git a/objective-c/test/Slice/escape/Makefile.mk b/objective-c/test/Slice/escape/Makefile.mk
index 463d065e67e..d3e81b34cb6 100644
--- a/objective-c/test/Slice/escape/Makefile.mk
+++ b/objective-c/test/Slice/escape/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(test)_client_sources = Client.m Clash.ice Key.ice Inherit.ice
diff --git a/objective-c/test/include/TestCommon.h b/objective-c/test/include/TestCommon.h
index 052e95701bf..a04a14feeb3 100644
--- a/objective-c/test/include/TestCommon.h
+++ b/objective-c/test/include/TestCommon.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <Foundation/NSObject.h>
#import <Foundation/NSException.h>
diff --git a/objective-c/test/ios/controller/Classes/AppDelegate.h b/objective-c/test/ios/controller/Classes/AppDelegate.h
index 316bcf5e70b..db25348fd91 100644
--- a/objective-c/test/ios/controller/Classes/AppDelegate.h
+++ b/objective-c/test/ios/controller/Classes/AppDelegate.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <UIKit/UIKit.h>
diff --git a/objective-c/test/ios/controller/Classes/AppDelegate.m b/objective-c/test/ios/controller/Classes/AppDelegate.m
index c6d714b9ed7..cc1773600fa 100644
--- a/objective-c/test/ios/controller/Classes/AppDelegate.m
+++ b/objective-c/test/ios/controller/Classes/AppDelegate.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import "AppDelegate.h"
diff --git a/objective-c/test/ios/controller/Classes/ViewController.h b/objective-c/test/ios/controller/Classes/ViewController.h
index e15802143fc..9ebf376bf91 100644
--- a/objective-c/test/ios/controller/Classes/ViewController.h
+++ b/objective-c/test/ios/controller/Classes/ViewController.h
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <UIKit/UIKit.h>
#import <objc/Ice/Ice.h>
diff --git a/objective-c/test/ios/controller/Classes/ViewController.m b/objective-c/test/ios/controller/Classes/ViewController.m
index da565850060..85a2a904aaa 100644
--- a/objective-c/test/ios/controller/Classes/ViewController.m
+++ b/objective-c/test/ios/controller/Classes/ViewController.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import "ViewController.h"
#import <Controller.h>
diff --git a/objective-c/test/ios/controller/Classes/main.m b/objective-c/test/ios/controller/Classes/main.m
index 38ed9425fcc..95893f936b7 100644
--- a/objective-c/test/ios/controller/Classes/main.m
+++ b/objective-c/test/ios/controller/Classes/main.m
@@ -1,8 +1,6 @@
-// **********************************************************************
//
-// Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+// Copyright (c) ZeroC, Inc. All rights reserved.
//
-// **********************************************************************
#import <UIKit/UIKit.h>
#import "AppDelegate.h"
diff --git a/objective-c/test/ios/controller/Makefile.mk b/objective-c/test/ios/controller/Makefile.mk
index 8cf9d296275..f4a538017e9 100644
--- a/objective-c/test/ios/controller/Makefile.mk
+++ b/objective-c/test/ios/controller/Makefile.mk
@@ -1,8 +1,6 @@
-# **********************************************************************
#
-# Copyright (c) 2003-present ZeroC, Inc. All rights reserved.
+# Copyright (c) ZeroC, Inc. All rights reserved.
#
-# **********************************************************************
$(project)_type = xcode
$(project)_platforms = iphonesimulator iphoneos