diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index 13d0748..d098c8d 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -24,7 +24,7 @@ TEST_QT_H = \
   qt/test/util.h \
   qt/test/wallettests.h
 
-qt_test_test_vexta_qt_CPPFLAGS = $(AM_CPPFLAGS) $(DIGIBYTE_INCLUDES) $(DIGIBYTE_QT_INCLUDES) \
+qt_test_test_vexta_qt_CPPFLAGS = $(AM_CPPFLAGS) $(VEXTA_INCLUDES) $(VEXTA_QT_INCLUDES) \
   $(QT_INCLUDES) $(QT_TEST_INCLUDES)
 
 qt_test_test_vexta_qt_SOURCES = \
@@ -43,17 +43,17 @@ endif # ENABLE_WALLET
 
 nodist_qt_test_test_vexta_qt_SOURCES = $(TEST_QT_MOC_CPP)
 
-qt_test_test_vexta_qt_LDADD = $(LIBDIGIBYTEQT) $(LIBDIGIBYTE_SERVER) $(LIBTEST_UTIL)
+qt_test_test_vexta_qt_LDADD = $(LIBVEXTAQT) $(LIBVEXTA_SERVER) $(LIBTEST_UTIL)
 if ENABLE_WALLET
-qt_test_test_vexta_qt_LDADD += $(LIBDIGIBYTE_UTIL) $(LIBDIGIBYTE_WALLET)
+qt_test_test_vexta_qt_LDADD += $(LIBVEXTA_UTIL) $(LIBVEXTA_WALLET)
 endif
 if ENABLE_ZMQ
-qt_test_test_vexta_qt_LDADD += $(LIBDIGIBYTE_ZMQ) $(ZMQ_LIBS)
+qt_test_test_vexta_qt_LDADD += $(LIBVEXTA_ZMQ) $(ZMQ_LIBS)
 endif
-qt_test_test_vexta_qt_LDADD += $(LIBDIGIBYTE_CLI) $(LIBDIGIBYTE_COMMON) $(LIBDIGIBYTE_UTIL) $(LIBDIGIBYTE_CONSENSUS) $(LIBDIGIBYTE_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
+qt_test_test_vexta_qt_LDADD += $(LIBVEXTA_CLI) $(LIBVEXTA_COMMON) $(LIBVEXTA_UTIL) $(LIBVEXTA_CONSENSUS) $(LIBVEXTA_PQ) $(LIBVEXTA_CRYPTO) $(LIBUNIVALUE) $(LIBLEVELDB) \
   $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(QT_DBUS_LIBS) $(QT_TEST_LIBS) $(QT_LIBS) \
   $(QR_LIBS) $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(LIBSECP256K1) \
-  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(SQLITE_LIBS)
+  $(EVENT_PTHREADS_LIBS) $(EVENT_LIBS) $(SQLITE_LIBS) $(RANDOMX_LIBS)
 qt_test_test_vexta_qt_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
 qt_test_test_vexta_qt_CXXFLAGS = $(AM_CXXFLAGS) $(QT_PIE_FLAGS)
 
diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index dc39dff..9a5b3b1 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -42,6 +42,7 @@ FUZZ_SUITE_LD_COMMON = \
  $(LIBVEXTA_COMMON) \
  $(LIBVEXTA_UTIL) \
  $(LIBVEXTA_CONSENSUS) \
+ $(LIBVEXTA_PQ) \
  $(LIBVEXTA_CRYPTO) \
  $(LIBVEXTA_CLI) \
  $(LIBUNIVALUE) \
@@ -179,7 +180,7 @@ DIGIBYTE_TEST_SUITE += \
 endif
 
 test_test_digibyte_SOURCES = $(DIGIBYTE_TEST_SUITE) $(DIGIBYTE_TESTS) $(JSON_TEST_FILES) $(RAW_TEST_FILES)
-test_test_digibyte_CPPFLAGS = $(AM_CPPFLAGS) $(DIGIBYTE_INCLUDES) $(UNIVALUE_CFLAGS) $(TESTDEFS) $(EVENT_CFLAGS) $(LEVELDB_CPPFLAGS)
+test_test_digibyte_CPPFLAGS = $(AM_CPPFLAGS) $(VEXTA_INCLUDES) $(UNIVALUE_CFLAGS) $(TESTDEFS) $(EVENT_CFLAGS) $(LEVELDB_CPPFLAGS)
 test_test_digibyte_LDADD = $(LIBTEST_UTIL) $(LIBVEXTA_PQ)
 if ENABLE_WALLET
 test_test_digibyte_LDADD += $(LIBVEXTA_WALLET)
@@ -200,7 +201,7 @@ endif
 FUZZ_SUITE_LDFLAGS_COMMON = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
 
 if ENABLE_FUZZ_BINARY
-test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(DIGIBYTE_INCLUDES)
+test_fuzz_fuzz_CPPFLAGS = $(AM_CPPFLAGS) $(VEXTA_INCLUDES)
 test_fuzz_fuzz_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 test_fuzz_fuzz_LDADD = $(FUZZ_SUITE_LD_COMMON)
 test_fuzz_fuzz_LDFLAGS = $(FUZZ_SUITE_LDFLAGS_COMMON)
diff --git a/src/Makefile.test_fuzz.include b/src/Makefile.test_fuzz.include
index bcba903..8be79bf 100644
--- a/src/Makefile.test_fuzz.include
+++ b/src/Makefile.test_fuzz.include
@@ -12,7 +12,7 @@ TEST_FUZZ_H = \
     test/fuzz/FuzzedDataProvider.h \
     test/fuzz/util.h
 
-libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(DIGIBYTE_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
+libtest_fuzz_a_CPPFLAGS = $(AM_CPPFLAGS) $(VEXTA_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS)
 libtest_fuzz_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libtest_fuzz_a_SOURCES = \
   test/fuzz/fuzz.cpp \
diff --git a/src/Makefile.test_util.include b/src/Makefile.test_util.include
index 59a57b1..a6e8fe7 100644
--- a/src/Makefile.test_util.include
+++ b/src/Makefile.test_util.include
@@ -19,7 +19,7 @@ TEST_UTIL_H = \
     test/util/validation.h \
     test/util/wallet.h
 
-libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(DIGIBYTE_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) $(LEVELDB_CPPFLAGS) $(UNIVALUE_CFLAGS)
+libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(VEXTA_INCLUDES) $(MINIUPNPC_CPPFLAGS) $(NATPMP_CPPFLAGS) $(EVENT_CFLAGS) $(EVENT_PTHREADS_CFLAGS) $(LEVELDB_CPPFLAGS) $(UNIVALUE_CFLAGS)
 libtest_util_a_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 libtest_util_a_SOURCES = \
   test/util/blockfilter.cpp \