diff --git a/main.cpp b/main.cpp
index e9de21c..4dc8c27 100644
--- a/main.cpp
+++ b/main.cpp
@@ -23,6 +23,7 @@
 #include "lpc_handler.hpp"
 #include "lpc_nuvoton.hpp"
 #include "pci_handler.hpp"
+#include "util.hpp"
 
 #include <cstdint>
 #include <memory>
@@ -61,12 +62,12 @@
 #endif
 
 std::vector<HandlerPack> supportedFirmware = {
-    {FirmwareBlobHandler::hashBlobID, &hashHandler},
+    {hashBlobId, &hashHandler},
 #ifdef ENABLE_STATIC_LAYOUT
-    {"/flash/image", &staticLayoutHandler},
+    {staticLayoutBlobId, &staticLayoutHandler},
 #endif
 #ifdef ENABLE_TARBALL_UBI
-    {"/flash/tarball", &ubitarballHandler},
+    {ubiTarballBlobId, &ubitarballHandler},
 #endif
 };