diff --git a/npc/CMakeLists.txt b/npc/CMakeLists.txt
index 451a082..b4621bb 100644
--- a/npc/CMakeLists.txt
+++ b/npc/CMakeLists.txt
@@ -79,12 +79,12 @@ add_test(NAME V${TOPMODULE} COMMAND V${TOPMODULE})
 # -- Add build tracking
 add_custom_command(
     TARGET V${TOPMODULE}_nvboard PRE_BUILD
-    COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "build_V${TOPMODULE}_nvboard"
+    COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "build_${CMAKE_PROJECT_NAME}_V${TOPMODULE}_nvboard"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..
 )
 
 add_custom_command(
     TARGET V${TOPMODULE} PRE_BUILD
-    COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "build_V${TOPMODULE}"
+    COMMAND ${CMAKE_SOURCE_DIR}/../git_commit.sh "build_${CMAKE_PROJECT_NAME}_V${TOPMODULE}"
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/..
 )