diff --git a/src/Makefile.test.include b/src/Makefile.test.include
index e5287bc..63c1ba7 100644
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -37,13 +37,13 @@ DIGIBYTE_TEST_SUITE = \
 FUZZ_SUITE_LD_COMMON = \
  $(LIBTEST_UTIL) \
  $(LIBTEST_FUZZ) \
- $(LIBDIGIBYTE_SERVER) \
- $(LIBDIGIBYTE_WALLET) \
- $(LIBDIGIBYTE_COMMON) \
- $(LIBDIGIBYTE_UTIL) \
- $(LIBDIGIBYTE_CONSENSUS) \
- $(LIBDIGIBYTE_CRYPTO) \
- $(LIBDIGIBYTE_CLI) \
+ $(LIBVEXTA_SERVER) \
+ $(LIBVEXTA_WALLET) \
+ $(LIBVEXTA_COMMON) \
+ $(LIBVEXTA_UTIL) \
+ $(LIBVEXTA_CONSENSUS) \
+ $(LIBVEXTA_CRYPTO) \
+ $(LIBVEXTA_CLI) \
  $(LIBUNIVALUE) \
  $(LIBLEVELDB) \
  $(LIBLEVELDB_SSE42) \
@@ -178,13 +178,13 @@ 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)
+test_test_digibyte_CPPFLAGS = $(AM_CPPFLAGS) $(DIGIBYTE_INCLUDES) $(UNIVALUE_CFLAGS) $(TESTDEFS) $(EVENT_CFLAGS) $(LEVELDB_CPPFLAGS)
 test_test_digibyte_LDADD = $(LIBTEST_UTIL) $(LIBVEXTA_PQ)
 if ENABLE_WALLET
-test_test_digibyte_LDADD += $(LIBDIGIBYTE_WALLET)
+test_test_digibyte_LDADD += $(LIBVEXTA_WALLET)
 endif
 
-test_test_digibyte_LDADD += $(LIBDIGIBYTE_SERVER) $(LIBDIGIBYTE_CLI) $(LIBDIGIBYTE_COMMON) $(LIBDIGIBYTE_UTIL) $(LIBDIGIBYTE_CONSENSUS) $(LIBDIGIBYTE_CRYPTO) $(LIBUNIVALUE) \
+test_test_digibyte_LDADD += $(LIBVEXTA_SERVER) $(LIBVEXTA_CLI) $(LIBVEXTA_COMMON) $(LIBVEXTA_UTIL) $(LIBVEXTA_CONSENSUS) $(LIBVEXTA_CRYPTO) $(LIBUNIVALUE) \
   $(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS)
 test_test_digibyte_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
 
@@ -192,8 +192,8 @@ test_test_digibyte_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(NATPMP_LIBS) $(SQLIT
 test_test_digibyte_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS) -static
 
 if ENABLE_ZMQ
-test_test_digibyte_LDADD += $(LIBDIGIBYTE_ZMQ) $(ZMQ_LIBS)
-FUZZ_SUITE_LD_COMMON += $(LIBDIGIBYTE_ZMQ) $(ZMQ_LIBS)
+test_test_digibyte_LDADD += $(LIBVEXTA_ZMQ) $(ZMQ_LIBS)
+FUZZ_SUITE_LD_COMMON += $(LIBVEXTA_ZMQ) $(ZMQ_LIBS)
 endif
 
 FUZZ_SUITE_LDFLAGS_COMMON = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) $(PTHREAD_FLAGS)
diff --git a/src/Makefile.test_util.include b/src/Makefile.test_util.include
index 0767882..59a57b1 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)
+libtest_util_a_CPPFLAGS = $(AM_CPPFLAGS) $(DIGIBYTE_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 \