From 984fa2bc90aa4fd343ba5cf8f334939c9ccf43bf Mon Sep 17 00:00:00 2001
From: LUU QUANG MINH <Minh.LuuQuang@vn.bosch.com>
Date: Thu, 27 Jul 2023 17:36:50 +0700
Subject: [PATCH] Switch from GENIVI to COVESA

Signed-off-by: LUU QUANG MINH <Minh.LuuQuang@vn.bosch.com>
---
 Android.bp                                    |   4 ++--
 CMakeLists.txt                                |   8 +++----
 COPYING                                       |   4 ++--
 README.md                                     |  20 +++++++++---------
 ReleaseNotes.md                               |   2 +-
 automotive-dlt-config.cmake.in                |   4 ++--
 automotive-dlt.pc.in                          |   4 ++--
 automotive-dlt.spec.in                        |   8 +++----
 cmake/CMakeLists.txt                          |   4 ++--
 cmake/config.h.cmake                          |   4 ++--
 cmake/dlt_version.h.cmake                     |   4 ++--
 debian/control                                |   4 ++--
 debian/copyright                              |   2 +-
 doc/CMakeLists.txt                            |   4 ++--
 doc/dlt-adaptor-stdin.1.md                    |   2 +-
 doc/dlt-adaptor-udp.1.md                      |   2 +-
 doc/dlt-control.1.md                          |   2 +-
 doc/dlt-convert.1.md                          |   2 +-
 doc/dlt-daemon.1.md                           |   4 ++--
 doc/dlt-logstorage-ctrl.1.md                  |   2 +-
 doc/dlt-passive-node-ctrl.1.md                |   2 +-
 doc/dlt-receive.1.md                          |   2 +-
 doc/dlt-sortbytimestamp.1.md                  |   2 +-
 doc/dlt-system.1.md                           |   2 +-
 doc/dlt-system.conf.5.md                      |   6 +++---
 doc/dlt.conf.5.md                             |  18 ++++++++--------
 doc/dlt_build_options.md                      |   2 +-
 doc/dlt_demo_setup.md                         |   2 +-
 doc/dlt_design_specification.md               |  12 +++++------
 doc/dlt_example_user.md                       |   2 +-
 doc/dlt_gateway.conf.5.md                     |   2 +-
 doc/dlt_glossary.md                           |   2 +-
 doc/doxygen.cfg.cmake                         |   6 +++---
 doc/extended_network_trace_doxygen.cfg.cmake  |   6 +++---
 doc/images/genivilogo.png                     | Bin 9537 -> 0 bytes
 doc/mainpage.h                                |   8 +++----
 doc/test/dlt-test-qnx-slogger.1.md            |   2 +-
 examples/example1/CMakeLists.txt              |   4 ++--
 examples/example1/example1.c                  |   4 ++--
 examples/example2/CMakeLists.txt              |   4 ++--
 examples/example2/dlt_id.h                    |   4 ++--
 examples/example2/example2.c                  |   4 ++--
 examples/example3/CMakeLists.txt              |   4 ++--
 examples/example3/dlt_id.h                    |   4 ++--
 examples/example3/example3.c                  |   4 ++--
 examples/example4/CMakeLists.txt              |   4 ++--
 examples/example4/example4.c                  |   4 ++--
 include/CMakeLists.txt                        |   4 ++--
 include/dlt/CMakeLists.txt                    |   4 ++--
 include/dlt/dlt.h                             |   4 ++--
 include/dlt/dlt_client.h                      |   4 ++--
 include/dlt/dlt_common.h                      |   4 ++--
 include/dlt/dlt_common_api.h                  |   4 ++--
 include/dlt/dlt_cpp_extension.hpp             |   4 ++--
 include/dlt/dlt_filetransfer.h                |   4 ++--
 include/dlt/dlt_multiple_files.h              |   4 ++--
 include/dlt/dlt_offline_trace.h               |   4 ++--
 include/dlt/dlt_protocol.h                    |   4 ++--
 include/dlt/dlt_shm.h                         |   4 ++--
 include/dlt/dlt_types.h                       |   4 ++--
 include/dlt/dlt_user.h.in                     |   4 ++--
 include/dlt/dlt_user_macros.h                 |   4 ++--
 src/CMakeLists.txt                            |   4 ++--
 src/adaptor/CMakeLists.txt                    |   4 ++--
 src/adaptor/dlt-adaptor-stdin.c               |   4 ++--
 src/adaptor/dlt-adaptor-udp.c                 |   4 ++--
 src/android/dlt-logd-converter.cpp            |   2 +-
 src/console/CMakeLists.txt                    |   4 ++--
 src/console/dlt-control-common.c              |   4 ++--
 src/console/dlt-control-common.h              |   4 ++--
 src/console/dlt-control.c                     |   4 ++--
 src/console/dlt-convert.c                     |   4 ++--
 src/console/dlt-passive-node-ctrl.c           |   4 ++--
 src/console/dlt-receive.c                     |   4 ++--
 src/console/dlt-sortbytimestamp.c             |   4 ++--
 src/console/logstorage/CMakeLists.txt         |   4 ++--
 .../logstorage/dlt-logstorage-common.c        |   4 ++--
 .../logstorage/dlt-logstorage-common.h        |   4 ++--
 src/console/logstorage/dlt-logstorage-ctrl.c  |   4 ++--
 src/console/logstorage/dlt-logstorage-ctrl.h  |   4 ++--
 src/console/logstorage/dlt-logstorage-list.c  |   4 ++--
 src/console/logstorage/dlt-logstorage-list.h  |   4 ++--
 src/console/logstorage/dlt-logstorage-prop.h  |   4 ++--
 src/console/logstorage/dlt-logstorage-udev.c  |   4 ++--
 src/console/logstorage/dlt-logstorage-udev.h  |   4 ++--
 src/core_dump_handler/50-coredump.conf.cmake  |   4 ++--
 src/core_dump_handler/CMakeLists.txt          |   4 ++--
 src/core_dump_handler/dlt_cdh.c               |   4 ++--
 src/core_dump_handler/dlt_cdh.h               |   4 ++--
 src/core_dump_handler/dlt_cdh_context.c       |   4 ++--
 src/core_dump_handler/dlt_cdh_coredump.c      |   4 ++--
 src/core_dump_handler/dlt_cdh_cpuinfo.h       |   4 ++--
 src/core_dump_handler/dlt_cdh_crashid.c       |   4 ++--
 src/core_dump_handler/dlt_cdh_definitions.h   |   4 ++--
 src/core_dump_handler/dlt_cdh_streamer.c      |   4 ++--
 src/core_dump_handler/dlt_cdh_streamer.h      |   4 ++--
 src/core_dump_handler/i686/dlt_cdh_cpuinfo.c  |   4 ++--
 .../x86_64/dlt_cdh_cpuinfo.c                  |   4 ++--
 src/daemon/CMakeLists.txt                     |   4 ++--
 src/daemon/dlt-daemon.c                       |   4 ++--
 src/daemon/dlt-daemon.h                       |   4 ++--
 src/daemon/dlt-daemon_cfg.h                   |   4 ++--
 src/daemon/dlt_daemon_client.c                |   4 ++--
 src/daemon/dlt_daemon_client.h                |   4 ++--
 src/daemon/dlt_daemon_common.c                |   4 ++--
 src/daemon/dlt_daemon_common.h                |   4 ++--
 src/daemon/dlt_daemon_common_cfg.h            |   4 ++--
 src/daemon/dlt_daemon_connection.c            |   4 ++--
 src/daemon/dlt_daemon_connection.h            |   4 ++--
 src/daemon/dlt_daemon_connection_types.h      |   4 ++--
 src/daemon/dlt_daemon_event_handler.c         |   4 ++--
 src/daemon/dlt_daemon_event_handler.h         |   4 ++--
 src/daemon/dlt_daemon_event_handler_types.h   |   4 ++--
 src/daemon/dlt_daemon_offline_logstorage.c    |   2 +-
 src/daemon/dlt_daemon_offline_logstorage.h    |   2 +-
 .../dlt_daemon_offline_logstorage_internal.h  |   2 +-
 src/daemon/dlt_daemon_serial.c                |   4 ++--
 src/daemon/dlt_daemon_serial.h                |   4 ++--
 src/daemon/dlt_daemon_socket.c                |   4 ++--
 src/daemon/dlt_daemon_socket.h                |   4 ++--
 src/daemon/dlt_daemon_unix_socket.c           |   4 ++--
 src/daemon/dlt_daemon_unix_socket.h           |   4 ++--
 .../dlt_daemon_udp_common_socket.h            |   4 ++--
 .../udp_connection/dlt_daemon_udp_socket.c    |   4 ++--
 .../udp_connection/dlt_daemon_udp_socket.h    |   4 ++--
 src/dbus/CMakeLists.txt                       |   4 ++--
 src/dbus/dlt-dbus-options.c                   |   4 ++--
 src/dbus/dlt-dbus.c                           |   4 ++--
 src/dbus/dlt-dbus.h                           |   4 ++--
 src/dlt-qnx-system/CMakeLists.txt             |   4 ++--
 .../dlt-qnx-slogger2-adapter.cpp              |   2 +-
 src/dlt-qnx-system/dlt-qnx-system.c           |   2 +-
 src/dlt-qnx-system/dlt-qnx-system.h           |   2 +-
 src/examples/CMakeLists.txt                   |   4 ++--
 src/examples/dlt-example-filetransfer.c       |   4 ++--
 .../dlt-example-multicast-clientmsg-view.c    |   4 ++--
 src/examples/dlt-example-user-common-api.c    |   4 ++--
 src/examples/dlt-example-user-func.c          |   4 ++--
 src/examples/dlt-example-user.c               |   4 ++--
 src/gateway/CMakeLists.txt                    |   4 ++--
 src/gateway/dlt_gateway.c                     |   4 ++--
 src/gateway/dlt_gateway.h                     |   4 ++--
 src/gateway/dlt_gateway_internal.h            |   4 ++--
 src/gateway/dlt_gateway_types.h               |   4 ++--
 src/kpi/CMakeLists.txt                        |   4 ++--
 src/kpi/dlt-kpi-common.c                      |   4 ++--
 src/kpi/dlt-kpi-common.h                      |   4 ++--
 src/kpi/dlt-kpi-interrupt.c                   |   4 ++--
 src/kpi/dlt-kpi-interrupt.h                   |   4 ++--
 src/kpi/dlt-kpi-options.c                     |   4 ++--
 src/kpi/dlt-kpi-process-list.c                |   4 ++--
 src/kpi/dlt-kpi-process-list.h                |   4 ++--
 src/kpi/dlt-kpi-process.c                     |   4 ++--
 src/kpi/dlt-kpi-process.h                     |   4 ++--
 src/kpi/dlt-kpi.c                             |   4 ++--
 src/kpi/dlt-kpi.h                             |   4 ++--
 src/lib/CMakeLists.txt                        |   4 ++--
 src/lib/dlt_client.c                          |   4 ++--
 src/lib/dlt_client_cfg.h                      |   4 ++--
 src/lib/dlt_env_ll.c                          |   4 ++--
 src/lib/dlt_filetransfer.c                    |   4 ++--
 src/lib/dlt_user.c                            |   4 ++--
 src/lib/dlt_user_cfg.h                        |   4 ++--
 .../dlt_offline_logstorage.c                  |   2 +-
 .../dlt_offline_logstorage.h                  |   2 +-
 .../dlt_offline_logstorage_behavior.c         |   2 +-
 .../dlt_offline_logstorage_behavior.h         |   2 +-
 ...dlt_offline_logstorage_behavior_internal.h |   2 +-
 .../dlt_offline_logstorage_internal.h         |   2 +-
 src/shared/dlt_common.c                       |   4 ++--
 src/shared/dlt_common_cfg.h                   |   4 ++--
 src/shared/dlt_config_file_parser.c           |   4 ++--
 src/shared/dlt_config_file_parser.h           |   4 ++--
 src/shared/dlt_multiple_files.c               |   2 +-
 src/shared/dlt_offline_trace.c                |   4 ++--
 src/shared/dlt_protocol.c                     |   4 ++--
 src/shared/dlt_shm.c                          |   4 ++--
 src/shared/dlt_user_shared.c                  |   4 ++--
 src/shared/dlt_user_shared.h                  |   4 ++--
 src/shared/dlt_user_shared_cfg.h              |   4 ++--
 src/system/CMakeLists.txt                     |   4 ++--
 src/system/dlt-system-filetransfer.c          |   4 ++--
 src/system/dlt-system-journal.c               |   4 ++--
 src/system/dlt-system-logfile.c               |   4 ++--
 src/system/dlt-system-options.c               |   4 ++--
 src/system/dlt-system-process-handling.c      |   4 ++--
 src/system/dlt-system-processes.c             |   4 ++--
 src/system/dlt-system-shell.c                 |   4 ++--
 src/system/dlt-system-syslog.c                |   4 ++--
 src/system/dlt-system-watchdog.c              |   4 ++--
 src/system/dlt-system.c                       |   4 ++--
 src/system/dlt-system.conf                    |   6 +++---
 src/system/dlt-system.h                       |   4 ++--
 src/tests/CMakeLists.txt                      |   4 ++--
 src/tests/dlt-test-client.c                   |   4 ++--
 src/tests/dlt-test-cpp-extension.cpp          |   4 ++--
 src/tests/dlt-test-filetransfer.c             |   4 ++--
 src/tests/dlt-test-fork-handler.c             |   4 ++--
 src/tests/dlt-test-init-free.c                |   4 ++--
 src/tests/dlt-test-multi-process-client.c     |   4 ++--
 src/tests/dlt-test-multi-process.c            |   4 ++--
 src/tests/dlt-test-multi-process.h            |   4 ++--
 src/tests/dlt-test-non-verbose.c              |   4 ++--
 src/tests/dlt-test-preregister-context.c      |   4 ++--
 src/tests/dlt-test-qnx-slogger.c              |   4 ++--
 src/tests/dlt-test-stress-client.c            |   4 ++--
 src/tests/dlt-test-stress-user.c              |   4 ++--
 src/tests/dlt-test-stress.c                   |   4 ++--
 src/tests/dlt-test-user.c                     |   4 ++--
 systemd/CMakeLists.txt                        |   4 ++--
 systemd/dlt-adaptor-udp.service.cmake         |   6 +++---
 systemd/dlt-dbus.service.cmake                |   6 +++---
 systemd/dlt-example-user.service.cmake        |   8 +++----
 systemd/dlt-receive.service.cmake             |   6 +++---
 systemd/dlt-system.service.cmake              |   6 +++---
 systemd/dlt.service.cmake                     |   6 +++---
 tests/dlt_env_ll_unit_test.cpp                |   4 ++--
 tests/dlt_test_receiver.c                     |   4 ++--
 tests/gtest_dlt_common.cpp                    |   4 ++--
 tests/gtest_dlt_daemon_common.cpp             |   4 ++--
 tests/gtest_dlt_daemon_event_handler.cpp      |   4 ++--
 tests/gtest_dlt_daemon_gateway.cpp            |   4 ++--
 tests/gtest_dlt_daemon_gateway.sh             |   4 ++--
 ...test_dlt_daemon_multiple_files_logging.cpp |   4 ++--
 tests/gtest_dlt_user.cpp                      |   4 ++--
 tests/start_logstorage_test.sh                |   4 ++--
 tests/start_multinode_test.sh                 |   4 ++--
 testscripts/CMakeLists.txt                    |   4 ++--
 testscripts/Meego/dlt-daemon.cmake            |   4 ++--
 testscripts/Ubuntu/dlt-daemon.cmake           |   4 ++--
 util/create_dlt_user_h.py                     |   4 ++--
 util/create_dlt_version_h.py                  |   4 ++--
 232 files changed, 467 insertions(+), 467 deletions(-)
 delete mode 100644 doc/images/genivilogo.png

