Index: src/Makefile.test.include
===================================================================
--- src/Makefile.test.include
+++ src/Makefile.test.include
@@ -65,10 +65,10 @@
   test/mempool_tests.cpp \
   test/merkle_tests.cpp \
   test/miner_tests.cpp \
-  test/monolith_opcodes.cpp \
   test/multisig_tests.cpp \
   test/net_tests.cpp \
   test/netbase_tests.cpp \
+  test/opcode_tests.cpp \
   test/pmt_tests.cpp \
   test/policyestimator_tests.cpp \
   test/pow_tests.cpp \
Index: src/test/CMakeLists.txt
===================================================================
--- src/test/CMakeLists.txt
+++ src/test/CMakeLists.txt
@@ -80,10 +80,10 @@
 	mempool_tests.cpp
 	merkle_tests.cpp
 	miner_tests.cpp
-	monolith_opcodes.cpp
 	multisig_tests.cpp
 	net_tests.cpp
 	netbase_tests.cpp
+	opcode_tests.cpp
 	pmt_tests.cpp
 	policyestimator_tests.cpp
 	pow_tests.cpp
Index: src/test/opcode_tests.cpp
===================================================================
--- src/test/opcode_tests.cpp
+++ src/test/opcode_tests.cpp
@@ -14,7 +14,7 @@
 typedef std::vector<uint8_t> valtype;
 typedef std::vector<valtype> stacktype;
 
-BOOST_FIXTURE_TEST_SUITE(monolith_opcodes_tests, BasicTestingSetup)
+BOOST_FIXTURE_TEST_SUITE(opcode_tests, BasicTestingSetup)
 
 std::array<uint32_t, 3> flagset{
     {0, STANDARD_SCRIPT_VERIFY_FLAGS, MANDATORY_SCRIPT_VERIFY_FLAGS}};