diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 1ef46df..5d69b44 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -15,7 +15,7 @@ include(FetchContent)
 FetchContent_Declare(
     instrument_hooks_repo
     GIT_REPOSITORY https://github.com/CodSpeedHQ/instrument-hooks
-    GIT_TAG e86719c70c9c0b1646db182a7c748230e243dace
+    GIT_TAG 0c971823b17cb5a3bbd0cce4411cbee2c6fe4317
 )
 FetchContent_MakeAvailable(instrument_hooks_repo)
 FetchContent_GetProperties(instrument_hooks_repo)
diff --git a/core/include/measurement.hpp b/core/include/measurement.hpp
index 20f211a..ae773db 100644
--- a/core/include/measurement.hpp
+++ b/core/include/measurement.hpp
@@ -38,19 +38,19 @@ inline void measurement_set_metadata() {
 
   // Report C++ toolchain information
 #ifdef CODSPEED_CXX_COMPILER_ID
-  instrument_hooks_set_environment(g_hooks, "C++ Compiler", "compiler_id",
+  instrument_hooks_set_environment(g_hooks, "cpp", "compiler_id",
                                    CODSPEED_CXX_COMPILER_ID);
 #endif
 #ifdef CODSPEED_CXX_COMPILER_VERSION
-  instrument_hooks_set_environment(g_hooks, "C++ Compiler", "version",
+  instrument_hooks_set_environment(g_hooks, "cpp", "version",
                                    CODSPEED_CXX_COMPILER_VERSION);
 #endif
 #ifdef CODSPEED_CXX_COMPILER_FULL_VERSION
-  instrument_hooks_set_environment(g_hooks, "C++ Compiler", "build",
+  instrument_hooks_set_environment(g_hooks, "cpp", "build",
                                    CODSPEED_CXX_COMPILER_FULL_VERSION);
 #endif
 #ifdef CODSPEED_BUILD_TYPE
-  instrument_hooks_set_environment(g_hooks, "C++ Compiler", "build_type",
+  instrument_hooks_set_environment(g_hooks, "cpp", "build_type",
                                    CODSPEED_BUILD_TYPE);
 #endif
   instrument_hooks_write_environment(g_hooks, static_cast<uint32_t>(getpid()));
diff --git a/core/instrument-hooks b/core/instrument-hooks
index e86719c..0c97182 160000
--- a/core/instrument-hooks
+++ b/core/instrument-hooks
@@ -1 +1 @@
-Subproject commit e86719c70c9c0b1646db182a7c748230e243dace
+Subproject commit 0c971823b17cb5a3bbd0cce4411cbee2c6fe4317