diff --git a/Android.bp b/Android.bp
index 36f27d705..c1061a2fa 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -11,7 +11,7 @@
  * Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with
  * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 cc_defaults {
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 014fc3bb9..151d74170 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright(C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License(MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 cmake_minimum_required(VERSION 3.3)
@@ -82,7 +82,7 @@ option(WITH_DLT_NETWORK_TRACE "Set to ON to enable network trace (if message que
 option(WITH_DLT_LOG_LEVEL_APP_CONFIG "Set to ON to enable default log levels based on application ids"           OFF)
 
 set(DLT_IPC "FIFO" CACHE STRING "UNIX_SOCKET,FIFO")
-set(DLT_USER "genivi" CACHE STRING "Set user for process not run as root")
+set(DLT_USER "covesa" CACHE STRING "Set user for process not run as root")
 set(DLT_QNX_SLOG_ADAPTER_WAIT_BUFFER_TIMEOUT_MS "100" CACHE STRING "Timeout in milliseconds to wait before messages are dropped when input buffer is full")
 
 option(WITH_DLT_PKGCONFIG     "Set to ON to generate pkgconfig .pc files"                                        ON)
@@ -107,7 +107,7 @@ set(DLT_WRITEV_TIMEOUT_SEC "1" CACHE STRING "Set sec timeout for writev to preve
 set(DLT_WRITEV_TIMEOUT_USEC "0" CACHE STRING "Set usec timeout for writev to prevent blocking indefinitely")
 
 # RPM settings
-set(GENIVI_RPM_RELEASE "1")  # ${DLT_REVISION}")
+set(COVESA_RPM_RELEASE "1")  # ${DLT_REVISION}")
 set(LICENSE "Mozilla Public License Version 2.0")
 
 # Build, project and include settings
diff --git a/COPYING b/COPYING
index c82b239f1..c06255495 100644
--- a/COPYING
+++ b/COPYING
@@ -2,11 +2,11 @@
  #
  # Copyright (C) 2011-2015, BMW AG
  #
- # This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ # This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  #
  # This Source Code Form is subject to the terms of the
  # Mozilla Public License (MPL), v. 2.0.
  # If a copy of the MPL was not distributed with this file,
  # You can obtain one at http://mozilla.org/MPL/2.0/.
  #
- # For further information see http://www.genivi.org/.
+ # For further information see http://www.covesa.org/.
diff --git a/README.md b/README.md
index e4da7a990..b31ebd05d 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
 # Diagnostic Log and Trace
 
-Welcome to GENIVI Diagnostic Log and Trace (DLT). If you are familiar with DLT
+Welcome to COVESA Diagnostic Log and Trace (DLT). If you are familiar with DLT
 and want to know what's new, check the [Release Notes](ReleaseNotes.md).
 
 **New to DLT? Great! Welcome aboard.** We prepared a brief [overview](#overview)
@@ -19,11 +19,11 @@ you can [learn more](#learn-more) about advanced concepts and features.
 
 ## Overview
 
-GENIVI DLT provides a log and trace interface, based on the standardised
+COVESA DLT provides a log and trace interface, based on the standardised
 protocol specified in the
 [AUTOSAR standard 4 DLT](https://www.autosar.org/fileadmin/standards/R22-11/CP/AUTOSAR_SWS_DiagnosticLogAndTrace.pdf).
-It is used by other GENIVI components but can serve as logging framework for
-other applications without relation to GENIVI.
+It is used by other COVESA components but can serve as logging framework for
+other applications without relation to COVESA.
 
 The most important terms and parts are depicted in the following figure. Please
 refer to [Glossary](doc/dlt_glossary.md) for a full overview over DLT-specific
@@ -78,7 +78,7 @@ Then proceed to download DLT if you haven't already. We recommend cloning the
 repository, but downloading and extracting a zip-archive is fine as well.
 ```bash
 cd /path/to/workspace
-git clone https://github.com/GENIVI/dlt-daemon.git
+git clone https://github.com/COVESA/dlt-daemon.git
 ```
 
 To build and install the DLT daemon, follow these steps:
@@ -134,7 +134,7 @@ DLT or study its internals by checking out the [design
 specifications](./doc/dlt_design_specification.md).
 
 ### Advanced Topics
-The GENIVI DLT implementation is capable of by far more than to "just" send log
+The COVESA DLT implementation is capable of by far more than to "just" send log
 message. You will get an overview of advanced features in this section. Follow
 the links to learn more about the respective concept.
 
@@ -191,9 +191,9 @@ Start working, best practice is to commit smaller, compilable pieces during the
 work that makes it easier to handle later on.
 
 If you want to commit your changes, create a
-[Pull Request](https://github.com/genivi/dlt-daemon/pulls) in Github. Please
+[Pull Request](https://github.com/covesa/dlt-daemon/pulls) in Github. Please
 make sure to follow the
-[Rules for commit messages](https://at.projects.genivi.org/wiki/display/PROJ/Rules+for+Commit+Messages)
+[Rules for commit messages](https://at.projects.covesa.org/wiki/display/PROJ/Rules+for+Commit+Messages)
 
 ### Coding Rules
 
@@ -217,7 +217,7 @@ For reference to clang-format, you can check with:
 ## Known issues
 
 List of open issues can be found on
-[Github](https://github.com/GENIVI/dlt-daemon/issues)
+[Github](https://github.com/COVESA/dlt-daemon/issues)
 
 - DLT library: Usage of dlt\_user\_log\_write\_float64() and DLT\_FLOAT64()
   leads to "Illegal instruction (core dumped)" on ARM target.
@@ -243,4 +243,4 @@ file in src/core\_dump\_handler/cityhash\_c.
 Methner, Michael <mmethner@de.adit-jv.com>,
 Le Van, Khanh <Khanh.LeVan@vn.bosch.com>
 
-![alt text](doc/images/genivilogo.png "GENIVI")
+![alt text](https://covesa.global/sites/all/themes/resp_1/images/covesa-logo.png)
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index 8426de4f8..d0516016e 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -685,7 +685,7 @@ Back to [README.md](../README.md)
 
    * Added unit and functional tests
    * Fixed copyright doxygen comments
-   * Updated license headers to latest GENIVI license policy
+   * Updated license headers to latest COVESA license policy
    * Renamed and cleanup further files to comply with licensing requirements
    * dlt-control: Check for return values
    * dlt-daemon: Explicitly set the default loggingLevel to LOG_INFO
diff --git a/automotive-dlt-config.cmake.in b/automotive-dlt-config.cmake.in
index 5013b5403..832a129fe 100644
--- a/automotive-dlt-config.cmake.in
+++ b/automotive-dlt-config.cmake.in
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2021, Martin Willers <M.Willers@gmx.net>
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 # Config file for the Genivi::dlt package.
diff --git a/automotive-dlt.pc.in b/automotive-dlt.pc.in
index ddca06060..bd9ce0cc0 100644
--- a/automotive-dlt.pc.in
+++ b/automotive-dlt.pc.in
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 prefix=@CMAKE_INSTALL_PREFIX@
diff --git a/automotive-dlt.spec.in b/automotive-dlt.spec.in
index 7f3df98bd..6901df5f7 100644
--- a/automotive-dlt.spec.in
+++ b/automotive-dlt.spec.in
@@ -3,19 +3,19 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 Name: @PROJECT_NAME@
 Version: @PROJECT_VERSION@
-Release: @GENIVI_RPM_RELEASE@
+Release: @COVESA_RPM_RELEASE@
 Summary: %{name} - Diagnostic Log and Trace
 Group: System Environment/Base
 Vendor: BMW Group AG
@@ -28,7 +28,7 @@ BuildRequires: cmake
 %description
 This component provides a standardised log and trace interface, based on the
 standardised protocol specified in the AUTOSAR standard 4.0 DLT.
-This component can be used by GENIVI components and other applications as
+This component can be used by COVESA components and other applications as
 logging facility providing
 - the DLT shared library
 - the DLT daemon, including startup scripts
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 3ceae3c1f..91fe848b1 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 # Run CheckIncludeFiles and CheckFunctionExists
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 122532c88..70a21c5b1 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 // DO NOT EDIT! GENERATED AUTOMATICALLY!
diff --git a/cmake/dlt_version.h.cmake b/cmake/dlt_version.h.cmake
index 78442ee25..c5dbf2e06 100644
--- a/cmake/dlt_version.h.cmake
+++ b/cmake/dlt_version.h.cmake
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
diff --git a/debian/control b/debian/control
index 15583434d..ce0e2cc8d 100644
--- a/debian/control
+++ b/debian/control
@@ -12,10 +12,10 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Diagnostic Log and Trace daemon
  This component provides a standardised log and trace interface, based
  on the standardised protocol specified in the AUTOSAR standard 4.0 DLT.
- This component can be used by GENIVI components and other applications
+ This component can be used by COVESA components and other applications
  as logging facility providing
  .
- The DLT daemon is the central component in GENIVI, which gathers all
+ The DLT daemon is the central component in COVESA, which gathers all
  logs and traces from the DLT user applications. The logs and traces
  are stored optionally directly in a file in the ECU. The DLT daemon
  forwards all logs and traces to a connected DLT client.
diff --git a/debian/copyright b/debian/copyright
index a3c4bea54..30472e923 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: dlt-daemon
-Source: https://github.com/GENIVI/dlt-daemon
+Source: https://github.com/COVESA/dlt-daemon
 
 Files: *
 Copyright:
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index d0f2d67d9..ee2405f38 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 if(WITH_DOC)
diff --git a/doc/dlt-adaptor-stdin.1.md b/doc/dlt-adaptor-stdin.1.md
index 055679868..b0e7313aa 100644
--- a/doc/dlt-adaptor-stdin.1.md
+++ b/doc/dlt-adaptor-stdin.1.md
@@ -56,7 +56,7 @@ Copyright (C) 2019 Advanced Driver Information Technology, Bosch and DENSO. Lice
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-adaptor-udp.1.md b/doc/dlt-adaptor-udp.1.md
index 5b92eb77e..5804ece06 100644
--- a/doc/dlt-adaptor-udp.1.md
+++ b/doc/dlt-adaptor-udp.1.md
@@ -51,7 +51,7 @@ Copyright (C) 2019 Advanced Driver Information Technology, Bosch and DENSO. Lice
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-control.1.md b/doc/dlt-control.1.md
index e06c5a940..066206963 100644
--- a/doc/dlt-control.1.md
+++ b/doc/dlt-control.1.md
@@ -158,7 +158,7 @@ Copyright (C) 2019 Advanced Driver Information Technology, Bosch and DENSO. Lice
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-convert.1.md b/doc/dlt-convert.1.md
index 19f855a7c..6d23b006d 100644
--- a/doc/dlt-convert.1.md
+++ b/doc/dlt-convert.1.md
@@ -95,7 +95,7 @@ Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-daemon.1.md b/doc/dlt-daemon.1.md
index e30405ad4..d4ac4cad8 100644
--- a/doc/dlt-daemon.1.md
+++ b/doc/dlt-daemon.1.md
@@ -13,7 +13,7 @@
 The DLT daemon is the central place where logs and traces are gathered
 from different applications, stored temporarily or permanently and
 transferred to a DLT client application, which can run directly on the
-GENIVI system or more likely on a external tester device.
+COVESA system or more likely on a external tester device.
 
 ## OPTIONS
 
@@ -75,7 +75,7 @@ Copyright (C) 2016 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-logstorage-ctrl.1.md b/doc/dlt-logstorage-ctrl.1.md
index 931e452cb..720c74062 100644
--- a/doc/dlt-logstorage-ctrl.1.md
+++ b/doc/dlt-logstorage-ctrl.1.md
@@ -71,7 +71,7 @@ Copyright (C) 2015 Advanced Driver Information Technology, Bosch and DENSO. Lice
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-passive-node-ctrl.1.md b/doc/dlt-passive-node-ctrl.1.md
index 6525fadf5..4691fccc1 100644
--- a/doc/dlt-passive-node-ctrl.1.md
+++ b/doc/dlt-passive-node-ctrl.1.md
@@ -71,7 +71,7 @@ Copyright (C) 2015 Advanced Driver Information Technology, Bosch and DENSO. Lice
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-receive.1.md b/doc/dlt-receive.1.md
index 38eed53c5..508077136 100644
--- a/doc/dlt-receive.1.md
+++ b/doc/dlt-receive.1.md
@@ -144,7 +144,7 @@ Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-sortbytimestamp.1.md b/doc/dlt-sortbytimestamp.1.md
index caf02563c..02cc348c8 100644
--- a/doc/dlt-sortbytimestamp.1.md
+++ b/doc/dlt-sortbytimestamp.1.md
@@ -71,7 +71,7 @@ License MPL-2.0: Mozilla Public License version 2.0 <http://mozilla.org/MPL/2.0/
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-system.1.md b/doc/dlt-system.1.md
index 78e8af308..279ff3ae1 100644
--- a/doc/dlt-system.1.md
+++ b/doc/dlt-system.1.md
@@ -50,7 +50,7 @@ Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt-system.conf.5.md b/doc/dlt-system.conf.5.md
index 9fc65b2eb..b865b316c 100644
--- a/doc/dlt-system.conf.5.md
+++ b/doc/dlt-system.conf.5.md
@@ -28,7 +28,7 @@ The application Id used for the dlt-system process.
 
 ## ShellEnable
 
-Enable the Shell for command line injections. Be careful when you enable this feature. The user can send any kind of shell commands. The commands are executed with the rights of the dlt-system process. Dlt-system is started by default as user genivi.
+Enable the Shell for command line injections. Be careful when you enable this feature. The user can send any kind of shell commands. The commands are executed with the rights of the dlt-system process. Dlt-system is started by default as user covesa.
 
     Default: 0
 
@@ -56,7 +56,7 @@ This value defines the UDP port opened for receiving log messages from syslog. C
 
 ## JournalEnable
 
-Enable the Systemd Journal Adapter. This feature is only available, when dlt is compiled with the option "WITH_SYSTEMD_JOURNAL".  Dlt-system is started by default as user genivi, see dlt-system.service file. The user genivi must be added to one of the groups 'adm', 'wheel' or 'systemd-journal' to have access to all journal entries.
+Enable the Systemd Journal Adapter. This feature is only available, when dlt is compiled with the option "WITH_SYSTEMD_JOURNAL".  Dlt-system is started by default as user covesa, see dlt-system.service file. The user covesa must be added to one of the groups 'adm', 'wheel' or 'systemd-journal' to have access to all journal entries.
 
     Default: 0
 
@@ -204,7 +204,7 @@ Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt.conf.5.md b/doc/dlt.conf.5.md
index 8090438f0..d82531407 100644
--- a/doc/dlt.conf.5.md
+++ b/doc/dlt.conf.5.md
@@ -6,7 +6,7 @@
 
 # DESCRIPTION
 
-The DLT daemon is the central application which gathers logs and traces from different applications, stores them temporarily or permanently and transfers them to a DLT client application, which could run directly on the GENIVI system or more likely on some external tester device.
+The DLT daemon is the central application which gathers logs and traces from different applications, stores them temporarily or permanently and transfers them to a DLT client application, which could run directly on the COVESA system or more likely on some external tester device.
 
 The configuration file dlt.conf allows to configure the different
 runtime behaviour of the dlt-daemon. It is loaded during startup of dlt-daemon.
@@ -171,32 +171,32 @@ Read gateway configuration from another location
 # Permission configuration
 
 DLT daemon runs with e.g.
- User: genivi_dlt
- Group: genivi_dlt
+ User: covesa_dlt
+ Group: covesa_dlt
 
 DLT user applications run with different user and group than dlt-daemon but with supplimentory group: dlt_user_apps_group
 
 <basedir>/dlt FIFO will be created by dlt-daemon with
-    User: genivi_dlt
+    User: covesa_dlt
     Group: dlt_user_apps_group
     Permission: 620
 
 so that only dlt-daemon can read and only processes in dlt_user_apps_group can write.
 
 <basedir>/dltpipes will be created by dlt-daemon with
-    User: genivi_dlt
-    Group: genivi_dlt
+    User: covesa_dlt
+    Group: covesa_dlt
     Permission: 3733 (i.e Sticky bit and SGID turned on)
 
 <basedir>/dltpipes/dlt<PID> FIFO will be created by dlt application (user lib) with
     User: <user of the application>
-    Group: genivi_dlt (inherited from <basedir>dltpipes/ due to SGID)
+    Group: covesa_dlt (inherited from <basedir>dltpipes/ due to SGID)
     Permission: 620
 
 Thus DLT user applications (and also or attackers) can create the dlt<PID> FIFO
 (for communication from dlt-daemon to DLT user application) under <basedir>/dltpipes/. Since sticky bit is set the applications who creates the FIFO can only rename/delete it.
 
-Since SGID of <basedir>/dltpipes is set the group of dlt<PID> FIFO will be genivi_dlt which enables dlt daemon to have write permission on all the dlt<PID> FIFO.
+Since SGID of <basedir>/dltpipes is set the group of dlt<PID> FIFO will be covesa_dlt which enables dlt daemon to have write permission on all the dlt<PID> FIFO.
 
 One dlt user application cannot access dlt<PID> FIFO created by other dlt user application(if they run with different user).
 
@@ -376,7 +376,7 @@ Copyright (C) 2015 BMW AG. License MPL-2.0: Mozilla Public License version 2.0 <
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt_build_options.md b/doc/dlt_build_options.md
index 32f9f47c8..d5e0c469d 100644
--- a/doc/dlt_build_options.md
+++ b/doc/dlt_build_options.md
@@ -21,7 +21,7 @@ BUILD\_SHARED\_LIBS | ON | Set to OFF to build static libraries
 DLT\_IPC                          |"FIFO"          | Set to either "UNIX\_SOCKET" or "FIFO"
 WITH\_DLT\_USE\_IPv6              | ON             | Set to ON for IPv6 support
 WITH\_DLT\_EXAMPLES               | ON             | Set to ON to build src/examples binaries
-DLT\_USER                         | genivi         | Set user for process not run as root
+DLT\_USER                         | covesa         | Set user for process not run as root
 WITH\_CHECK\_CONFIG\_FILE         | OFF            | Set to ON to create a configure file of CheckIncludeFiles and CheckFunctionExists
 CMAKE\_INSTALL\_PREFIX            | /usr/local
 CMAKE\_BUILD\_TYPE                | RelWithDebInfo
diff --git a/doc/dlt_demo_setup.md b/doc/dlt_demo_setup.md
index 3d357f4fd..886b7e59c 100644
--- a/doc/dlt_demo_setup.md
+++ b/doc/dlt_demo_setup.md
@@ -58,7 +58,7 @@ WARNING ```(-l 3)``` containing a string payload.
 ## Read logs
 The DLT daemon now has the messages in its buffer and will keep them there until
 they are fetched. A mighty tool for receiving and processing log messages is the
-[DLT-Viewer](https://github.com/GENIVI/dlt-viewer), which also provides a
+[DLT-Viewer](https://github.com/COVESA/dlt-viewer), which also provides a
 graphical UI. For now, a simple command line client is absolutely sufficient:
 ```bash
 $ dlt-receive -a localhost
diff --git a/doc/dlt_design_specification.md b/doc/dlt_design_specification.md
index b5f8cc75c..677f42537 100644
--- a/doc/dlt_design_specification.md
+++ b/doc/dlt_design_specification.md
@@ -3,14 +3,14 @@ SPDX license identifier: MPL-2.0
 
 Copyright (C) 2011-2015, BMW AG
 
-This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 
 This Source Code Form is subject to the terms of the
 Mozilla Public License (MPL), v. 2.0.
 If a copy of the MPL was not distributed with this file,
 You can obtain one at http://mozilla.org/MPL/2.0/
 
-For further information see http://www.genivi.org/
+For further information see http://www.covesa.org/
 ***
 
 # DLT Design Specification
@@ -20,12 +20,12 @@ Alexander Wenzel <Alexander.AW.Wenzel@bmw.de>
 Luong Hong Duy Khanh <KHANH.LUONGHONGDUY@vn.bosch.com>
 0.0.2, 2020/04/10: Update and convert to markdown format
 
-![genivilogo](images/genivilogo.png "GENIVI")
+![covesalogo](images/covesalogo.png "COVESA")
 
 ## Purpose
 This document specifies the usage of the DLT daemon v2 and also the internal
 functionality of the DLT daemon v2. The DLT daemon v2 is a complete rework of
-the DLT daemon v1, which is part of the GENIVI 1.0 release.
+the DLT daemon v1, which is part of the COVESA 1.0 release.
 
 The DLT daemon component is based on the
 [AUTOSAR 4.0 standard DLT](https://www.autosar.org/fileadmin/user_upload/standards/classic/4-0/AUTOSAR_SWS_DiagnosticLogAndTrace.pdf)
@@ -36,11 +36,11 @@ The DLT daemon component is based on the
 
 ![dlt_overview](images/dlt_overview.png "DLT OVERVIEW")
 
-The DLT daemon is the central component in GENIVI, where logs and traces are
+The DLT daemon is the central component in COVESA, where logs and traces are
 gathered from the DLT user and different applications, stored optionally
 temporarily or permanently in a file in the ECU. The DLT daemon forwards all
 logs and traces to a connected DLT client application, which can run directly
-on the GENIVI system or more likely on an external tester device.
+on the COVESA system or more likely on an external tester device.
 
 The DLT client can send control messages to the daemon, e.g. to set individual
 log levels of applications and contexts or get the list of applications and
diff --git a/doc/dlt_example_user.md b/doc/dlt_example_user.md
index 0aa9d0e10..a6305c96f 100644
--- a/doc/dlt_example_user.md
+++ b/doc/dlt_example_user.md
@@ -107,7 +107,7 @@ Copyright (C) 2020 ADIT GmbH. License MPL-2.0: Mozilla Public License version 2.
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt_gateway.conf.5.md b/doc/dlt_gateway.conf.5.md
index 61eb0637c..2beed68fa 100644
--- a/doc/dlt_gateway.conf.5.md
+++ b/doc/dlt_gateway.conf.5.md
@@ -112,7 +112,7 @@ Copyright (C) 2020 Advanced Driver Information Technology, Bosch and DENSO. Lice
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/doc/dlt_glossary.md b/doc/dlt_glossary.md
index 843b9abee..4a016f079 100644
--- a/doc/dlt_glossary.md
+++ b/doc/dlt_glossary.md
@@ -12,7 +12,7 @@ Control Message	| A control message is send by a connected client application (e
 DLT Daemon | The DLT Daemon is the central component which receives all logs and traces from the DLT user applications. The DLT Daemon forwards all logs and traces to a connected DLT client (e.g. Log Viewer) or stores them optionally in a file on the target.
 DLT Library | Provides applications (esp. DLT users) with an API to produce DLT messages and to handle DLT Control Messages accordingly.
 DLT User | A DLT User is a type of application that produces log messages. It typically uses the DLT library to produce the messages and resembles an ECU.
-DLT Viewer | The DLT Viewer is the GENIVI Log Viewer implementation. It is a Qt-based desktop application able to run on Windows and Linux operating systems. Further information and source code can be found here: https://github.com/GENIVI/dlt-viewer
+DLT Viewer | The DLT Viewer is the COVESA Log Viewer implementation. It is a Qt-based desktop application able to run on Windows and Linux operating systems. Further information and source code can be found here: https://github.com/COVESA/dlt-viewer
 Gateway DLT Daemon | In a Multi-Node system, the DLT Daemon running on the Node directly connected to a Log Viewer is called Gateway DLT Daemon (if configured as Gateway). It forwards log messages from Passive DLT Daemons to Log Viewers and command/control messages from Log Viewer(s) to Passive DLT Daemon(s).
 Injection Message | An injection message is a control message for a specific DLT application.
 Log Consumer | A log consumer is an application connected to the DLT Daemon (DLT Client) that receives log messages and stores (e.g. Logstorage) or displays them (e.g. Log Viewer). A log consumer can run on the same operating system or on a remote host pc.
diff --git a/doc/doxygen.cfg.cmake b/doc/doxygen.cfg.cmake
index 16e1ff540..614b22935 100644
--- a/doc/doxygen.cfg.cmake
+++ b/doc/doxygen.cfg.cmake
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 # Doxyfile 1.5.8
@@ -46,7 +46,7 @@ PROJECT_NAME           = @PROJECT_NAME@
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = @GENIVI_PROJECT_VERSION@
+PROJECT_NUMBER         = @COVESA_PROJECT_VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/doc/extended_network_trace_doxygen.cfg.cmake b/doc/extended_network_trace_doxygen.cfg.cmake
index 2dba7596c..f4f77d82d 100644
--- a/doc/extended_network_trace_doxygen.cfg.cmake
+++ b/doc/extended_network_trace_doxygen.cfg.cmake
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 # Doxyfile 1.5.8
@@ -46,7 +46,7 @@ PROJECT_NAME           = @PROJECT_NAME@ - ExtendedNetworkTrace
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER         = @GENIVI_PROJECT_VERSION@
+PROJECT_NUMBER         = @COVESA_PROJECT_VERSION@
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.
diff --git a/doc/images/genivilogo.png b/doc/images/genivilogo.png
deleted file mode 100644
index d016ec8bd0db9d69aa1f9ef53c8172020b46b4ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9537
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
aDd~{`-U(L3uMnPzLdZ%fqVrMDeEtWSqGT%o

diff --git a/doc/mainpage.h b/doc/mainpage.h
index af5e4e7b1..dc55aaf9f 100644
--- a/doc/mainpage.h
+++ b/doc/mainpage.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
@@ -21,12 +21,12 @@
 License MPL-2.0: Mozilla Public License version 2.0 http://mozilla.org/MPL/2.0/.
 
 \par More information
-can be found at http://projects.genivi.org/diagnostic-log-trace/ \n
+can be found at http://projects.covesa.org/diagnostic-log-trace/ \n
 
 \par About DLT
 DLT is a reusable open source software component for standardized logging and tracing in infotainment ECUs based on the AUTOSAR 4.0 standard.
 The goal of DLT is the consolidation of the existing variety of logging and tracing protocols on one format.
 
 
-\image html genivilogo.png
+\image html covesalogo.png
 */
diff --git a/doc/test/dlt-test-qnx-slogger.1.md b/doc/test/dlt-test-qnx-slogger.1.md
index ec9eadb09..061765727 100644
--- a/doc/test/dlt-test-qnx-slogger.1.md
+++ b/doc/test/dlt-test-qnx-slogger.1.md
@@ -53,7 +53,7 @@ Copyright (C) 2021 ADIT GmbH. License MPL-2.0: Mozilla Public License version 2.
 
 # BUGS
 
-See Github issue: <https://github.com/GENIVI/dlt-daemon/issues>
+See Github issue: <https://github.com/COVESA/dlt-daemon/issues>
 
 # SEE ALSO
 
diff --git a/examples/example1/CMakeLists.txt b/examples/example1/CMakeLists.txt
index 0adcd6b5b..60644a136 100644
--- a/examples/example1/CMakeLists.txt
+++ b/examples/example1/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 #
diff --git a/examples/example1/example1.c b/examples/example1/example1.c
index f6d59d1a7..c1340ef83 100644
--- a/examples/example1/example1.c
+++ b/examples/example1/example1.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/examples/example2/CMakeLists.txt b/examples/example2/CMakeLists.txt
index 0e6e0b944..66a4f2460 100644
--- a/examples/example2/CMakeLists.txt
+++ b/examples/example2/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 #
diff --git a/examples/example2/dlt_id.h b/examples/example2/dlt_id.h
index a13f838e6..ad5f29e3e 100644
--- a/examples/example2/dlt_id.h
+++ b/examples/example2/dlt_id.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /* generated file, do not edit */
diff --git a/examples/example2/example2.c b/examples/example2/example2.c
index 2061bfb2b..6069b0d5c 100644
--- a/examples/example2/example2.c
+++ b/examples/example2/example2.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/examples/example3/CMakeLists.txt b/examples/example3/CMakeLists.txt
index 09dd0dc3f..45b746755 100644
--- a/examples/example3/CMakeLists.txt
+++ b/examples/example3/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 #
diff --git a/examples/example3/dlt_id.h b/examples/example3/dlt_id.h
index ed5bcb275..3c672088f 100644
--- a/examples/example3/dlt_id.h
+++ b/examples/example3/dlt_id.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /* generated file, do not edit */
diff --git a/examples/example3/example3.c b/examples/example3/example3.c
index ab7490a57..f8b918ef6 100644
--- a/examples/example3/example3.c
+++ b/examples/example3/example3.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/examples/example4/CMakeLists.txt b/examples/example4/CMakeLists.txt
index e973cf3f1..53a4fade3 100644
--- a/examples/example4/CMakeLists.txt
+++ b/examples/example4/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 #
diff --git a/examples/example4/example4.c b/examples/example4/example4.c
index 78748f21c..99c42679f 100644
--- a/examples/example4/example4.c
+++ b/examples/example4/example4.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index 284984efc..c8c507e8b 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 
diff --git a/include/dlt/CMakeLists.txt b/include/dlt/CMakeLists.txt
index c2ee49a8d..476a08632 100644
--- a/include/dlt/CMakeLists.txt
+++ b/include/dlt/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 if(WITH_DLT_DISABLE_MACRO)
diff --git a/include/dlt/dlt.h b/include/dlt/dlt.h
index 3fb4b75fd..669c3f375 100644
--- a/include/dlt/dlt.h
+++ b/include/dlt/dlt.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_client.h b/include/dlt/dlt_client.h
index f1802cbbd..d9cfe1318 100644
--- a/include/dlt/dlt_client.h
+++ b/include/dlt/dlt_client.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_common.h b/include/dlt/dlt_common.h
index 1757873ae..c37a9ce63 100644
--- a/include/dlt/dlt_common.h
+++ b/include/dlt/dlt_common.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_common_api.h b/include/dlt/dlt_common_api.h
index b81c4897b..809788bc7 100644
--- a/include/dlt/dlt_common_api.h
+++ b/include/dlt/dlt_common_api.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_cpp_extension.hpp b/include/dlt/dlt_cpp_extension.hpp
index cd82896df..572697fc3 100644
--- a/include/dlt/dlt_cpp_extension.hpp
+++ b/include/dlt/dlt_cpp_extension.hpp
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2015  Intel Corporation
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_filetransfer.h b/include/dlt/dlt_filetransfer.h
index 5404d1a32..ce3ca1964 100644
--- a/include/dlt/dlt_filetransfer.h
+++ b/include/dlt/dlt_filetransfer.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_multiple_files.h b/include/dlt/dlt_multiple_files.h
index d5e13c756..d8d7ed075 100644
--- a/include/dlt/dlt_multiple_files.h
+++ b/include/dlt/dlt_multiple_files.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_offline_trace.h b/include/dlt/dlt_offline_trace.h
index 8e571eb65..68c7adc7b 100644
--- a/include/dlt/dlt_offline_trace.h
+++ b/include/dlt/dlt_offline_trace.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_protocol.h b/include/dlt/dlt_protocol.h
index 1e5796292..12058ab99 100644
--- a/include/dlt/dlt_protocol.h
+++ b/include/dlt/dlt_protocol.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_shm.h b/include/dlt/dlt_shm.h
index 0c6ee4229..7bd54a7c7 100644
--- a/include/dlt/dlt_shm.h
+++ b/include/dlt/dlt_shm.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_types.h b/include/dlt/dlt_types.h
index 6dd92d272..e36a32c6b 100644
--- a/include/dlt/dlt_types.h
+++ b/include/dlt/dlt_types.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_user.h.in b/include/dlt/dlt_user.h.in
index b377daca0..ae9c37cf7 100644
--- a/include/dlt/dlt_user.h.in
+++ b/include/dlt/dlt_user.h.in
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/include/dlt/dlt_user_macros.h b/include/dlt/dlt_user_macros.h
index 1538c4eb1..8a5ed2d84 100644
--- a/include/dlt/dlt_user_macros.h
+++ b/include/dlt/dlt_user_macros.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 625533672..1f000a1af 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 add_subdirectory( lib )
diff --git a/src/adaptor/CMakeLists.txt b/src/adaptor/CMakeLists.txt
index 578bbe8a7..790b2c142 100644
--- a/src/adaptor/CMakeLists.txt
+++ b/src/adaptor/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 if (WITH_DLT_ADAPTOR_STDIN OR WITH_DLT_ADAPTOR)
diff --git a/src/adaptor/dlt-adaptor-stdin.c b/src/adaptor/dlt-adaptor-stdin.c
index 1df415c97..8c755d48c 100644
--- a/src/adaptor/dlt-adaptor-stdin.c
+++ b/src/adaptor/dlt-adaptor-stdin.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/adaptor/dlt-adaptor-udp.c b/src/adaptor/dlt-adaptor-udp.c
index b2033de8a..f3826d307 100644
--- a/src/adaptor/dlt-adaptor-udp.c
+++ b/src/adaptor/dlt-adaptor-udp.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/android/dlt-logd-converter.cpp b/src/android/dlt-logd-converter.cpp
index d623b9c2a..bdb648675 100644
--- a/src/android/dlt-logd-converter.cpp
+++ b/src/android/dlt-logd-converter.cpp
@@ -12,7 +12,7 @@
  * this file, You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * \file: dlt-logd-convert
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  * @licence end@
  */
 #include <cerrno>
diff --git a/src/console/CMakeLists.txt b/src/console/CMakeLists.txt
index b609405d9..e5827a833 100644
--- a/src/console/CMakeLists.txt
+++ b/src/console/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 set(dlt_control_common_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/dlt-control-common.c)
diff --git a/src/console/dlt-control-common.c b/src/console/dlt-control-common.c
index 4b27eac68..e869cc386 100644
--- a/src/console/dlt-control-common.c
+++ b/src/console/dlt-control-common.c
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -16,7 +16,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-control-common.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/console/dlt-control-common.h b/src/console/dlt-control-common.h
index 73a8e2159..afd2577c7 100644
--- a/src/console/dlt-control-common.h
+++ b/src/console/dlt-control-common.h
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -16,7 +16,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-control-common.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #ifndef _DLT_CONTROL_COMMON_H_
diff --git a/src/console/dlt-control.c b/src/console/dlt-control.c
index 8fbf9f02d..c1bc25a3f 100644
--- a/src/console/dlt-control.c
+++ b/src/console/dlt-control.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/console/dlt-convert.c b/src/console/dlt-convert.c
index 8c72b60ba..41800db8e 100644
--- a/src/console/dlt-convert.c
+++ b/src/console/dlt-convert.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/console/dlt-passive-node-ctrl.c b/src/console/dlt-passive-node-ctrl.c
index 5e6b033e8..481dab34e 100644
--- a/src/console/dlt-passive-node-ctrl.c
+++ b/src/console/dlt-passive-node-ctrl.c
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -15,7 +15,7 @@
  * \author Christoph Lipka <clipka@jp.adit-jv.com> ADIT 2015
  *
  * \file dlt-passive-node-ctrl.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/console/dlt-receive.c b/src/console/dlt-receive.c
index dec4713ea..8b1cc3bd4 100644
--- a/src/console/dlt-receive.c
+++ b/src/console/dlt-receive.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/console/dlt-sortbytimestamp.c b/src/console/dlt-sortbytimestamp.c
index 82fd5d039..c7125345a 100644
--- a/src/console/dlt-sortbytimestamp.c
+++ b/src/console/dlt-sortbytimestamp.c
@@ -4,14 +4,14 @@
  * Copyright (C) 2018, Codethink Ltd.
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/console/logstorage/CMakeLists.txt b/src/console/logstorage/CMakeLists.txt
index ce19f74db..d5fc29311 100644
--- a/src/console/logstorage/CMakeLists.txt
+++ b/src/console/logstorage/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2015, ADIT GmbH
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 add_definitions(-Werror)
 
diff --git a/src/console/logstorage/dlt-logstorage-common.c b/src/console/logstorage/dlt-logstorage-common.c
index 0c06a55e8..844b2dc07 100644
--- a/src/console/logstorage/dlt-logstorage-common.c
+++ b/src/console/logstorage/dlt-logstorage-common.c
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -17,7 +17,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-common.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/console/logstorage/dlt-logstorage-common.h b/src/console/logstorage/dlt-logstorage-common.h
index 93cb50b6a..0a695dfaa 100644
--- a/src/console/logstorage/dlt-logstorage-common.h
+++ b/src/console/logstorage/dlt-logstorage-common.h
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -17,7 +17,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-common.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #ifndef _DLT_LOGSTORAGE_COMMON_H_
diff --git a/src/console/logstorage/dlt-logstorage-ctrl.c b/src/console/logstorage/dlt-logstorage-ctrl.c
index 2629df6f6..44f05f15b 100644
--- a/src/console/logstorage/dlt-logstorage-ctrl.c
+++ b/src/console/logstorage/dlt-logstorage-ctrl.c
@@ -2,7 +2,7 @@
  * Copyright (C) 2013 - 2015  Advanced Driver Information Technology.
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO. *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -16,7 +16,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-ctrl.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 /*******************************************************************************
 **                                                                            **
diff --git a/src/console/logstorage/dlt-logstorage-ctrl.h b/src/console/logstorage/dlt-logstorage-ctrl.h
index 5f69c9702..c7d376c62 100644
--- a/src/console/logstorage/dlt-logstorage-ctrl.h
+++ b/src/console/logstorage/dlt-logstorage-ctrl.h
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -16,7 +16,7 @@
  * \author Christoph Lipka <clipka@jp.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-ctrl.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #ifndef _DLT_LOGSTORAGE_CONTROL_H_
diff --git a/src/console/logstorage/dlt-logstorage-list.c b/src/console/logstorage/dlt-logstorage-list.c
index d6666b4d2..20e991166 100644
--- a/src/console/logstorage/dlt-logstorage-list.c
+++ b/src/console/logstorage/dlt-logstorage-list.c
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -17,7 +17,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-list.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/console/logstorage/dlt-logstorage-list.h b/src/console/logstorage/dlt-logstorage-list.h
index a1bf3a0ab..17bf88424 100644
--- a/src/console/logstorage/dlt-logstorage-list.h
+++ b/src/console/logstorage/dlt-logstorage-list.h
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -17,7 +17,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-list.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #ifndef _DLT_LOGSTORAGE_LIST_H_
diff --git a/src/console/logstorage/dlt-logstorage-prop.h b/src/console/logstorage/dlt-logstorage-prop.h
index 2467ca8ee..384878b7c 100644
--- a/src/console/logstorage/dlt-logstorage-prop.h
+++ b/src/console/logstorage/dlt-logstorage-prop.h
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  * \copyright
  * This Source Code Form is subject to the terms of the
@@ -14,7 +14,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-udev.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #ifndef _DLT_LOGSTORAGE_PROP_H_
diff --git a/src/console/logstorage/dlt-logstorage-udev.c b/src/console/logstorage/dlt-logstorage-udev.c
index b23ea7295..e35474e19 100644
--- a/src/console/logstorage/dlt-logstorage-udev.c
+++ b/src/console/logstorage/dlt-logstorage-udev.c
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  *
  * \copyright
@@ -16,7 +16,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-udev.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/console/logstorage/dlt-logstorage-udev.h b/src/console/logstorage/dlt-logstorage-udev.h
index 804bf3002..9d2d70298 100644
--- a/src/console/logstorage/dlt-logstorage-udev.h
+++ b/src/console/logstorage/dlt-logstorage-udev.h
@@ -3,7 +3,7 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project Dlt - Diagnostic Log and Trace console apps.
+ * This file is part of COVESA Project Dlt - Diagnostic Log and Trace console apps.
  *
  * \copyright
  * This Source Code Form is subject to the terms of the
@@ -14,7 +14,7 @@
  * \author Frederic Berat <fberat@de.adit-jv.com> ADIT 2015
  *
  * \file dlt-logstorage-udev.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #ifndef _DLT_LOGSTORAGE_UDEV_H_
diff --git a/src/core_dump_handler/50-coredump.conf.cmake b/src/core_dump_handler/50-coredump.conf.cmake
index 5b14e1d84..04ae0d783 100644
--- a/src/core_dump_handler/50-coredump.conf.cmake
+++ b/src/core_dump_handler/50-coredump.conf.cmake
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 kernel.core_pattern=|@CMAKE_INSTALL_PREFIX@/bin/dlt-cdh %t %p %s %e
diff --git a/src/core_dump_handler/CMakeLists.txt b/src/core_dump_handler/CMakeLists.txt
index d77ba4c3e..e820fb932 100644
--- a/src/core_dump_handler/CMakeLists.txt
+++ b/src/core_dump_handler/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 if(WITH_DLT_COREDUMPHANDLER)
diff --git a/src/core_dump_handler/dlt_cdh.c b/src/core_dump_handler/dlt_cdh.c
index b2bf89188..3816ce518 100644
--- a/src/core_dump_handler/dlt_cdh.c
+++ b/src/core_dump_handler/dlt_cdh.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/dlt_cdh.h b/src/core_dump_handler/dlt_cdh.h
index cf2904cc5..d572ecf3f 100644
--- a/src/core_dump_handler/dlt_cdh.h
+++ b/src/core_dump_handler/dlt_cdh.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/dlt_cdh_context.c b/src/core_dump_handler/dlt_cdh_context.c
index 1f7fa981c..041f84c8a 100644
--- a/src/core_dump_handler/dlt_cdh_context.c
+++ b/src/core_dump_handler/dlt_cdh_context.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/dlt_cdh_coredump.c b/src/core_dump_handler/dlt_cdh_coredump.c
index 3aabe2d06..4a1d767bd 100644
--- a/src/core_dump_handler/dlt_cdh_coredump.c
+++ b/src/core_dump_handler/dlt_cdh_coredump.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/dlt_cdh_cpuinfo.h b/src/core_dump_handler/dlt_cdh_cpuinfo.h
index eb5e04c06..58eebfc92 100644
--- a/src/core_dump_handler/dlt_cdh_cpuinfo.h
+++ b/src/core_dump_handler/dlt_cdh_cpuinfo.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/dlt_cdh_crashid.c b/src/core_dump_handler/dlt_cdh_crashid.c
index c2d81e435..bca44e0eb 100644
--- a/src/core_dump_handler/dlt_cdh_crashid.c
+++ b/src/core_dump_handler/dlt_cdh_crashid.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/dlt_cdh_definitions.h b/src/core_dump_handler/dlt_cdh_definitions.h
index 92f8bb6e4..9f1f0cdda 100644
--- a/src/core_dump_handler/dlt_cdh_definitions.h
+++ b/src/core_dump_handler/dlt_cdh_definitions.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/dlt_cdh_streamer.c b/src/core_dump_handler/dlt_cdh_streamer.c
index 363f70e91..fa87e4f60 100644
--- a/src/core_dump_handler/dlt_cdh_streamer.c
+++ b/src/core_dump_handler/dlt_cdh_streamer.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/dlt_cdh_streamer.h b/src/core_dump_handler/dlt_cdh_streamer.h
index 942024cbb..931379f19 100644
--- a/src/core_dump_handler/dlt_cdh_streamer.h
+++ b/src/core_dump_handler/dlt_cdh_streamer.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/i686/dlt_cdh_cpuinfo.c b/src/core_dump_handler/i686/dlt_cdh_cpuinfo.c
index 19eb3e098..000e26ad6 100644
--- a/src/core_dump_handler/i686/dlt_cdh_cpuinfo.c
+++ b/src/core_dump_handler/i686/dlt_cdh_cpuinfo.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/core_dump_handler/x86_64/dlt_cdh_cpuinfo.c b/src/core_dump_handler/x86_64/dlt_cdh_cpuinfo.c
index 8fb20bb59..a06c6b9ac 100644
--- a/src/core_dump_handler/x86_64/dlt_cdh_cpuinfo.c
+++ b/src/core_dump_handler/x86_64/dlt_cdh_cpuinfo.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index b8b480a2e..4ca2a49d2 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
index 5c3c9ef32..4fa4d3f7c 100644
--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt-daemon.h b/src/daemon/dlt-daemon.h
index 63de44b49..d3bb9785e 100644
--- a/src/daemon/dlt-daemon.h
+++ b/src/daemon/dlt-daemon.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt-daemon_cfg.h b/src/daemon/dlt-daemon_cfg.h
index d9a0610aa..5da2149b2 100644
--- a/src/daemon/dlt-daemon_cfg.h
+++ b/src/daemon/dlt-daemon_cfg.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_client.c b/src/daemon/dlt_daemon_client.c
index 5d849b026..19292b97d 100644
--- a/src/daemon/dlt_daemon_client.c
+++ b/src/daemon/dlt_daemon_client.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_client.h b/src/daemon/dlt_daemon_client.h
index 75e12112c..6ec55de64 100644
--- a/src/daemon/dlt_daemon_client.h
+++ b/src/daemon/dlt_daemon_client.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index a77c7ced7..4b5120c02 100644
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_common.h b/src/daemon/dlt_daemon_common.h
index 805c5b453..85eb5faec 100644
--- a/src/daemon/dlt_daemon_common.h
+++ b/src/daemon/dlt_daemon_common.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_common_cfg.h b/src/daemon/dlt_daemon_common_cfg.h
index 77c6ca66c..9122f2080 100644
--- a/src/daemon/dlt_daemon_common_cfg.h
+++ b/src/daemon/dlt_daemon_common_cfg.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_connection.c b/src/daemon/dlt_daemon_connection.c
index 1658e269a..3b7e4fe2e 100644
--- a/src/daemon/dlt_daemon_connection.c
+++ b/src/daemon/dlt_daemon_connection.c
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_connection.h b/src/daemon/dlt_daemon_connection.h
index 316784fbc..3e1c58db6 100644
--- a/src/daemon/dlt_daemon_connection.h
+++ b/src/daemon/dlt_daemon_connection.h
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_connection_types.h b/src/daemon/dlt_daemon_connection_types.h
index 4bf0db4d7..470e4abf0 100644
--- a/src/daemon/dlt_daemon_connection_types.h
+++ b/src/daemon/dlt_daemon_connection_types.h
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_event_handler.c b/src/daemon/dlt_daemon_event_handler.c
index db5767a5b..74961a61a 100644
--- a/src/daemon/dlt_daemon_event_handler.c
+++ b/src/daemon/dlt_daemon_event_handler.c
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_event_handler.h b/src/daemon/dlt_daemon_event_handler.h
index 62ef89bed..4c37032e9 100644
--- a/src/daemon/dlt_daemon_event_handler.h
+++ b/src/daemon/dlt_daemon_event_handler.h
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_event_handler_types.h b/src/daemon/dlt_daemon_event_handler_types.h
index a879d4d66..92a6ff0c5 100644
--- a/src/daemon/dlt_daemon_event_handler_types.h
+++ b/src/daemon/dlt_daemon_event_handler_types.h
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_offline_logstorage.c b/src/daemon/dlt_daemon_offline_logstorage.c
index c796d06e1..23750154e 100644
--- a/src/daemon/dlt_daemon_offline_logstorage.c
+++ b/src/daemon/dlt_daemon_offline_logstorage.c
@@ -15,7 +15,7 @@
  * \author Christoph Lipka <clipka@jp.adit-jv.com> ADIT 2015
  *
  * \file: dlt_daemon_offline_logstorage.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #include <stdio.h>
diff --git a/src/daemon/dlt_daemon_offline_logstorage.h b/src/daemon/dlt_daemon_offline_logstorage.h
index cd7803dcf..3ff4116e3 100644
--- a/src/daemon/dlt_daemon_offline_logstorage.h
+++ b/src/daemon/dlt_daemon_offline_logstorage.h
@@ -15,7 +15,7 @@
  * \author Christoph Lipka <clipka@jp.adit-jv.com> ADIT 2015
  *
  * \file: dlt_daemon_offline_logstorage.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/daemon/dlt_daemon_offline_logstorage_internal.h b/src/daemon/dlt_daemon_offline_logstorage_internal.h
index 0e43886bd..375525a68 100644
--- a/src/daemon/dlt_daemon_offline_logstorage_internal.h
+++ b/src/daemon/dlt_daemon_offline_logstorage_internal.h
@@ -14,7 +14,7 @@
  * \author Aditya Paluri <venkataaditya.paluri@in.bosch.com> ADIT 2018
  *
  * \file: dlt_daemon_offline_logstorage_internal.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/daemon/dlt_daemon_serial.c b/src/daemon/dlt_daemon_serial.c
index 272a3dc9a..3033dca4f 100644
--- a/src/daemon/dlt_daemon_serial.c
+++ b/src/daemon/dlt_daemon_serial.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_serial.h b/src/daemon/dlt_daemon_serial.h
index 08fdfacaf..fa611e48a 100644
--- a/src/daemon/dlt_daemon_serial.h
+++ b/src/daemon/dlt_daemon_serial.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_socket.c b/src/daemon/dlt_daemon_socket.c
index 803b821eb..a4daddf82 100644
--- a/src/daemon/dlt_daemon_socket.c
+++ b/src/daemon/dlt_daemon_socket.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_socket.h b/src/daemon/dlt_daemon_socket.h
index c2cced6a2..e8661302a 100644
--- a/src/daemon/dlt_daemon_socket.h
+++ b/src/daemon/dlt_daemon_socket.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_unix_socket.c b/src/daemon/dlt_daemon_unix_socket.c
index 4b9f4725c..06844be2f 100644
--- a/src/daemon/dlt_daemon_unix_socket.c
+++ b/src/daemon/dlt_daemon_unix_socket.c
@@ -4,14 +4,14 @@
  * Copyright (C) 2015, Advanced Driver Information Technology
  * Copyright of Advanced Driver Information Technology, Bosch and Denso
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/dlt_daemon_unix_socket.h b/src/daemon/dlt_daemon_unix_socket.h
index b8b944d30..b6e33ac4d 100644
--- a/src/daemon/dlt_daemon_unix_socket.h
+++ b/src/daemon/dlt_daemon_unix_socket.h
@@ -4,14 +4,14 @@
  * Copyright (C) 2015, Advanced Driver Information Technology
  * Copyright of Advanced Driver Information Technology, Bosch and Denso.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/udp_connection/dlt_daemon_udp_common_socket.h b/src/daemon/udp_connection/dlt_daemon_udp_common_socket.h
index d780851bc..c3f231bb1 100644
--- a/src/daemon/udp_connection/dlt_daemon_udp_common_socket.h
+++ b/src/daemon/udp_connection/dlt_daemon_udp_common_socket.h
@@ -2,11 +2,11 @@
  * Copyright (c) 2019 LG Electronics Inc.
  * SPDX-License-Identifier: MPL-2.0
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/udp_connection/dlt_daemon_udp_socket.c b/src/daemon/udp_connection/dlt_daemon_udp_socket.c
index 2ef629ad5..4c40cda8b 100644
--- a/src/daemon/udp_connection/dlt_daemon_udp_socket.c
+++ b/src/daemon/udp_connection/dlt_daemon_udp_socket.c
@@ -2,11 +2,11 @@
  * Copyright (c) 2019 LG Electronics Inc.
  * SPDX-License-Identifier: MPL-2.0
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/daemon/udp_connection/dlt_daemon_udp_socket.h b/src/daemon/udp_connection/dlt_daemon_udp_socket.h
index caeaacd85..6b5c82a2b 100644
--- a/src/daemon/udp_connection/dlt_daemon_udp_socket.h
+++ b/src/daemon/udp_connection/dlt_daemon_udp_socket.h
@@ -2,11 +2,11 @@
  * Copyright (c) 2019 LG Electronics Inc.
  * SPDX-License-Identifier: MPL-2.0
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt
index 7dde278cf..d99f38eba 100644
--- a/src/dbus/CMakeLists.txt
+++ b/src/dbus/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 include_directories(
diff --git a/src/dbus/dlt-dbus-options.c b/src/dbus/dlt-dbus-options.c
index 88e13fa25..b2d8a7e23 100644
--- a/src/dbus/dlt-dbus-options.c
+++ b/src/dbus/dlt-dbus-options.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/dbus/dlt-dbus.c b/src/dbus/dlt-dbus.c
index e55e740dc..b7cb8cade 100644
--- a/src/dbus/dlt-dbus.c
+++ b/src/dbus/dlt-dbus.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/dbus/dlt-dbus.h b/src/dbus/dlt-dbus.h
index 4609a808a..13b25e2f2 100644
--- a/src/dbus/dlt-dbus.h
+++ b/src/dbus/dlt-dbus.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/dlt-qnx-system/CMakeLists.txt b/src/dlt-qnx-system/CMakeLists.txt
index 9a9db465d..5a82410e0 100644
--- a/src/dlt-qnx-system/CMakeLists.txt
+++ b/src/dlt-qnx-system/CMakeLists.txt
@@ -4,14 +4,14 @@
 #
 # Copyright (C) 2018 Advanced Driver Information Technology.
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 # @licence end@
 #######
 
diff --git a/src/dlt-qnx-system/dlt-qnx-slogger2-adapter.cpp b/src/dlt-qnx-system/dlt-qnx-slogger2-adapter.cpp
index dfa1a19a9..2e5f78e21 100644
--- a/src/dlt-qnx-system/dlt-qnx-slogger2-adapter.cpp
+++ b/src/dlt-qnx-system/dlt-qnx-slogger2-adapter.cpp
@@ -15,7 +15,7 @@
  * \author Felix Herrmann <fherrmann@de.adit-jv.com> ADIT 2020
  *
  * \file: dlt-qnx-slogger2-adapter.cpp
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 #include <cerrno>
 #include <cstring>
diff --git a/src/dlt-qnx-system/dlt-qnx-system.c b/src/dlt-qnx-system/dlt-qnx-system.c
index eef460f37..69d1a9e58 100644
--- a/src/dlt-qnx-system/dlt-qnx-system.c
+++ b/src/dlt-qnx-system/dlt-qnx-system.c
@@ -14,7 +14,7 @@
  * \author Nguyen Dinh Thi <Thi.NguyenDinh@vn.bosch.com>
  *
  * \file: dlt-qnx-system.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  * @licence end@
  */
 
diff --git a/src/dlt-qnx-system/dlt-qnx-system.h b/src/dlt-qnx-system/dlt-qnx-system.h
index ad6dc64bb..8935b93c5 100644
--- a/src/dlt-qnx-system/dlt-qnx-system.h
+++ b/src/dlt-qnx-system/dlt-qnx-system.h
@@ -14,7 +14,7 @@
  * \author Nguyen Dinh Thi <Thi.NguyenDinh@vn.bosch.com> ADIT 2020
  *
  * \file: dlt-qnx-system.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  * @licence end@
  */
 
diff --git a/src/examples/CMakeLists.txt b/src/examples/CMakeLists.txt
index b25fc3ba7..0ee6d058f 100644
--- a/src/examples/CMakeLists.txt
+++ b/src/examples/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 set(TARGET_LIST dlt-example-user-func)
diff --git a/src/examples/dlt-example-filetransfer.c b/src/examples/dlt-example-filetransfer.c
index 8768e1ea0..8021509c8 100644
--- a/src/examples/dlt-example-filetransfer.c
+++ b/src/examples/dlt-example-filetransfer.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/examples/dlt-example-multicast-clientmsg-view.c b/src/examples/dlt-example-multicast-clientmsg-view.c
index f68473c42..c00537e59 100644
--- a/src/examples/dlt-example-multicast-clientmsg-view.c
+++ b/src/examples/dlt-example-multicast-clientmsg-view.c
@@ -2,11 +2,11 @@
  * Copyright (c) 2019 LG Electronics Inc.
  * SPDX-License-Identifier: MPL-2.0
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/examples/dlt-example-user-common-api.c b/src/examples/dlt-example-user-common-api.c
index b0a8bcc8e..a4dc7b6a1 100644
--- a/src/examples/dlt-example-user-common-api.c
+++ b/src/examples/dlt-example-user-common-api.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/examples/dlt-example-user-func.c b/src/examples/dlt-example-user-func.c
index a6d20dcc3..3c327fdc3 100644
--- a/src/examples/dlt-example-user-func.c
+++ b/src/examples/dlt-example-user-func.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/examples/dlt-example-user.c b/src/examples/dlt-example-user.c
index 8c79c42b8..b3a1cccff 100644
--- a/src/examples/dlt-example-user.c
+++ b/src/examples/dlt-example-user.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/gateway/CMakeLists.txt b/src/gateway/CMakeLists.txt
index 8c60ac5fa..e6b40f8de 100644
--- a/src/gateway/CMakeLists.txt
+++ b/src/gateway/CMakeLists.txt
@@ -5,14 +5,14 @@
 # This code is developed by Advanced Driver Information Technology.
 # Copyright of Advanced Driver Information Technology, Bosch and DENSO.
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 INSTALL(FILES dlt_gateway.conf
diff --git a/src/gateway/dlt_gateway.c b/src/gateway/dlt_gateway.c
index 3d832cef0..21b447ffc 100644
--- a/src/gateway/dlt_gateway.c
+++ b/src/gateway/dlt_gateway.c
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/gateway/dlt_gateway.h b/src/gateway/dlt_gateway.h
index 9c8c9919e..722a9d96b 100644
--- a/src/gateway/dlt_gateway.h
+++ b/src/gateway/dlt_gateway.h
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/gateway/dlt_gateway_internal.h b/src/gateway/dlt_gateway_internal.h
index 5e83fc169..0aa172630 100644
--- a/src/gateway/dlt_gateway_internal.h
+++ b/src/gateway/dlt_gateway_internal.h
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/gateway/dlt_gateway_types.h b/src/gateway/dlt_gateway_types.h
index 1a7f64503..9213cad90 100644
--- a/src/gateway/dlt_gateway_types.h
+++ b/src/gateway/dlt_gateway_types.h
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/CMakeLists.txt b/src/kpi/CMakeLists.txt
index 82a681209..22f66048b 100644
--- a/src/kpi/CMakeLists.txt
+++ b/src/kpi/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 set (dlt_kpi_SRCS dlt-kpi.c dlt-kpi-options.c dlt-kpi-process.c dlt-kpi-process-list.c dlt-kpi-common.c dlt-kpi-interrupt.c)
diff --git a/src/kpi/dlt-kpi-common.c b/src/kpi/dlt-kpi-common.c
index b186ef467..d905c1079 100644
--- a/src/kpi/dlt-kpi-common.c
+++ b/src/kpi/dlt-kpi-common.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi-common.h b/src/kpi/dlt-kpi-common.h
index d2624c80d..41bfa085a 100644
--- a/src/kpi/dlt-kpi-common.h
+++ b/src/kpi/dlt-kpi-common.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi-interrupt.c b/src/kpi/dlt-kpi-interrupt.c
index b9a709737..19c9e37c5 100644
--- a/src/kpi/dlt-kpi-interrupt.c
+++ b/src/kpi/dlt-kpi-interrupt.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi-interrupt.h b/src/kpi/dlt-kpi-interrupt.h
index e2640dc45..527ee1824 100644
--- a/src/kpi/dlt-kpi-interrupt.h
+++ b/src/kpi/dlt-kpi-interrupt.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi-options.c b/src/kpi/dlt-kpi-options.c
index 5f07b8b43..551097c1f 100644
--- a/src/kpi/dlt-kpi-options.c
+++ b/src/kpi/dlt-kpi-options.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi-process-list.c b/src/kpi/dlt-kpi-process-list.c
index 985ecc144..56610ebb8 100644
--- a/src/kpi/dlt-kpi-process-list.c
+++ b/src/kpi/dlt-kpi-process-list.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi-process-list.h b/src/kpi/dlt-kpi-process-list.h
index 840aaf098..ccab3b299 100644
--- a/src/kpi/dlt-kpi-process-list.h
+++ b/src/kpi/dlt-kpi-process-list.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi-process.c b/src/kpi/dlt-kpi-process.c
index 27cb54c64..751562f60 100644
--- a/src/kpi/dlt-kpi-process.c
+++ b/src/kpi/dlt-kpi-process.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi-process.h b/src/kpi/dlt-kpi-process.h
index 3e89e4e8b..bdc08fbfa 100644
--- a/src/kpi/dlt-kpi-process.h
+++ b/src/kpi/dlt-kpi-process.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi.c b/src/kpi/dlt-kpi.c
index 6b7c2f886..2ac32bfa4 100644
--- a/src/kpi/dlt-kpi.c
+++ b/src/kpi/dlt-kpi.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/kpi/dlt-kpi.h b/src/kpi/dlt-kpi.h
index f04e1787e..2c802bd68 100644
--- a/src/kpi/dlt-kpi.h
+++ b/src/kpi/dlt-kpi.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index e6d63349c..c2b99191c 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 set(dlt_LIB_SRCS
diff --git a/src/lib/dlt_client.c b/src/lib/dlt_client.c
index 552ee7a49..310d62f80 100644
--- a/src/lib/dlt_client.c
+++ b/src/lib/dlt_client.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/lib/dlt_client_cfg.h b/src/lib/dlt_client_cfg.h
index 104823eba..c1d13f846 100644
--- a/src/lib/dlt_client_cfg.h
+++ b/src/lib/dlt_client_cfg.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/lib/dlt_env_ll.c b/src/lib/dlt_env_ll.c
index 3923704fd..88b0291e6 100644
--- a/src/lib/dlt_env_ll.c
+++ b/src/lib/dlt_env_ll.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2015  Intel Corporation
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/lib/dlt_filetransfer.c b/src/lib/dlt_filetransfer.c
index 3c71e68b0..6578fb04d 100644
--- a/src/lib/dlt_filetransfer.c
+++ b/src/lib/dlt_filetransfer.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/lib/dlt_user.c b/src/lib/dlt_user.c
index 0397e486f..ceeca680d 100644
--- a/src/lib/dlt_user.c
+++ b/src/lib/dlt_user.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/lib/dlt_user_cfg.h b/src/lib/dlt_user_cfg.h
index 8037c2841..ce52dc657 100644
--- a/src/lib/dlt_user_cfg.h
+++ b/src/lib/dlt_user_cfg.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/offlinelogstorage/dlt_offline_logstorage.c b/src/offlinelogstorage/dlt_offline_logstorage.c
index b8793c7ac..bddd96853 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage.c
+++ b/src/offlinelogstorage/dlt_offline_logstorage.c
@@ -15,7 +15,7 @@
  * \author Christoph Lipka <clipka@jp.adit-jv.com> ADIT 2015
  *
  * \file: dlt_offline_logstorage.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 #include <stdio.h>
 #include <string.h>
diff --git a/src/offlinelogstorage/dlt_offline_logstorage.h b/src/offlinelogstorage/dlt_offline_logstorage.h
index 8f32a89f1..0a48f216f 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage.h
+++ b/src/offlinelogstorage/dlt_offline_logstorage.h
@@ -15,7 +15,7 @@
  * \author Christoph Lipka <clipka@jp.adit-jv.com> ADIT 2015
  *
  * \file: dlt_offline_logstorage.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
index 666a78bac..396e48fc7 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.c
@@ -15,7 +15,7 @@
  * \author Syed Hameed <shameed@jp.adit-jv.com> ADIT 2015
  *
  * \file: dlt_offline_logstorage_behavior.c
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #include <syslog.h>
diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior.h b/src/offlinelogstorage/dlt_offline_logstorage_behavior.h
index 1ed59195f..08cb3d830 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior.h
+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior.h
@@ -14,7 +14,7 @@
  * \author Christoph Lipka <clipka@jp.adit-jv.com> ADIT 2015
  *
  * \file: dlt_offline_logstorage_behavior.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/offlinelogstorage/dlt_offline_logstorage_behavior_internal.h b/src/offlinelogstorage/dlt_offline_logstorage_behavior_internal.h
index fd23bb889..ee72ea729 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage_behavior_internal.h
+++ b/src/offlinelogstorage/dlt_offline_logstorage_behavior_internal.h
@@ -14,7 +14,7 @@
  * \author Aditya Paluri <venkataaditya.paluri@in.bosch.com> ADIT 2018
  *
  * \file: dlt_offline_logstorage_behavior_internal.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/offlinelogstorage/dlt_offline_logstorage_internal.h b/src/offlinelogstorage/dlt_offline_logstorage_internal.h
index ed126eb76..269ccdb65 100644
--- a/src/offlinelogstorage/dlt_offline_logstorage_internal.h
+++ b/src/offlinelogstorage/dlt_offline_logstorage_internal.h
@@ -14,7 +14,7 @@
  * \author Aditya Paluri <venkataaditya.paluri@in.bosch.com> ADIT 2017
  *
  * \file: dlt_offline_logstorage_internal.h
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*******************************************************************************
diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
index cbbe99a4a..c9e8cafa6 100644
--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_common_cfg.h b/src/shared/dlt_common_cfg.h
index cbd974d03..97621df63 100644
--- a/src/shared/dlt_common_cfg.h
+++ b/src/shared/dlt_common_cfg.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_config_file_parser.c b/src/shared/dlt_config_file_parser.c
index 72c57abf2..e2ae5a0da 100644
--- a/src/shared/dlt_config_file_parser.c
+++ b/src/shared/dlt_config_file_parser.c
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_config_file_parser.h b/src/shared/dlt_config_file_parser.h
index 3c1a6fdce..1de8b009f 100644
--- a/src/shared/dlt_config_file_parser.h
+++ b/src/shared/dlt_config_file_parser.h
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_multiple_files.c b/src/shared/dlt_multiple_files.c
index 014250570..59d5f4196 100644
--- a/src/shared/dlt_multiple_files.c
+++ b/src/shared/dlt_multiple_files.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2022, Daimler TSS GmbH
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
diff --git a/src/shared/dlt_offline_trace.c b/src/shared/dlt_offline_trace.c
index b8b9a85b9..988ed7e9f 100644
--- a/src/shared/dlt_offline_trace.c
+++ b/src/shared/dlt_offline_trace.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_protocol.c b/src/shared/dlt_protocol.c
index fc6dea424..e2a34f1de 100644
--- a/src/shared/dlt_protocol.c
+++ b/src/shared/dlt_protocol.c
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_shm.c b/src/shared/dlt_shm.c
index e1c96b780..ad471c4d8 100644
--- a/src/shared/dlt_shm.c
+++ b/src/shared/dlt_shm.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_user_shared.c b/src/shared/dlt_user_shared.c
index c6bc4966f..1511e146a 100644
--- a/src/shared/dlt_user_shared.c
+++ b/src/shared/dlt_user_shared.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_user_shared.h b/src/shared/dlt_user_shared.h
index 4417894d1..5e447076e 100644
--- a/src/shared/dlt_user_shared.h
+++ b/src/shared/dlt_user_shared.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/shared/dlt_user_shared_cfg.h b/src/shared/dlt_user_shared_cfg.h
index 7eecf48d4..d2fdc958a 100644
--- a/src/shared/dlt_user_shared_cfg.h
+++ b/src/shared/dlt_user_shared_cfg.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/CMakeLists.txt b/src/system/CMakeLists.txt
index a0b9bf05f..bd31c1231 100644
--- a/src/system/CMakeLists.txt
+++ b/src/system/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 if(WITH_SYSTEMD_WATCHDOG OR WITH_SYSTEMD OR WITH_SYSTEMD_JOURNAL)
diff --git a/src/system/dlt-system-filetransfer.c b/src/system/dlt-system-filetransfer.c
index a06e51211..c082f226a 100644
--- a/src/system/dlt-system-filetransfer.c
+++ b/src/system/dlt-system-filetransfer.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system-journal.c b/src/system/dlt-system-journal.c
index b4364a492..b1d20f0df 100644
--- a/src/system/dlt-system-journal.c
+++ b/src/system/dlt-system-journal.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system-logfile.c b/src/system/dlt-system-logfile.c
index 5e916d416..941a3be1e 100644
--- a/src/system/dlt-system-logfile.c
+++ b/src/system/dlt-system-logfile.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system-options.c b/src/system/dlt-system-options.c
index 50ff640f7..66719e732 100644
--- a/src/system/dlt-system-options.c
+++ b/src/system/dlt-system-options.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system-process-handling.c b/src/system/dlt-system-process-handling.c
index 028840538..d74ebe4ce 100644
--- a/src/system/dlt-system-process-handling.c
+++ b/src/system/dlt-system-process-handling.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system-processes.c b/src/system/dlt-system-processes.c
index a6e4918fc..c35596c94 100644
--- a/src/system/dlt-system-processes.c
+++ b/src/system/dlt-system-processes.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system-shell.c b/src/system/dlt-system-shell.c
index c7ebe2c20..f48945bcd 100644
--- a/src/system/dlt-system-shell.c
+++ b/src/system/dlt-system-shell.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system-syslog.c b/src/system/dlt-system-syslog.c
index 299544184..59e9d3ffd 100644
--- a/src/system/dlt-system-syslog.c
+++ b/src/system/dlt-system-syslog.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system-watchdog.c b/src/system/dlt-system-watchdog.c
index 541234586..7ed160406 100644
--- a/src/system/dlt-system-watchdog.c
+++ b/src/system/dlt-system-watchdog.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system.c b/src/system/dlt-system.c
index 4f3959e70..d3aef9ef2 100644
--- a/src/system/dlt-system.c
+++ b/src/system/dlt-system.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/system/dlt-system.conf b/src/system/dlt-system.conf
index 58f56fa53..77bc73e75 100644
--- a/src/system/dlt-system.conf
+++ b/src/system/dlt-system.conf
@@ -14,7 +14,7 @@ ApplicationId = SYS
 
 # Be careful when you enable this feature. The user can send any kind of
 # shell commands. The commands are executed with the rights of the
-# dlt-system process. Dlt-system is started by default as user genivi.
+# dlt-system process. Dlt-system is started by default as user covesa.
 
 # Enable the Shell for command line injections (Default: 0)
 ShellEnable = 0
@@ -41,8 +41,8 @@ SyslogPort = 47111
 # This feature is only available, when dlt is compiled with
 # the option "WITH_SYSTEMD_JOURNAL"
 
-# Dlt-system is started by default as user genivi, see dlt-system.service file.
-# The user genivi must be added to one of the groups 'adm', 'wheel' or
+# Dlt-system is started by default as user covesa, see dlt-system.service file.
+# The user covesa must be added to one of the groups 'adm', 'wheel' or
 # 'systemd-journal' to have access to all journal entries.
 # Enable Systemd Journal Adapter only when your system doesn't have systemd.
 # Don't enable both (SyslogEnable = 1 and JournalEnable = 1) together because 
diff --git a/src/system/dlt-system.h b/src/system/dlt-system.h
index bbf177d58..93edfd91c 100644
--- a/src/system/dlt-system.h
+++ b/src/system/dlt-system.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 76f89cbda..4474103f3 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 set(TARGET_LIST ${TARGET_LIST} dlt-test-multi-process)
diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c
index ad5eee94d..bfe1cc37a 100644
--- a/src/tests/dlt-test-client.c
+++ b/src/tests/dlt-test-client.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-cpp-extension.cpp b/src/tests/dlt-test-cpp-extension.cpp
index 3c0fc1c69..cd6a394c9 100644
--- a/src/tests/dlt-test-cpp-extension.cpp
+++ b/src/tests/dlt-test-cpp-extension.cpp
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2015  Intel Corporation
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-filetransfer.c b/src/tests/dlt-test-filetransfer.c
index b4529e6a4..7ec7c57cd 100644
--- a/src/tests/dlt-test-filetransfer.c
+++ b/src/tests/dlt-test-filetransfer.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-fork-handler.c b/src/tests/dlt-test-fork-handler.c
index 6655a6188..e038edb1d 100644
--- a/src/tests/dlt-test-fork-handler.c
+++ b/src/tests/dlt-test-fork-handler.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2015  Intel Corporation
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-init-free.c b/src/tests/dlt-test-init-free.c
index 6bfee15d1..90933be6f 100644
--- a/src/tests/dlt-test-init-free.c
+++ b/src/tests/dlt-test-init-free.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c
index ca06612f5..2fb609316 100644
--- a/src/tests/dlt-test-multi-process-client.c
+++ b/src/tests/dlt-test-multi-process-client.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c
index 90682a3ac..ad5637c87 100644
--- a/src/tests/dlt-test-multi-process.c
+++ b/src/tests/dlt-test-multi-process.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-multi-process.h b/src/tests/dlt-test-multi-process.h
index de590ee4a..977dddfa5 100644
--- a/src/tests/dlt-test-multi-process.h
+++ b/src/tests/dlt-test-multi-process.h
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-non-verbose.c b/src/tests/dlt-test-non-verbose.c
index 6cc793819..9b0d1376c 100644
--- a/src/tests/dlt-test-non-verbose.c
+++ b/src/tests/dlt-test-non-verbose.c
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-preregister-context.c b/src/tests/dlt-test-preregister-context.c
index caa77f041..2fa86c95c 100644
--- a/src/tests/dlt-test-preregister-context.c
+++ b/src/tests/dlt-test-preregister-context.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2015  Intel Corporation
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-qnx-slogger.c b/src/tests/dlt-test-qnx-slogger.c
index 973fbe0f7..b03bc5c4b 100644
--- a/src/tests/dlt-test-qnx-slogger.c
+++ b/src/tests/dlt-test-qnx-slogger.c
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 #include <stdio.h>
diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c
index 5370caa1d..e77ac1ccd 100644
--- a/src/tests/dlt-test-stress-client.c
+++ b/src/tests/dlt-test-stress-client.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-stress-user.c b/src/tests/dlt-test-stress-user.c
index 06abbfd53..7ef68a540 100644
--- a/src/tests/dlt-test-stress-user.c
+++ b/src/tests/dlt-test-stress-user.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-stress.c b/src/tests/dlt-test-stress.c
index 7b58b3d63..ca6675b2f 100644
--- a/src/tests/dlt-test-stress.c
+++ b/src/tests/dlt-test-stress.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/src/tests/dlt-test-user.c b/src/tests/dlt-test-user.c
index b7b28700e..d353c283c 100644
--- a/src/tests/dlt-test-user.c
+++ b/src/tests/dlt-test-user.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index bfd4cd952..a44e7bc7d 100644
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 if(WITH_SYSTEMD)
diff --git a/systemd/dlt-adaptor-udp.service.cmake b/systemd/dlt-adaptor-udp.service.cmake
index e06330cb5..fb7b60754 100644
--- a/systemd/dlt-adaptor-udp.service.cmake
+++ b/systemd/dlt-adaptor-udp.service.cmake
@@ -3,18 +3,18 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 [Unit]
-Description=GENIVI DLT adaptor stdin. Adaptor for forwarding received UDP messages to DLT daemon.
+Description=COVESA DLT adaptor stdin. Adaptor for forwarding received UDP messages to DLT daemon.
 Wants=dlt.service
 
 [Service]
diff --git a/systemd/dlt-dbus.service.cmake b/systemd/dlt-dbus.service.cmake
index 9baf3e956..ee41ec815 100644
--- a/systemd/dlt-dbus.service.cmake
+++ b/systemd/dlt-dbus.service.cmake
@@ -3,18 +3,18 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 [Unit]
-Description=GENIVI DLT DBus. Application to forward DBus messages to DLT.
+Description=COVESA DLT DBus. Application to forward DBus messages to DLT.
 Documentation=man:dlt-dbus(1) man:dlt-dbus.conf(5)
 Wants=dlt.service
 
diff --git a/systemd/dlt-example-user.service.cmake b/systemd/dlt-example-user.service.cmake
index 2f300eca5..cae60e853 100644
--- a/systemd/dlt-example-user.service.cmake
+++ b/systemd/dlt-example-user.service.cmake
@@ -3,22 +3,22 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 [Unit]
-Description=GENIVI DLT example user. Generate DLT messages and store them to file or send them to daemon.
+Description=COVESA DLT example user. Generate DLT messages and store them to file or send them to daemon.
 Wants=dlt.service
 
 [Service]
 Type=simple
 User=@DLT_USER@
-ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from GENIVI DLT example user application"
+ExecStart=@CMAKE_INSTALL_PREFIX@/bin/dlt-example-user "Hallo from COVESA DLT example user application"
 LimitCORE=infinity
\ No newline at end of file
diff --git a/systemd/dlt-receive.service.cmake b/systemd/dlt-receive.service.cmake
index dd53ab7de..8f01f3a99 100644
--- a/systemd/dlt-receive.service.cmake
+++ b/systemd/dlt-receive.service.cmake
@@ -3,18 +3,18 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 [Unit]
-Description=GENIVI DLT receive. Receive DLT messages from DLT daemon and print or store the messages.
+Description=COVESA DLT receive. Receive DLT messages from DLT daemon and print or store the messages.
 Documentation=man:dlt-receive(1)
 Wants=dlt.service
 
diff --git a/systemd/dlt-system.service.cmake b/systemd/dlt-system.service.cmake
index 7dfada023..ac170990d 100755
--- a/systemd/dlt-system.service.cmake
+++ b/systemd/dlt-system.service.cmake
@@ -3,18 +3,18 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 [Unit]
-Description=GENIVI DLT system. Application to forward syslog messages to DLT, transfer system information, logs and files.
+Description=COVESA DLT system. Application to forward syslog messages to DLT, transfer system information, logs and files.
 Documentation=man:dlt-system(1) man:dlt-system.conf(5)
 Wants=dlt.service
 
diff --git a/systemd/dlt.service.cmake b/systemd/dlt.service.cmake
index 920c81f8d..a19fa7e6d 100755
--- a/systemd/dlt.service.cmake
+++ b/systemd/dlt.service.cmake
@@ -3,18 +3,18 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 [Unit]
-Description=GENIVI DLT logging daemon
+Description=COVESA DLT logging daemon
 Documentation=man:dlt-daemon(1) man:dlt.conf(5)
 
 [Service]
diff --git a/tests/dlt_env_ll_unit_test.cpp b/tests/dlt_env_ll_unit_test.cpp
index 7f1a59e51..724cf3251 100644
--- a/tests/dlt_env_ll_unit_test.cpp
+++ b/tests/dlt_env_ll_unit_test.cpp
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2015  Intel Corporation
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/tests/dlt_test_receiver.c b/tests/dlt_test_receiver.c
index 23e827c3f..85d55200d 100644
--- a/tests/dlt_test_receiver.c
+++ b/tests/dlt_test_receiver.c
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/tests/gtest_dlt_common.cpp b/tests/gtest_dlt_common.cpp
index 18830bed5..6a80f1142 100644
--- a/tests/gtest_dlt_common.cpp
+++ b/tests/gtest_dlt_common.cpp
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/tests/gtest_dlt_daemon_common.cpp b/tests/gtest_dlt_daemon_common.cpp
index 7935a3a40..f7c036f46 100644
--- a/tests/gtest_dlt_daemon_common.cpp
+++ b/tests/gtest_dlt_daemon_common.cpp
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/tests/gtest_dlt_daemon_event_handler.cpp b/tests/gtest_dlt_daemon_event_handler.cpp
index 8badc7869..029c31d40 100644
--- a/tests/gtest_dlt_daemon_event_handler.cpp
+++ b/tests/gtest_dlt_daemon_event_handler.cpp
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/tests/gtest_dlt_daemon_gateway.cpp b/tests/gtest_dlt_daemon_gateway.cpp
index a3ea510e3..b4336d88b 100644
--- a/tests/gtest_dlt_daemon_gateway.cpp
+++ b/tests/gtest_dlt_daemon_gateway.cpp
@@ -5,14 +5,14 @@
  * This code is developed by Advanced Driver Information Technology.
  * Copyright of Advanced Driver Information Technology, Bosch and DENSO.
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/tests/gtest_dlt_daemon_gateway.sh b/tests/gtest_dlt_daemon_gateway.sh
index 185a662c0..c64a8d0f0 100755
--- a/tests/gtest_dlt_daemon_gateway.sh
+++ b/tests/gtest_dlt_daemon_gateway.sh
@@ -6,14 +6,14 @@
 # This code is developed by Advanced Driver Information Technology.
 # Copyright of Advanced Driver Information Technology, Bosch and DENSO.
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 ################################################################################
 
 ################################################################################
diff --git a/tests/gtest_dlt_daemon_multiple_files_logging.cpp b/tests/gtest_dlt_daemon_multiple_files_logging.cpp
index 05b58f2cc..f7257ce69 100644
--- a/tests/gtest_dlt_daemon_multiple_files_logging.cpp
+++ b/tests/gtest_dlt_daemon_multiple_files_logging.cpp
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/tests/gtest_dlt_user.cpp b/tests/gtest_dlt_user.cpp
index 536c292dd..c94e49f86 100644
--- a/tests/gtest_dlt_user.cpp
+++ b/tests/gtest_dlt_user.cpp
@@ -3,14 +3,14 @@
  *
  * Copyright (C) 2011-2015, BMW AG
  *
- * This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+ * This file is part of COVESA Project DLT - Diagnostic Log and Trace.
  *
  * This Source Code Form is subject to the terms of the
  * Mozilla Public License (MPL), v. 2.0.
  * If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
- * For further information see http://www.genivi.org/.
+ * For further information see http://www.covesa.org/.
  */
 
 /*!
diff --git a/tests/start_logstorage_test.sh b/tests/start_logstorage_test.sh
index fde767982..18e02e223 100755
--- a/tests/start_logstorage_test.sh
+++ b/tests/start_logstorage_test.sh
@@ -6,14 +6,14 @@
 # This code is developed by Advanced Driver Information Technology.
 # Copyright of Advanced Driver Information Technology, Bosch and DENSO.
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 ################################################################################
 
 ################################################################################
diff --git a/tests/start_multinode_test.sh b/tests/start_multinode_test.sh
index 6f7b7701b..ed2274180 100755
--- a/tests/start_multinode_test.sh
+++ b/tests/start_multinode_test.sh
@@ -6,14 +6,14 @@
 # This code is developed by Advanced Driver Information Technology.
 # Copyright of Advanced Driver Information Technology, Bosch and DENSO.
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 ################################################################################
 
 ################################################################################
diff --git a/testscripts/CMakeLists.txt b/testscripts/CMakeLists.txt
index 6050b9461..f3eac93bc 100644
--- a/testscripts/CMakeLists.txt
+++ b/testscripts/CMakeLists.txt
@@ -3,14 +3,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 if(WITH_TESTSCRIPTS)
diff --git a/testscripts/Meego/dlt-daemon.cmake b/testscripts/Meego/dlt-daemon.cmake
index 8db30eb7e..bb60dedaa 100644
--- a/testscripts/Meego/dlt-daemon.cmake
+++ b/testscripts/Meego/dlt-daemon.cmake
@@ -5,14 +5,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 # Starts the DLT Daemon
diff --git a/testscripts/Ubuntu/dlt-daemon.cmake b/testscripts/Ubuntu/dlt-daemon.cmake
index b27c830cc..bcd1237c2 100644
--- a/testscripts/Ubuntu/dlt-daemon.cmake
+++ b/testscripts/Ubuntu/dlt-daemon.cmake
@@ -5,14 +5,14 @@
 #
 # Copyright (C) 2011-2015, BMW AG
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 #######
 
 ### BEGIN INIT INFO
diff --git a/util/create_dlt_user_h.py b/util/create_dlt_user_h.py
index b0d1eb16c..1adf3eec1 100755
--- a/util/create_dlt_user_h.py
+++ b/util/create_dlt_user_h.py
@@ -4,14 +4,14 @@
 # Advanced Driver Information Technology Corporation, Robert Bosch GmbH,
 # Robert Bosch Car Multimedia GmbH and DENSO Corporation.
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 import pathlib
 import argparse
 
diff --git a/util/create_dlt_version_h.py b/util/create_dlt_version_h.py
index 1679f9351..957278327 100755
--- a/util/create_dlt_version_h.py
+++ b/util/create_dlt_version_h.py
@@ -4,14 +4,14 @@
 # Advanced Driver Information Technology Corporation, Robert Bosch GmbH,
 # Robert Bosch Car Multimedia GmbH and DENSO Corporation.
 #
-# This file is part of GENIVI Project DLT - Diagnostic Log and Trace.
+# This file is part of COVESA Project DLT - Diagnostic Log and Trace.
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
 # If a copy of the MPL was not distributed with this file,
 # You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-# For further information see http://www.genivi.org/.
+# For further information see http://www.covesa.org/.
 import pathlib
 import subprocess
 import argparse