diff --git a/.gitignore b/.gitignore
index cd3fa6e02893c390cfc22ce568b64a30946b7b01..3afe540cfcb95998f82fa9384eb430ae5349b094 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,8 +12,6 @@ externals/*/
 *.swp
 .project
 .cproject
-certivibe-test-build
-
 
 #ignore python compile file .pyc
 # *.pyc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e5cf35b32fa48b1a54500f791a5f54f494288602..d406a7dc7e5bf1ec2c8831316c775f728e403235 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ cmake_policy(SET CMP0048 OLD)
 PROJECT(OpenVIBE)
 
 SET(OV_GLOBAL_VERSION_MAJOR 0)
-SET(OV_GLOBAL_VERSION_MINOR 1)
+SET(OV_GLOBAL_VERSION_MINOR 2)
 SET(OV_GLOBAL_VERSION_PATCH 99)
 SET(OV_GLOBAL_VERSION_STRING "${OV_GLOBAL_VERSION_MAJOR}.${OV_GLOBAL_VERSION_MINOR}.${OV_GLOBAL_VERSION_PATCH}")
 
@@ -77,7 +77,7 @@ IF(NOT CMAKE_BUILD_TYPE)
 ENDIF()
 
 IF(NOT CMAKE_INSTALL_PREFIX)
-	SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../certivibe-build/dist-${CMAKE_BUILD_TYPE}")
+	SET(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../openvibe-sdk-build/dist-${CMAKE_BUILD_TYPE}")
 ENDIF(NOT CMAKE_INSTALL_PREFIX)
 
 IF(OV_PACKAGE)
@@ -255,7 +255,7 @@ ENDIF()
 
 # add the scripts to the project so IDEs using the CMake file are aware of them
 FILE(GLOB_RECURSE script_files scripts/*.cmd scripts/*.sh scripts/*.nsi scripts/*.cmake)
-INSTALL(FILES scripts/AddCertivibeComponents.cmake DESTINATION ${DIST_DATADIR})
+INSTALL(FILES scripts/AddOpenViBESDKComponents.cmake DESTINATION ${DIST_DATADIR})
 ADD_CUSTOM_TARGET(openvibe-scripts SOURCES ${script_files})
 
 # Enable/Disable unit test
diff --git a/README.md b/README.md
index 6de64dceab3da50c24509e879a2bf52b75f11ad9..0a8ec0c3308723406e35815c10d145632189e8c9 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 Introduction
 ============
 
-Certivibe is a core software platform for the design, test and use of
-Brain-Computer Interfaces. It is a fork of OpenVIBE that aims to be used in
+OpenViBE SDK is a core software platform for the design, test and use of
+Brain-Computer Interfaces. It aims to have a certifiable kernel to be used in
 medical devices.
 
 Repository organisation
@@ -64,7 +64,7 @@ Naming rules
 ============
 
 WARNING: These are the initial naming rules of the project. For an
-updated version, pleaser refer to Certivibe Coding Rules.
+updated version, pleaser refer to OpenViBE Coding Rules.
 
 #### CMake
 
@@ -86,7 +86,7 @@ updated version, pleaser refer to Certivibe Coding Rules.
  - Test file name: uo/ur + test identifier + Test (e.g. *uoKernelContextTest.cpp*)
 	 - u = unit
 	 - o = open (used for public test transferred from open-source OpenViBE)
-	 - r = restricted (used for test implemented within CertiViBE project)
+	 - r = restricted (used for test implemented within OpenViBE SDK project)
  - Test name: identical to file name
 
 #### Validation Tests
@@ -128,4 +128,5 @@ Just add data in the test directory and modify test CMakeLists.txt accordingly.
 #### Add New Test
 
 There should be no reason to add ctest validation tests. New validation tests use Robot Framework.
+@FIXME CERT Rename repository ?
 Check "Adding Robot Framework Test" section in certivibe-test repository for more details.
diff --git a/applications/developer-tools/scenario-player/CMakeLists.txt b/applications/developer-tools/scenario-player/CMakeLists.txt
index 16c0c973e80fccd789f78a9f59a3f2d5b9057afc..667a889c02f205c3a56f657644552997471e9a54 100755
--- a/applications/developer-tools/scenario-player/CMakeLists.txt
+++ b/applications/developer-tools/scenario-player/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/applications/developer-tools/scenario-player/src/ovspCCommand.cpp b/applications/developer-tools/scenario-player/src/ovspCCommand.cpp
index e47021ff2232d75f52c3e75b2326ccc803fa591f..6d12787b0f994eea9fd04781af7b04f5233bb44f 100644
--- a/applications/developer-tools/scenario-player/src/ovspCCommand.cpp
+++ b/applications/developer-tools/scenario-player/src/ovspCCommand.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspCCommand.h b/applications/developer-tools/scenario-player/src/ovspCCommand.h
index 9428a29a76599fc0170684b959bb8a0220f9bfb0..1b9efc93bc5f30e4868e2d83471b06f7b2efae1f 100644
--- a/applications/developer-tools/scenario-player/src/ovspCCommand.h
+++ b/applications/developer-tools/scenario-player/src/ovspCCommand.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspCCommandFileParser.cpp b/applications/developer-tools/scenario-player/src/ovspCCommandFileParser.cpp
index a10e0e73963e8988d8404964b7286147fa5aaadf..92b8edb0ae06135d63ba5dc5799044ae6bb2c69e 100644
--- a/applications/developer-tools/scenario-player/src/ovspCCommandFileParser.cpp
+++ b/applications/developer-tools/scenario-player/src/ovspCCommandFileParser.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspCCommandFileParser.h b/applications/developer-tools/scenario-player/src/ovspCCommandFileParser.h
index 0dcf915e1673c257f2396ac27284eec76abb103d..9ce740ac6efb546474d76739c5ea4320b28ab242 100644
--- a/applications/developer-tools/scenario-player/src/ovspCCommandFileParser.h
+++ b/applications/developer-tools/scenario-player/src/ovspCCommandFileParser.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspCCommandLineOptionParser.cpp b/applications/developer-tools/scenario-player/src/ovspCCommandLineOptionParser.cpp
index 82200cd65d5a24c0828f4b24e09143812be495fc..37d16f9b887d841fa5ab0fb3fa64515be5f4ba41 100644
--- a/applications/developer-tools/scenario-player/src/ovspCCommandLineOptionParser.cpp
+++ b/applications/developer-tools/scenario-player/src/ovspCCommandLineOptionParser.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspCCommandLineOptionParser.h b/applications/developer-tools/scenario-player/src/ovspCCommandLineOptionParser.h
index 36dbb4a949a274572685de95a2f053986090d725..7b795a5fba9459252d5cd7a8c45bbda5c10317d5 100644
--- a/applications/developer-tools/scenario-player/src/ovspCCommandLineOptionParser.h
+++ b/applications/developer-tools/scenario-player/src/ovspCCommandLineOptionParser.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspCKernelFacade.cpp b/applications/developer-tools/scenario-player/src/ovspCKernelFacade.cpp
index 9924165a5bc2231dc725897d32b0f245931fd84d..0f23abd8449c67ce924b86a5f9c43d446b123c27 100755
--- a/applications/developer-tools/scenario-player/src/ovspCKernelFacade.cpp
+++ b/applications/developer-tools/scenario-player/src/ovspCKernelFacade.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspCKernelFacade.h b/applications/developer-tools/scenario-player/src/ovspCKernelFacade.h
index 02b37a60db50a6055ea9dc3e7f02b90b8936af06..dbf1930ad13652f1500e7047e34501b2180e343c 100755
--- a/applications/developer-tools/scenario-player/src/ovspCKernelFacade.h
+++ b/applications/developer-tools/scenario-player/src/ovspCKernelFacade.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspICommand.h b/applications/developer-tools/scenario-player/src/ovspICommand.h
index 9999b5b0a772fda8730ca780b9a79c63b6a8a828..440f0282bb2423b098951b8082b7ef6cb63e16fd 100644
--- a/applications/developer-tools/scenario-player/src/ovspICommand.h
+++ b/applications/developer-tools/scenario-player/src/ovspICommand.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspICommandParser.h b/applications/developer-tools/scenario-player/src/ovspICommandParser.h
index d4e1e6fc3676577d904e1226335aa28bc037ccd5..8d3bd54e6f226c43c906449edb618f925c2c1191 100644
--- a/applications/developer-tools/scenario-player/src/ovspICommandParser.h
+++ b/applications/developer-tools/scenario-player/src/ovspICommandParser.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovspTProgramOptions.hpp b/applications/developer-tools/scenario-player/src/ovspTProgramOptions.hpp
index 9e59d087d98765c3dd4b1ab95abddc0c0808f7b0..a1fdc4b8359765bb5c139eed4bb924071de03d0e 100644
--- a/applications/developer-tools/scenario-player/src/ovspTProgramOptions.hpp
+++ b/applications/developer-tools/scenario-player/src/ovspTProgramOptions.hpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovsp_base.h b/applications/developer-tools/scenario-player/src/ovsp_base.h
index b96a628ebba509fffeae16a8840bbc80f7359a13..1981c7117690ebb057ae974a251fa49f0faeb9ab 100644
--- a/applications/developer-tools/scenario-player/src/ovsp_base.h
+++ b/applications/developer-tools/scenario-player/src/ovsp_base.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovsp_defines.h b/applications/developer-tools/scenario-player/src/ovsp_defines.h
index b857d317e615625728e08684ed9c655dab5d5805..3aafc38493ad192a5ee2f3638e37b09fd01a5543 100644
--- a/applications/developer-tools/scenario-player/src/ovsp_defines.h
+++ b/applications/developer-tools/scenario-player/src/ovsp_defines.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/applications/developer-tools/scenario-player/src/ovsp_main.cpp b/applications/developer-tools/scenario-player/src/ovsp_main.cpp
index ae7b5e2e6362e841115775ae26006171af8c2071..a5512a3d537b10fb2191941afca7ac4e0a69ccec 100644
--- a/applications/developer-tools/scenario-player/src/ovsp_main.cpp
+++ b/applications/developer-tools/scenario-player/src/ovsp_main.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/cmake-modules/OvtRunMultipleCommand.cmake b/cmake-modules/OvtRunMultipleCommand.cmake
index 4732ed9ab9e2f2e021ed4f5cc098246bcac5e5ec..015397d9d0b79a6e21c9229aae893d9094ddea8e 100755
--- a/cmake-modules/OvtRunMultipleCommand.cmake
+++ b/cmake-modules/OvtRunMultipleCommand.cmake
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/kernel/share/openvibe.conf b/kernel/share/openvibe.conf
index d7d90409c44ced0054476e4e8fc818c8af713332..6dc813ed98e9f3b08056e56d0df218458184729e 100644
--- a/kernel/share/openvibe.conf
+++ b/kernel/share/openvibe.conf
@@ -51,9 +51,9 @@ VRPN_ExternalServerPort = 53883
 # OpenViBE kernel configuration
 #####################################################################################
 
-Kernel_PluginsPatternMacOS = ${Path_Lib}/libcertivibe-plugins-*.dylib
-Kernel_PluginsPatternLinux = ${Path_Lib}/libcertivibe-plugins-*.so
-Kernel_PluginsPatternWindows = ${Path_Bin}/certivibe-plugins-*.dll
+Kernel_PluginsPatternMacOS = ${Path_Lib}/libopenvibe-plugins-*.dylib
+Kernel_PluginsPatternLinux = ${Path_Lib}/libopenvibe-plugins-*.so
+Kernel_PluginsPatternWindows = ${Path_Bin}/openvibe-plugins-*.dll
 Kernel_Plugins = ${Kernel_PluginsPattern${OperatingSystem}}
 Kernel_MainLogLevel = Trace
 Kernel_ConsoleLogLevel = Information
diff --git a/kernel/src/kernel/error/ovkCErrorManager.cpp b/kernel/src/kernel/error/ovkCErrorManager.cpp
index b0a95d38a38248d074a53eb9f987f83475f8e5c5..bac7f5fc14c6552cd9350a2c12b38bf08493b1bc 100644
--- a/kernel/src/kernel/error/ovkCErrorManager.cpp
+++ b/kernel/src/kernel/error/ovkCErrorManager.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/kernel/src/kernel/error/ovkCErrorManager.h b/kernel/src/kernel/error/ovkCErrorManager.h
index 99b38e6c913109728a2c7e6eb4d3191f7b029257..3a7ab88f88109b901b66149c96268e01f6cbae5e 100644
--- a/kernel/src/kernel/error/ovkCErrorManager.h
+++ b/kernel/src/kernel/error/ovkCErrorManager.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/kernel/src/kernel/ovkCKernelContext.cpp b/kernel/src/kernel/ovkCKernelContext.cpp
index ee071e01375aba0882a360075a4327f986fe5e85..1c95bdecd8cf0399dca5a99e3a7ffeb9d5aafe8b 100755
--- a/kernel/src/kernel/ovkCKernelContext.cpp
+++ b/kernel/src/kernel/ovkCKernelContext.cpp
@@ -98,9 +98,9 @@ boolean CKernelContext::initialize(void)
 	m_pConfigurationManager->createConfigurationToken("OperatingSystem", "Unknown");
 #endif
 
-	m_pConfigurationManager->createConfigurationToken("Kernel_PluginsPatternMacOS",   "libcertivibe-plugins-*.dylib");
-	m_pConfigurationManager->createConfigurationToken("Kernel_PluginsPatternLinux",   "libcertivibe-plugins-*.so");
-	m_pConfigurationManager->createConfigurationToken("Kernel_PluginsPatternWindows", "certivibe-plugins-*.dll");
+	m_pConfigurationManager->createConfigurationToken("Kernel_PluginsPatternMacOS",   "libopenvibe-plugins-*.dylib");
+	m_pConfigurationManager->createConfigurationToken("Kernel_PluginsPatternLinux",   "libopenvibe-plugins-*.so");
+	m_pConfigurationManager->createConfigurationToken("Kernel_PluginsPatternWindows", "openvibe-plugins-*.dll");
 	m_pConfigurationManager->createConfigurationToken("Kernel_Plugins", "${Path_Lib}/${Kernel_PluginsPattern${OperatingSystem}}");
 
 	m_pConfigurationManager->createConfigurationToken("Kernel_Metabox", "${Path_Data}/metaboxes/;${Path_UserData}/metaboxes/");
diff --git a/modules/csv/include/csv/ovICSV.h b/modules/csv/include/csv/ovICSV.h
index 9ad7b64f0d71165bd22fbf1f2c77fab24f49ef09..2ccd5314a4e6d4b57e1f34ccb421d842f65d234e 100755
--- a/modules/csv/include/csv/ovICSV.h
+++ b/modules/csv/include/csv/ovICSV.h
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE
+ * OpenViBE SDK
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/modules/csv/src/ovCCSV.cpp b/modules/csv/src/ovCCSV.cpp
index beeaa3f9a6bad24951b65ef2159261e939dc285d..30a9da9497da9b7a8bc3d71a9afb648dfa1ccf94 100755
--- a/modules/csv/src/ovCCSV.cpp
+++ b/modules/csv/src/ovCCSV.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE
+ * OpenViBE SDK
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/modules/csv/src/ovCCSV.hpp b/modules/csv/src/ovCCSV.hpp
index 6e5930d14f63c9445cf13b530239c09205bc394e..1371deef50cf741fba8bd168d9ce1a4c89df1402 100755
--- a/modules/csv/src/ovCCSV.hpp
+++ b/modules/csv/src/ovCCSV.hpp
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE
+ * OpenViBE SDK
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/openvibe/include/openvibe/kernel/error/ovErrorType.h b/openvibe/include/openvibe/kernel/error/ovErrorType.h
index a7b583a58bbd62e820d8855c0c260c284f7aa093..185707a3c1cfb8408c948d3e59c1bdc684c4255c 100644
--- a/openvibe/include/openvibe/kernel/error/ovErrorType.h
+++ b/openvibe/include/openvibe/kernel/error/ovErrorType.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/openvibe/include/openvibe/kernel/error/ovIError.h b/openvibe/include/openvibe/kernel/error/ovIError.h
index 8f6930198a7c8954655d8fb6f904c7408c03f787..df789788f12e8dc16010bc627aa618cfb3c1cd94 100644
--- a/openvibe/include/openvibe/kernel/error/ovIError.h
+++ b/openvibe/include/openvibe/kernel/error/ovIError.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/openvibe/include/openvibe/kernel/error/ovIErrorManager.h b/openvibe/include/openvibe/kernel/error/ovIErrorManager.h
index 76d428d35be81370989f625440c6ca99c223746d..63a0f685b861d03da3feca96343a19a07da086c1 100644
--- a/openvibe/include/openvibe/kernel/error/ovIErrorManager.h
+++ b/openvibe/include/openvibe/kernel/error/ovIErrorManager.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/openvibe/include/openvibe/ovAssert.h b/openvibe/include/openvibe/ovAssert.h
index ef65ca577c09f76106a1a1bf1cd560a55401df8a..499df8a2fa3d13e52054f999e2fab189c84df552 100644
--- a/openvibe/include/openvibe/ovAssert.h
+++ b/openvibe/include/openvibe/ovAssert.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/openvibe/include/openvibe/ovExceptionHandler.h b/openvibe/include/openvibe/ovExceptionHandler.h
index f446e900dbe9a7f695d59d518716042de4e77288..91f9f76d81a8f6c4694539e70c45b6640a9d666e 100644
--- a/openvibe/include/openvibe/ovExceptionHandler.h
+++ b/openvibe/include/openvibe/ovExceptionHandler.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/plugins/processing/classification/CMakeLists.txt b/plugins/processing/classification/CMakeLists.txt
index 40efd77e32243d3f5384061a3690e012eb7435b8..72961ad44e9ac6dd3358add6244153272302997e 100644
--- a/plugins/processing/classification/CMakeLists.txt
+++ b/plugins/processing/classification/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-classification)
+PROJECT(openvibe-plugins-sdk-classification)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/plugins/processing/data-generation/CMakeLists.txt b/plugins/processing/data-generation/CMakeLists.txt
index dcc472ec8d474a159617021509ccf54e8715a067..157e24d4625d8d0cd9c017b4c2df14b2fee89bc9 100644
--- a/plugins/processing/data-generation/CMakeLists.txt
+++ b/plugins/processing/data-generation/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-data-generation)
+PROJECT(openvibe-plugins-sdk-data-generation)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/plugins/processing/feature-extraction/CMakeLists.txt b/plugins/processing/feature-extraction/CMakeLists.txt
index 07787b05c3ac203b9912497fa81013bea6e63b7d..2ff95adea9866f23a3798f5a89f66582e3b9d4e8 100644
--- a/plugins/processing/feature-extraction/CMakeLists.txt
+++ b/plugins/processing/feature-extraction/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-feature-extraction)
+PROJECT(openvibe-plugins-sdk-feature-extraction)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/plugins/processing/file-io/CMakeLists.txt b/plugins/processing/file-io/CMakeLists.txt
index 9112aa2fcf7ba549674c1168e67e54debec3c795..5e89714c8ef6a949b31db415fa9db105feeca874 100755
--- a/plugins/processing/file-io/CMakeLists.txt
+++ b/plugins/processing/file-io/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-file-io)
+PROJECT(openvibe-plugins-sdk-file-io)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/plugins/processing/signal-processing/CMakeLists.txt b/plugins/processing/signal-processing/CMakeLists.txt
index 8c3ed10f4c41d008621ba7020e0dc29cb53a9509..51df8abfcfd19d52bc45c4866ab49d276b99e278 100644
--- a/plugins/processing/signal-processing/CMakeLists.txt
+++ b/plugins/processing/signal-processing/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-signal-processing)
+PROJECT(openvibe-plugins-sdk-signal-processing)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmZeroCrossingDetector.cpp b/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmZeroCrossingDetector.cpp
index 9a48e9fda56761d8e8b8277ba2dc242b249db4d7..0620967858c0a69b1188331255483e900d38c2b1 100644
--- a/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmZeroCrossingDetector.cpp
+++ b/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmZeroCrossingDetector.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE
+ * OpenViBE SDK
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmZeroCrossingDetector.h b/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmZeroCrossingDetector.h
index 88303b478eb2e512bb0397280baa843c868e4c32..82a3d2ee219eb5916500a5bf0390b46dc34031c1 100644
--- a/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmZeroCrossingDetector.h
+++ b/plugins/processing/signal-processing/src/box-algorithms/basic/ovpCBoxAlgorithmZeroCrossingDetector.h
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE
+ * OpenViBE SDK
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/plugins/processing/signal-processing/src/box-algorithms/resampling/ovpCBoxAlgorithmSignalResampling.cpp b/plugins/processing/signal-processing/src/box-algorithms/resampling/ovpCBoxAlgorithmSignalResampling.cpp
index bb7408654b9fc9b3913433cedcec197ea92fd056..4ab388a2ea2c80ce09b2de1371d8674fec4c0da4 100644
--- a/plugins/processing/signal-processing/src/box-algorithms/resampling/ovpCBoxAlgorithmSignalResampling.cpp
+++ b/plugins/processing/signal-processing/src/box-algorithms/resampling/ovpCBoxAlgorithmSignalResampling.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE
+ * OpenViBE SDK
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/plugins/processing/signal-processing/src/box-algorithms/resampling/ovpCBoxAlgorithmSignalResampling.h b/plugins/processing/signal-processing/src/box-algorithms/resampling/ovpCBoxAlgorithmSignalResampling.h
index 98f1721893cd8213d264850437ef6b5a2c8c4880..27cacf492acb8d5c4bf0f021e160b4995e309a9f 100644
--- a/plugins/processing/signal-processing/src/box-algorithms/resampling/ovpCBoxAlgorithmSignalResampling.h
+++ b/plugins/processing/signal-processing/src/box-algorithms/resampling/ovpCBoxAlgorithmSignalResampling.h
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE
+ * OpenViBE SDK
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/plugins/processing/stimulation/CMakeLists.txt b/plugins/processing/stimulation/CMakeLists.txt
index c47181e4b8b8dc0977790db440d059c5e1ed3dc7..6ab00889e001f21cf0bfc10cac9866eb0681be67 100755
--- a/plugins/processing/stimulation/CMakeLists.txt
+++ b/plugins/processing/stimulation/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-stimulation)
+PROJECT(openvibe-plugins-sdk-stimulation)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/plugins/processing/stream-codecs/CMakeLists.txt b/plugins/processing/stream-codecs/CMakeLists.txt
index 435f2cbf3c5de9130de60c8b86eb7835df8a8643..c127a7bbe053c4d6ed74d8ce6752a56697507a59 100644
--- a/plugins/processing/stream-codecs/CMakeLists.txt
+++ b/plugins/processing/stream-codecs/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-stream-codecs)
+PROJECT(openvibe-plugins-sdk-stream-codecs)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/plugins/processing/streaming/CMakeLists.txt b/plugins/processing/streaming/CMakeLists.txt
index 5fd5a93e269f22b454277af9b218e26ad43e0644..43a441c8c7129df576145ef1b8858ca220fb010b 100644
--- a/plugins/processing/streaming/CMakeLists.txt
+++ b/plugins/processing/streaming/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-streaming)
+PROJECT(openvibe-plugins-sdk-streaming)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/plugins/processing/tools/CMakeLists.txt b/plugins/processing/tools/CMakeLists.txt
index 8e30ae9b55f4cb6174c8c5aa1065cfa5e2d62b00..a4dd794e7b99c16643ee383f533f7a3c2614ff04 100644
--- a/plugins/processing/tools/CMakeLists.txt
+++ b/plugins/processing/tools/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(certivibe-plugins-tools)
+PROJECT(openvibe-plugins-sdk-tools)
 
 SET(PROJECT_VERSION_MAJOR ${OV_GLOBAL_VERSION_MAJOR})
 SET(PROJECT_VERSION_MINOR ${OV_GLOBAL_VERSION_MINOR})
diff --git a/scripts/AddCertivibeComponents.cmake b/scripts/AddOpenViBESDKComponents.cmake
similarity index 68%
rename from scripts/AddCertivibeComponents.cmake
rename to scripts/AddOpenViBESDKComponents.cmake
index 9ac8d866c047107ec426d88c7bedd743066a5c81..8edf17bc5c7e5fad57ac8cb391968fea4fde1195 100755
--- a/scripts/AddCertivibeComponents.cmake
+++ b/scripts/AddOpenViBESDKComponents.cmake
@@ -2,7 +2,7 @@
 # Finds OpenViBE SDK binary distribution
 # Adds library to target, include path and execute install commands
 # Also add library specific compiler flags
-# This should be used with a defined INCLUDED_CERTIVIBE_COMPONENTS variable in scope
+# This should be used with a defined INCLUDED_OV_SDK_COMPONENTS variable in scope
 # Value should be a list of libraries to include
 # They are organized into groups, and group name can also be used to add all members of said group
 # This include :
@@ -11,10 +11,11 @@
 # ALLPLUGINS : CLASSIFICATION DATA_GENERATION FEATURE_EXTRACTION FILE_IO SIGNAL_PROCESSING STIMULATION STREAM_CODECS STREAMING TOOLS
 # ALLMODULES : EBML SYSTEM FS SOCKET XML DATE CSV TOOLKIT
 # ---------------------------------
-option(DYNAMIC_LINK_OPENVIBE_SDK "Dynamically link Certivibe" ON)
+option(DYNAMIC_LINK_OPENVIBE_SDK "Dynamically link OpenViBE SDK" ON)
 
 # set(OPENVIBE_SDK_PATH "OPENVIBE_SDK_PATH-NOTFOUND")
-find_path(${OPENVIBE_SDK_PATH} include/openvibe/ov_all.h PATHS ${LIST_DEPENDENCIES_PATH} NO_DEFAULT_PATH)
+string(TOLOWER CMAKE_BUILD_TYPE OV_SDK_BUILD_TYPE)
+find_path(${OPENVIBE_SDK_PATH} include/openvibe/ov_all.h PATHS ${LIST_DEPENDENCIES_PATH} PATH_SUFFIXES openvibe-sdk-${OV_SDK_BUILD_TYPE} NO_DEFAULT_PATH)
 if(${OPENVIBE_SDK_PATH} STREQUAL "OPENVIBE_SDK_PATH-NOTFOUND")
 	message(FATAL_ERROR "  FAILED to find OpenViBE SDK [${OPENVIBE_SDK_PATH}]")
 endif()
@@ -32,24 +33,24 @@ else()
 	set(LINKING_SUFFIX Static)
 endif()
 
-if("${INCLUDED_CERTIVIBE_COMPONENTS}" STREQUAL "ALL")
-	list(REMOVE_ITEM INCLUDED_CERTIVIBE_COMPONENTS "ALL")
-	list(APPEND INCLUDED_CERTIVIBE_COMPONENTS BASE ALLPLUGINS ALLMODULES)
+if("${INCLUDED_OV_SDK_COMPONENTS}" STREQUAL "ALL")
+	list(REMOVE_ITEM INCLUDED_OV_SDK_COMPONENTS "ALL")
+	list(APPEND INCLUDED_OV_SDK_COMPONENTS BASE ALLPLUGINS ALLMODULES)
 endif()
 
-if(BASE IN_LIST INCLUDED_CERTIVIBE_COMPONENTS)
-	list(REMOVE_ITEM INCLUDED_CERTIVIBE_COMPONENTS BASE)
-	list(APPEND INCLUDED_CERTIVIBE_COMPONENTS MAIN KERNEL)	
+if(BASE IN_LIST INCLUDED_OV_SDK_COMPONENTS)
+	list(REMOVE_ITEM INCLUDED_OV_SDK_COMPONENTS BASE)
+	list(APPEND INCLUDED_OV_SDK_COMPONENTS MAIN KERNEL)	
 endif()
 
-if(ALLPLUGINS IN_LIST INCLUDED_CERTIVIBE_COMPONENTS)
-	list(REMOVE_ITEM INCLUDED_CERTIVIBE_COMPONENTS ALLPLUGINS)
-	list(APPEND INCLUDED_CERTIVIBE_COMPONENTS CLASSIFICATION DATA_GENERATION FEATURE_EXTRACTION FILE_IO SIGNAL_PROCESSING STIMULATION STREAM_CODECS STREAMING TOOLS)
+if(ALLPLUGINS IN_LIST INCLUDED_OV_SDK_COMPONENTS)
+	list(REMOVE_ITEM INCLUDED_OV_SDK_COMPONENTS ALLPLUGINS)
+	list(APPEND INCLUDED_OV_SDK_COMPONENTS CLASSIFICATION DATA_GENERATION FEATURE_EXTRACTION FILE_IO SIGNAL_PROCESSING STIMULATION STREAM_CODECS STREAMING TOOLS)
 endif()
 
-if(ALLMODULES IN_LIST INCLUDED_CERTIVIBE_COMPONENTS)
-	list(REMOVE_ITEM INCLUDED_CERTIVIBE_COMPONENTS ALLMODULES)
-	list(APPEND INCLUDED_CERTIVIBE_COMPONENTS EBML SYSTEM FS SOCKET XML DATE CSV TOOLKIT)
+if(ALLMODULES IN_LIST INCLUDED_OV_SDK_COMPONENTS)
+	list(REMOVE_ITEM INCLUDED_OV_SDK_COMPONENTS ALLMODULES)
+	list(APPEND INCLUDED_OV_SDK_COMPONENTS EBML SYSTEM FS SOCKET XML DATE CSV TOOLKIT)
 endif()
 
 if(WIN32)
@@ -75,8 +76,8 @@ elseif(UNIX)
 endif()
 
 function(add_component TOKEN MODULE_NAME)
-	if(${TOKEN} IN_LIST INCLUDED_CERTIVIBE_COMPONENTS)
-		target_link_libraries(${PROJECT_NAME} "${OPENVIBE_SDK_PATH}/lib/${LIB_PREFIX}${MODULE_NAME}${CERTIVIBE_LINKING}.${LIB_EXT}")
+	if(${TOKEN} IN_LIST INCLUDED_OV_SDK_COMPONENTS)
+		target_link_libraries(${PROJECT_NAME} "${OPENVIBE_SDK_PATH}/lib/${LIB_PREFIX}${MODULE_NAME}${OPENVIBE_SDK_LINKING}.${LIB_EXT}")
 		install(DIRECTORY ${OPENVIBE_SDK_PATH}/${ORIG_LIB_DIR}/ DESTINATION ${DEST_LIB_DIR} FILES_MATCHING PATTERN "*${MODULE_NAME}*${DLL_EXT}")
 		
 		set(FLAGS_LIST ${ARGV})
@@ -88,7 +89,7 @@ function(add_component TOKEN MODULE_NAME)
 endfunction(add_component)
 
 function(add_plugin TOKEN MODULE_NAME)
-	if(${TOKEN} IN_LIST INCLUDED_CERTIVIBE_COMPONENTS)
+	if(${TOKEN} IN_LIST INCLUDED_OV_SDK_COMPONENTS)
 		install(DIRECTORY ${OPENVIBE_SDK_PATH}/${ORIG_LIB_DIR}/ DESTINATION ${DEST_LIB_DIR} FILES_MATCHING PATTERN "*${MODULE_NAME}*${DLL_EXT}")
 	endif()
 endfunction(add_plugin)
@@ -107,20 +108,20 @@ add_component(CSV "openvibe-module-csv" "TARGET_HAS_CSV" "CSV_${LINKING_SUFFIX}"
 add_component(DATE "openvibe-module-date" "TARGET_HAS_DATE" "DATE_${LINKING_SUFFIX}")
 
 #plugins
-add_plugin(CLASSIFICATION "certivibe-plugins-classification")
-add_plugin(DATA_GENERATION "certivibe-plugins-data-generation")
-add_plugin(FEATURE_EXTRACTION "certivibe-plugins-feature-extraction")
-add_plugin(FILE_IO "certivibe-plugins-file-io")
-add_plugin(SIGNAL_PROCESSING "certivibe-plugins-signal-processing")
-add_plugin(STIMULATION "certivibe-plugins-stimulation")
-add_plugin(STREAM_CODECS "certivibe-plugins-stream-codecs") 
-add_plugin(STREAMING "certivibe-plugins-streaming")
-add_plugin(TOOLS "certivibe-plugins-tools")
+add_plugin(CLASSIFICATION "openvibe-plugins-base-classification")
+add_plugin(DATA_GENERATION "openvibe-plugins-base-data-generation")
+add_plugin(FEATURE_EXTRACTION "openvibe-plugins-base-feature-extraction")
+add_plugin(FILE_IO "openvibe-plugins-base-file-io")
+add_plugin(SIGNAL_PROCESSING "openvibe-plugins-base-signal-processing")
+add_plugin(STIMULATION "openvibe-plugins-base-stimulation")
+add_plugin(STREAM_CODECS "openvibe-plugins-base-stream-codecs") 
+add_plugin(STREAMING "openvibe-plugins-base-streaming")
+add_plugin(TOOLS "openvibe-plugins-base-tools")
 
 add_definitions(-DTARGET_HAS_ThirdPartyOpenViBEPluginsGlobalDefines)
 
 # Install binary dependencies if requested
-if(DEPENDENCIES IN_LIST INCLUDED_CERTIVIBE_COMPONENTS)
+if(DEPENDENCIES IN_LIST INCLUDED_OV_SDK_COMPONENTS)
 	if(WIN32)
 		install(
 			FILES
@@ -135,7 +136,7 @@ if(DEPENDENCIES IN_LIST INCLUDED_CERTIVIBE_COMPONENTS)
 endif()
 
 # if we link with the module socket in Static, we must link the project with the dependency on win32
-if(WIN32 AND SOCKET IN_LIST INCLUDED_CERTIVIBE_COMPONENTS AND NOT DYNAMIC_LINK_OPENVIBE_SDK)
+if(WIN32 AND SOCKET IN_LIST INCLUDED_OV_SDK_COMPONENTS AND NOT DYNAMIC_LINK_OPENVIBE_SDK)
 	include("FindThirdPartyWinsock2")
 	include("FindThirdPartyFTDI")
 endif()
diff --git a/scripts/linux-install_dependencies.pl b/scripts/linux-install_dependencies.pl
index 0ab096a4240f6b7a21343182b3b42ff41d5c00ce..4081108a24fa6e9ca0652f038c790c570c128dc0 100755
--- a/scripts/linux-install_dependencies.pl
+++ b/scripts/linux-install_dependencies.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 =pod
-This script will install dependencies for CertiViBE.
+This script will install dependencies for OpenViBE SDK.
 
 The installer uses the native package manager.
 
@@ -17,7 +17,7 @@ use File::Copy;
 
 sub usage {
   print "$0 [-h][-y]\n";
-  print "Install CertiViBE build dependencies\n";
+  print "Install OpenViBE SDK build dependencies\n";
   print "    Options:\n";
   print "      -h: this help\n";
   print "      -y: assume 'yes' to all prompts. Make it possible to run non-interactively.\n";
@@ -107,7 +107,7 @@ if ($distribution eq 'Ubuntu 14.04') {
   push @packages, "libxerces-c-dev";
   push @packages, "libgtest-dev";
 } elsif ($distribution eq 'Ubuntu 16.04') {
-  # common packages with certivibe
+  # common packages with OpenViBE SDK
   push @packages, "doxygen";
   push @packages, "make";
   push @packages, "cmake";
@@ -251,4 +251,4 @@ if ($compile_gtest) {
   }
   chdir $FindBin::Bin;
 }
-print("CertiViBE dependencies were successfully installed\n");
+print("OpenViBE SDK dependencies were successfully installed\n");
diff --git a/scripts/unix-build b/scripts/unix-build
index 6a27373c7d9e2ab2bb8512e5a5bb6c401da672be..bdf83b06348ddecb16e9075b0b558a7fb1d23b6f 100755
--- a/scripts/unix-build
+++ b/scripts/unix-build
@@ -130,12 +130,12 @@ then
 fi
 
 # Update directories only if they point to the default one
-if [[ ! -v ov_build_dir ]]; then
-	ov_build_dir="${ov_script_dir}/../../certivibe-build/build-${ov_build_type}"
+if [[ ! -v $ov_build_dir ]]; then
+	ov_build_dir="${ov_script_dir}/../../openvibe-sdk-build/build-${ov_build_type}"
 fi
 
-if [[ ! -v ov_install_dir ]]; then
-	ov_install_dir="${ov_script_dir}/../../certivibe-build/dist-${ov_build_type}"
+if [[ ! -v $ov_install_dir ]]; then
+	ov_install_dir="${ov_script_dir}/../../openvibe-sdk-build/dist-${ov_build_type}"
 fi
 if [[ ! -v ov_cmake_test_output ]]; then
 	ov_cmake_test_output="${ov_build_dir}/validation-test-output/"
diff --git a/scripts/windows-build.cmd b/scripts/windows-build.cmd
index 497af13c6cd0beef801fb77c6395bd08b663ce78..159c14925913b3f9f5506d6557dfecc1cc455ba7 100755
--- a/scripts/windows-build.cmd
+++ b/scripts/windows-build.cmd
@@ -169,10 +169,10 @@ if defined vsgenerate (
 )
 
 if not defined build_dir (
-	set build_dir=%script_dir%\..\..\certivibe-build\build-%BuildType%
+	set build_dir=%script_dir%\..\..\openvibe-sdk-build\build-%BuildType%
 )
 if not defined install_dir (
-	set install_dir=%script_dir%\..\..\certivibe-build\dist-%BuildType%
+	set install_dir=%script_dir%\..\..\openvibe-sdk-build\dist-%BuildType%
 )
 if not defined ov_cmake_test_output (
 	set ov_cmake_test_output=%build_dir%\validation-test-output\
@@ -216,7 +216,7 @@ if !builder! == None (
 	cmake --build . --target install
 	if not "!ERRORLEVEL!" == "0" goto terminate_error
 )
-if PackageOption == TRUE (
+if %PackageOption% == TRUE (
 	cmake --build . --target package
 	if not "!ERRORLEVEL!" == "0" goto terminate_error
 )
diff --git a/scripts/windows-generate-vs-project.cmd b/scripts/windows-generate-vs-project.cmd
index d38bc1109c23075c697d4f15a61dfc7191a19fc9..4e2c13ccd315829b5151c700124f102dcf3da1f1 100644
--- a/scripts/windows-generate-vs-project.cmd
+++ b/scripts/windows-generate-vs-project.cmd
@@ -1,4 +1,3 @@
 @echo off
 
 call windows-build.cmd --vsproject --release %*
-
diff --git a/scripts/windows-launch-visual-studio.cmd b/scripts/windows-launch-visual-studio.cmd
index 858c4fbaf9a0a276f7d0ba9f79046c9129d1bd27..eaf48d016727b4447686ed0dbc1343f81c6edf14 100644
--- a/scripts/windows-launch-visual-studio.cmd
+++ b/scripts/windows-launch-visual-studio.cmd
@@ -12,7 +12,7 @@ for %%A in (%*) DO (
 	)
 )
 
-SET "OV_PATH_ROOT=%CD%\..\..\certivibe-build\dist-%BuildType%"
+SET "OV_PATH_ROOT=%CD%\..\..\openvibe-sdk-build\dist-%BuildType%"
 SET "OV_PATH_BIN=%OV_PATH_ROOT%\bin"
 SET "OV_PATH_DATA=%OV_PATH_ROOT%\share\openvibe"
 SET "OV_PATH_LIB=%OV_PATH_ROOT%\bin"
@@ -22,7 +22,7 @@ if not defined USE_EXPRESS (
 	SET USE_EXPRESS=1
 )
 
-set SolutionPath=%CD%\..\..\certivibe-build\vs-project-%BuildType%\OpenVIBE.sln
+set SolutionPath=%CD%\..\..\openvibe-sdk-build\vs-project-%BuildType%\OpenVIBE.sln
 
 if %USE_EXPRESS% == 1 (
 	echo Use %VSCMake% Express Edition
diff --git a/toolkit/include/toolkit/codecs/ovtkTGenericCodec.h b/toolkit/include/toolkit/codecs/ovtkTGenericCodec.h
index 00b9f3ffbafeb2f7ddc63fd0a5a342c7dd2fb4ea..9e174f45f8fb11b3a2f785f85721fcce48111ebb 100644
--- a/toolkit/include/toolkit/codecs/ovtkTGenericCodec.h
+++ b/toolkit/include/toolkit/codecs/ovtkTGenericCodec.h
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE
+ * OpenViBE SDK
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/unit-test/CMakeLists.txt b/unit-test/CMakeLists.txt
index 05190d0a9e33a639bb0ed54d957fe8345f45a756..42ce93f536172a2eb6d39452c55e85c83b11b322 100755
--- a/unit-test/CMakeLists.txt
+++ b/unit-test/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(CertiViBETest)
+PROJECT(OpenViBESDKTest)
 
 # ------------------
 # Project variables
diff --git a/unit-test/CTestCustom.cmake.in b/unit-test/CTestCustom.cmake.in
index 5d45a948d66c939e2b12d3e55f44d6fc8b7fb96b..34feca0ef489f11d60c685d8318deea346ef5abf 100755
--- a/unit-test/CTestCustom.cmake.in
+++ b/unit-test/CTestCustom.cmake.in
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-base/CMakeLists.txt b/unit-test/openvibe-base/CMakeLists.txt
index 124a6921c0a5c71c4ccc48680a273e0f2ac31a68..46cd70bfed048dfae5b07ddc8f7f202ce81e25ce 100755
--- a/unit-test/openvibe-base/CMakeLists.txt
+++ b/unit-test/openvibe-base/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-base/uoTimeArithmeticTest.cpp b/unit-test/openvibe-base/uoTimeArithmeticTest.cpp
index 8c6f963eb5cd7db9eeced525d0899167341a2068..7c21006744e25ce43b281a34ac7681aedf96f756 100755
--- a/unit-test/openvibe-base/uoTimeArithmeticTest.cpp
+++ b/unit-test/openvibe-base/uoTimeArithmeticTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-kernel/CMakeLists.txt b/unit-test/openvibe-kernel/CMakeLists.txt
index fe092c52944135650cea75e010ca7d00b878fee5..b2af529188e83aed17deaa061386a4dcf8aaff6e 100755
--- a/unit-test/openvibe-kernel/CMakeLists.txt
+++ b/unit-test/openvibe-kernel/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 #
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-module-csv/CMakeLists.txt b/unit-test/openvibe-module-csv/CMakeLists.txt
index 6d348dc258d2d61441d1ee4be05958f47cf235a6..6c3deb578034ef924c31002e17cce9a8bd86582b 100755
--- a/unit-test/openvibe-module-csv/CMakeLists.txt
+++ b/unit-test/openvibe-module-csv/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 #
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
@@ -60,7 +60,7 @@ INCLUDE("FindOpenViBE")
 INCLUDE("FindOpenViBEModuleCSV")
 
 SET_PROPERTY(TARGET ${PROJECT_NAME} PROPERTY FOLDER ${OVT_UNIT_TESTS_FOLDER})
-# set(OV_MODULE_CSV "C:/gitdir/build/certivibe-debug/modules/csv/openvibe-module-csv")
+# set(OV_MODULE_CSV "C:/gitdir/build/openvibe-sdk-debug/modules/csv/openvibe-module-csv")
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${OVT_UNIT_TOOLKIT_LIB} ${GTEST_BOTH_LIBRARIES} ${OV_LIBS} ${OV_MODULE_CSV})
 
 # Add test without parameter to driver
diff --git a/unit-test/openvibe-module-csv/uoCSVReaderTest.cpp b/unit-test/openvibe-module-csv/uoCSVReaderTest.cpp
index 95e25597161b5adf10dab5064b38e4ef00aceb72..b39f8c0e35f782d78b80c89ad0850b5cd3dc66c2 100755
--- a/unit-test/openvibe-module-csv/uoCSVReaderTest.cpp
+++ b/unit-test/openvibe-module-csv/uoCSVReaderTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-csv/uoCSVWriterTest.cpp b/unit-test/openvibe-module-csv/uoCSVWriterTest.cpp
index c2b6ba4b2e7684fe4b7a6518244e901481a5ed66..22e79c019b46a33edfb5b6f1b9ba682b43b5de77 100755
--- a/unit-test/openvibe-module-csv/uoCSVWriterTest.cpp
+++ b/unit-test/openvibe-module-csv/uoCSVWriterTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-ebml/CMakeLists.txt b/unit-test/openvibe-module-ebml/CMakeLists.txt
index 523e687f7f6c7496f2bee950ee79e5a60325c28d..576c6c075481382f1499f9d85eebabf0e4d50220 100755
--- a/unit-test/openvibe-module-ebml/CMakeLists.txt
+++ b/unit-test/openvibe-module-ebml/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-module-ebml/uoEBMLReaderTest.cpp b/unit-test/openvibe-module-ebml/uoEBMLReaderTest.cpp
index 3ee951bf06af0da463af4546776162a67aceb8bf..d6b6ca1823588ba7a8718c1806a0dd7aee627d56 100755
--- a/unit-test/openvibe-module-ebml/uoEBMLReaderTest.cpp
+++ b/unit-test/openvibe-module-ebml/uoEBMLReaderTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-ebml/uoEBMLWriterTest.cpp b/unit-test/openvibe-module-ebml/uoEBMLWriterTest.cpp
index f180c5fb7513fefa1dd4259aa4c958783ff558e7..25d2c41de95a344dff3fb4a7e30fa5e8bf914216 100755
--- a/unit-test/openvibe-module-ebml/uoEBMLWriterTest.cpp
+++ b/unit-test/openvibe-module-ebml/uoEBMLWriterTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-fs/CMakeLists.txt b/unit-test/openvibe-module-fs/CMakeLists.txt
index 4040b9d8bdcff308f66c2f779ff82820e6d950d9..b0723d3e48ea8513301ee4ba1d30b4a36fbcb3b1 100755
--- a/unit-test/openvibe-module-fs/CMakeLists.txt
+++ b/unit-test/openvibe-module-fs/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-module-fs/uoEntryEnumeratorTest.cpp b/unit-test/openvibe-module-fs/uoEntryEnumeratorTest.cpp
index 1f443e717b7254facf067103203d86b16d9533f1..ef707e18f913f597590b60420ddf31081fc9e28e 100755
--- a/unit-test/openvibe-module-fs/uoEntryEnumeratorTest.cpp
+++ b/unit-test/openvibe-module-fs/uoEntryEnumeratorTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-fs/uoFilesTest.cpp b/unit-test/openvibe-module-fs/uoFilesTest.cpp
index d2ee1d1e9cdc7b086fed01cf0b3d51cafb9bb882..3e57ccdd3b40df2eae45c26665cc7b82fb5184c7 100755
--- a/unit-test/openvibe-module-fs/uoFilesTest.cpp
+++ b/unit-test/openvibe-module-fs/uoFilesTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-socket/CMakeLists.txt b/unit-test/openvibe-module-socket/CMakeLists.txt
index 674979e626113b6d586878a3e00d54fd9aa08191..991fd1ae23f65c8ff648b4b3d194352e0d9f0483 100755
--- a/unit-test/openvibe-module-socket/CMakeLists.txt
+++ b/unit-test/openvibe-module-socket/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-module-socket/uoSocketClientServerASyncCommunicationTest.cpp b/unit-test/openvibe-module-socket/uoSocketClientServerASyncCommunicationTest.cpp
index a2b7a70dc2ab39319b95f678f674c1012a77dd5e..6ca98529f93b61bb2682d0851aacad1ce62baa0a 100755
--- a/unit-test/openvibe-module-socket/uoSocketClientServerASyncCommunicationTest.cpp
+++ b/unit-test/openvibe-module-socket/uoSocketClientServerASyncCommunicationTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-socket/uoSocketClientServerBaseTest.cpp b/unit-test/openvibe-module-socket/uoSocketClientServerBaseTest.cpp
index 17d78bdd78a892c1cc49dc4e422285040316c74e..d04920e2c90a98e3f4ba17dd94275518fc5bc19d 100755
--- a/unit-test/openvibe-module-socket/uoSocketClientServerBaseTest.cpp
+++ b/unit-test/openvibe-module-socket/uoSocketClientServerBaseTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-socket/uoSocketClientServerSyncCommunicationTest.cpp b/unit-test/openvibe-module-socket/uoSocketClientServerSyncCommunicationTest.cpp
index 1421a28dc05cd79a48f208b2765cd82e3cabd05f..8141cf2eeddd842774aab0e2031be990a2fa5755 100755
--- a/unit-test/openvibe-module-socket/uoSocketClientServerSyncCommunicationTest.cpp
+++ b/unit-test/openvibe-module-socket/uoSocketClientServerSyncCommunicationTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-system/CMakeLists.txt b/unit-test/openvibe-module-system/CMakeLists.txt
index 0be685faf156a09367b326d74642947b120e6cb9..16619850136fa444ce032c7735448506d53e0883 100755
--- a/unit-test/openvibe-module-system/CMakeLists.txt
+++ b/unit-test/openvibe-module-system/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-module-system/uoDynamicModuleTest.cpp b/unit-test/openvibe-module-system/uoDynamicModuleTest.cpp
index 9a465b9bb4eefbebc660889bdfbbecc2a9412d67..e7db958b46557687a70a973fc36800bb06392821 100755
--- a/unit-test/openvibe-module-system/uoDynamicModuleTest.cpp
+++ b/unit-test/openvibe-module-system/uoDynamicModuleTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
  * Software License Agreement (AGPL-3 License)
  *
- * CertiViBE Test Software
+ * OpenViBE SDK Test Software
  * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
  * Copyright (C) Inria, 2015-2017,V1.0
  *
diff --git a/unit-test/openvibe-module-system/uoTimeTest.cpp b/unit-test/openvibe-module-system/uoTimeTest.cpp
index 8027877b1c24c6c378459fac5463e6b32109bcb2..5d293a9cef0122d18776b8ec226f616ea4aec6aa 100755
--- a/unit-test/openvibe-module-system/uoTimeTest.cpp
+++ b/unit-test/openvibe-module-system/uoTimeTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-xml/CMakeLists.txt b/unit-test/openvibe-module-xml/CMakeLists.txt
index 466d54df42887316d27187096d72c0e41817156a..55a8b7332a5379322678b69dda7bcd3d28fa193c 100755
--- a/unit-test/openvibe-module-xml/CMakeLists.txt
+++ b/unit-test/openvibe-module-xml/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-module-xml/uoXMLReaderTest.cpp b/unit-test/openvibe-module-xml/uoXMLReaderTest.cpp
index 6519b6b4dff481a4eb10c2abb80149d54aac64cc..1e54262066a68801959bc49dca9ad5c7f9ecaecf 100755
--- a/unit-test/openvibe-module-xml/uoXMLReaderTest.cpp
+++ b/unit-test/openvibe-module-xml/uoXMLReaderTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-module-xml/uoXMLWriterTest.cpp b/unit-test/openvibe-module-xml/uoXMLWriterTest.cpp
index b954e3e325186abf8b4ab2ffcbbaf7818e8a2dd1..e74ad8b2f2de9fb4a2d34ee9aa340ac6c7146593 100755
--- a/unit-test/openvibe-module-xml/uoXMLWriterTest.cpp
+++ b/unit-test/openvibe-module-xml/uoXMLWriterTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-toolkit/CMakeLists.txt b/unit-test/openvibe-toolkit/CMakeLists.txt
index 09ee3706d80c62f5e7a60aaae604fad17b8f6756..f19cf3000bbf7e602b30a9b9f37391c5d6ee5833 100755
--- a/unit-test/openvibe-toolkit/CMakeLists.txt
+++ b/unit-test/openvibe-toolkit/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 #
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/openvibe-toolkit/uoMatrixToolkitTest.cpp b/unit-test/openvibe-toolkit/uoMatrixToolkitTest.cpp
index 599dbd4a958be42a4a5849dc561ab0106d679e20..8456f39d6d1d582befec65ef13705673ade352fa 100755
--- a/unit-test/openvibe-toolkit/uoMatrixToolkitTest.cpp
+++ b/unit-test/openvibe-toolkit/uoMatrixToolkitTest.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/openvibe-toolkit/urExportScenarioToFileTest.cpp b/unit-test/openvibe-toolkit/urExportScenarioToFileTest.cpp
index d8a2b0a00b29288d374b748735c94d028e1392d3..85fb1967453139bb3f39e7b8c152b0b4e7f9bb73 100755
--- a/unit-test/openvibe-toolkit/urExportScenarioToFileTest.cpp
+++ b/unit-test/openvibe-toolkit/urExportScenarioToFileTest.cpp
@@ -30,17 +30,17 @@ int urExportScenarioToFileTest(int argc, char* argv[])
 		auto& context = fixture->context;
 
 		#if defined TARGET_OS_Windows
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-file-io*dll");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-stimulation*dll");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-tools*dll");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-file-io*dll");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-stimulation*dll");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-tools*dll");
 		#elif defined TARGET_OS_Linux
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-file-io*so");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-stimulation*so");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-tools*so");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-file-io*so");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-stimulation*so");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-tools*so");
 		#elif defined TARGET_OS_MacOS
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-file-io*dylib");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-stimulation*dylib");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-tools*dylib");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-file-io*dylib");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-stimulation*dylib");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-tools*dylib");
 		#endif
 
 		CIdentifier emptyScenarioIdentifier;
diff --git a/unit-test/openvibe-toolkit/urImportScenarioFromFileTest.cpp b/unit-test/openvibe-toolkit/urImportScenarioFromFileTest.cpp
index 2e7a90db729ece7b766da99aa70596d7fc2a89ae..832869a17415193eb010dbf593fd6ee5981c93c3 100755
--- a/unit-test/openvibe-toolkit/urImportScenarioFromFileTest.cpp
+++ b/unit-test/openvibe-toolkit/urImportScenarioFromFileTest.cpp
@@ -21,17 +21,17 @@ int urImportScenarioFromFileTest(int argc, char* argv[])
 		auto& context = fixture->context;
 
 		#if defined TARGET_OS_Windows
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-file-io*dll");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-stimulation*dll");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-tools*dll");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-file-io*dll");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-stimulation*dll");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-tools*dll");
 		#elif defined TARGET_OS_Linux
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-file-io*so");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-stimulation*so");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-tools*so");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-file-io*so");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-stimulation*so");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-tools*so");
 		#elif defined TARGET_OS_MacOS
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-file-io*dylib");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-stimulation*dylib");
-		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-tools*dylib");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-file-io*dylib");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-stimulation*dylib");
+		context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-tools*dylib");
 		#endif
 
 		std::string scenarioFilePath = std::string(dataDirectory) + "/" + s_SimpleScenarioFileName;
diff --git a/unit-test/openvibe-toolkit/urValidateScenarioTest.cpp b/unit-test/openvibe-toolkit/urValidateScenarioTest.cpp
index 7580e27738df6864c6cd0c84298c4ec1a4237fef..7ffd178ec32b8bb8627b3049775ed18a74840e92 100755
--- a/unit-test/openvibe-toolkit/urValidateScenarioTest.cpp
+++ b/unit-test/openvibe-toolkit/urValidateScenarioTest.cpp
@@ -307,17 +307,17 @@ int urValidateScenarioTest(int argc, char* argv[])
 	g_context = fixture->context;
 
 	#if defined TARGET_OS_Windows
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-file-io*dll");
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-stimulation*dll");
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/certivibe-plugins-tools*dll");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-file-io*dll");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-stimulation*dll");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/openvibe-plugins-sdk-tools*dll");
 	#elif defined TARGET_OS_Linux
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-file-io*so");
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-stimulation*so");
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-tools*so");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-file-io*so");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-stimulation*so");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-tools*so");
 	#elif defined TARGET_OS_MacOS
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-file-io*dylib");
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-stimulation*dylib");
-	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libcertivibe-plugins-tools*dylib");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-file-io*dylib");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-stimulation*dylib");
+	g_context->getPluginManager().addPluginsFromFiles(OpenViBE::Directories::getLibDir() + "/libopenvibe-plugins-sdk-tools*dylib");
 	#endif
 
 	::testing::InitGoogleTest(&argc, argv);
diff --git a/unit-test/unit-toolkit/CMakeLists.txt b/unit-test/unit-toolkit/CMakeLists.txt
index cbc839ae06e282cd8160444013cb5c05eeeb54e5..c992459e8d28b941d962ce8db03844b3b8bb53ae 100755
--- a/unit-test/unit-toolkit/CMakeLists.txt
+++ b/unit-test/unit-toolkit/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/unit-test/unit-toolkit/include/ovtAssert.h b/unit-test/unit-toolkit/include/ovtAssert.h
index bde4440ab19aed892ec050016e40c9c75ab479c8..f44d15b979d104389013eda04aebaccf9e8492c7 100755
--- a/unit-test/unit-toolkit/include/ovtAssert.h
+++ b/unit-test/unit-toolkit/include/ovtAssert.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/unit-toolkit/include/ovtTestFixture.h b/unit-test/unit-toolkit/include/ovtTestFixture.h
index b0325ae698a3b11f575e4e75d38d41390ac3f469..ab01e6231a3fc34a0b09f41ff1fe406c6064bb7c 100755
--- a/unit-test/unit-toolkit/include/ovtTestFixture.h
+++ b/unit-test/unit-toolkit/include/ovtTestFixture.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/unit-toolkit/include/ovtTestFixtureCommon.h b/unit-test/unit-toolkit/include/ovtTestFixtureCommon.h
index 6382a6371286d0355222878e7a9890e438c3cd4a..f69246775c4a98707a1bac534dd79ac2d5e756ba 100755
--- a/unit-test/unit-toolkit/include/ovtTestFixtureCommon.h
+++ b/unit-test/unit-toolkit/include/ovtTestFixtureCommon.h
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/unit-toolkit/src/ovtAssert.cpp b/unit-test/unit-toolkit/src/ovtAssert.cpp
index 02b984e897e55c537b19695f2a5ed8b279fa6115..701e5779396126375a8f2d3396f2fa7e4735ccff 100755
--- a/unit-test/unit-toolkit/src/ovtAssert.cpp
+++ b/unit-test/unit-toolkit/src/ovtAssert.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/unit-test/unit-toolkit/src/ovtTestFixtureCommon.cpp b/unit-test/unit-toolkit/src/ovtTestFixtureCommon.cpp
index ced1625a022e7db4bcc27edbb7f49ddeaf577e18..8439de205b94a312f49fa60aeeecc7daec53bb62 100755
--- a/unit-test/unit-toolkit/src/ovtTestFixtureCommon.cpp
+++ b/unit-test/unit-toolkit/src/ovtTestFixtureCommon.cpp
@@ -1,7 +1,7 @@
 /*********************************************************************
 * Software License Agreement (AGPL-3 License)
 *
-* CertiViBE Test Software
+* OpenViBE SDK Test Software
 * Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 * Copyright (C) Inria, 2015-2017,V1.0
 *
diff --git a/validation-test/CMakeLists.txt b/validation-test/CMakeLists.txt
index 6b41fa3f9401aaabb25b266ad0c79600370c44a3..260c6f97e0c86ccf3ea75bfc86763c9d8555892c 100755
--- a/validation-test/CMakeLists.txt
+++ b/validation-test/CMakeLists.txt
@@ -1,4 +1,4 @@
-PROJECT(CertiViBETest)
+PROJECT(OpenViBESDKTest)
 
 # ------------------
 # Project variables
diff --git a/validation-test/CTestCustom.cmake.in b/validation-test/CTestCustom.cmake.in
index 5d45a948d66c939e2b12d3e55f44d6fc8b7fb96b..34feca0ef489f11d60c685d8318deea346ef5abf 100755
--- a/validation-test/CTestCustom.cmake.in
+++ b/validation-test/CTestCustom.cmake.in
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/data/openvibe/openvibe.conf.in b/validation-test/data/openvibe/openvibe.conf.in
index 0652cf26b8ac22b2a0253d28c6ffd40e0f6d897a..d64516d783fbac28d053190fa9d36b90a523fb20 100755
--- a/validation-test/data/openvibe/openvibe.conf.in
+++ b/validation-test/data/openvibe/openvibe.conf.in
@@ -51,9 +51,9 @@ VRPN_ExternalServerPort = 53883
 # OpenViBE kernel configuration
 #####################################################################################
 
-Kernel_PluginsPatternMacOS = ${Path_Lib}/libcertivibe-plugins-*.dylib
-Kernel_PluginsPatternLinux = ${Path_Lib}/libcertivibe-plugins-*.so
-Kernel_PluginsPatternWindows = ${Path_Bin}/certivibe-plugins-*.dll
+Kernel_PluginsPatternMacOS = ${Path_Lib}/libopenvibe-plugins-*.dylib
+Kernel_PluginsPatternLinux = ${Path_Lib}/libopenvibe-plugins-*.so
+Kernel_PluginsPatternWindows = ${Path_Bin}/openvibe-plugins-*.dll
 Kernel_Plugins = ${Kernel_PluginsPattern${OperatingSystem}}
 Kernel_MainLogLevel = Trace
 Kernel_ConsoleLogLevel = Information
diff --git a/validation-test/openvibe-classification-lda/CMakeLists.txt b/validation-test/openvibe-classification-lda/CMakeLists.txt
index 0b3ed57997551440493353af88b4258defb84768..f1a04ecf094d6357c5c2c700832f179425d906c7 100755
--- a/validation-test/openvibe-classification-lda/CMakeLists.txt
+++ b/validation-test/openvibe-classification-lda/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/openvibe-file-io-csv/CMakeLists.txt b/validation-test/openvibe-file-io-csv/CMakeLists.txt
index 5885f40b916aab1ed7a71b687af712f4d72ef448..9736d4e197945e4d2bbe563816b22fb19e54d12e 100755
--- a/validation-test/openvibe-file-io-csv/CMakeLists.txt
+++ b/validation-test/openvibe-file-io-csv/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/openvibe-file-io-openvibe/CMakeLists.txt b/validation-test/openvibe-file-io-openvibe/CMakeLists.txt
index a73a6ddf33c19a28181e5ad8bff6f599ee0acd9f..e0bf2c47b832bbbcf406e38442d839a23e9d0622 100755
--- a/validation-test/openvibe-file-io-openvibe/CMakeLists.txt
+++ b/validation-test/openvibe-file-io-openvibe/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/openvibe-regularized-csp/CMakeLists.txt b/validation-test/openvibe-regularized-csp/CMakeLists.txt
index 7adbd053c167ffb499ec322ac729b8a74b63d55b..3972c43fa39748ec7193a72598325b58475c2b87 100755
--- a/validation-test/openvibe-regularized-csp/CMakeLists.txt
+++ b/validation-test/openvibe-regularized-csp/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/openvibe-stimulation-timeout/CMakeLists.txt b/validation-test/openvibe-stimulation-timeout/CMakeLists.txt
index 3962e6375686a1ba9e84749b43b8ff03bd09106d..b94e0d41be895eb2b0a8672c7413b8bc640ca651 100755
--- a/validation-test/openvibe-stimulation-timeout/CMakeLists.txt
+++ b/validation-test/openvibe-stimulation-timeout/CMakeLists.txt
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/python-toolkit/accuracy.py b/validation-test/python-toolkit/accuracy.py
index ba759cde7eeace5e170cd48e20b1d8324397aca0..b5d2b78bfb8736a7a200ff6b23693bb571f3ff09 100755
--- a/validation-test/python-toolkit/accuracy.py
+++ b/validation-test/python-toolkit/accuracy.py
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/python-toolkit/classification.py b/validation-test/python-toolkit/classification.py
index 080b985affc543d717a213db212b5d3ee767b870..d79bbdd5d2e3a1e8ad16895c2439857db25268c7 100755
--- a/validation-test/python-toolkit/classification.py
+++ b/validation-test/python-toolkit/classification.py
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 #
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/python-toolkit/csv-analyser.py b/validation-test/python-toolkit/csv-analyser.py
index e433d90fb2f7b5686d6ea1b0dac99d53e2f63262..53a84ea6e8ea0fd4236073209e2b1c53837ce21c 100755
--- a/validation-test/python-toolkit/csv-analyser.py
+++ b/validation-test/python-toolkit/csv-analyser.py
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #
diff --git a/validation-test/python-toolkit/csv-comparator.py b/validation-test/python-toolkit/csv-comparator.py
index 1eba0c4d673f9951da37363b95d0f15d265d7719..282eae4c13a6c2e5d78e7d4c80afdad1ace9e7a7 100755
--- a/validation-test/python-toolkit/csv-comparator.py
+++ b/validation-test/python-toolkit/csv-comparator.py
@@ -1,7 +1,7 @@
 #######################################################################
 # Software License Agreement (AGPL-3 License)
 # 
-# CertiViBE Test Software
+# OpenViBE SDK Test Software
 # Based on OpenViBE V1.1.0, Copyright (C) Inria, 2006-2015
 # Copyright (C) Inria, 2015-2017,V1.0
 #