diff --git a/src/miner.cpp b/src/miner.cpp
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -222,7 +222,7 @@
     pblock->nBits = GetNextWorkRequired(pindexPrev, pblock, *config);
     pblock->nNonce = 0;
     pblocktemplate->entries[0].txSigOps = GetSigOpCountWithoutP2SH(
-        *pblocktemplate->entries[0].tx, STANDARD_CHECKDATASIG_VERIFY_FLAGS);
+        *pblocktemplate->entries[0].tx, STANDARD_SCRIPT_VERIFY_FLAGS);
 
     // Copy all the transactions into the block
     // FIXME: This should be removed as it is significant overhead.
diff --git a/src/policy/policy.h b/src/policy/policy.h
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@@ -86,7 +86,7 @@
     SCRIPT_VERIFY_NULLDUMMY | SCRIPT_VERIFY_SIGPUSHONLY |
     SCRIPT_VERIFY_MINIMALDATA | SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS |
     SCRIPT_VERIFY_CLEANSTACK | SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY |
-    SCRIPT_VERIFY_CHECKSEQUENCEVERIFY;
+    SCRIPT_VERIFY_CHECKSEQUENCEVERIFY | SCRIPT_ENABLE_CHECKDATASIG;
 
 /**
  * For convenience, standard but not mandatory verify flags.
@@ -105,14 +105,6 @@
 
 bool IsDust(const CTxOut &txout, const CFeeRate &dustRelayFee);
 
-/**
- * Used as the flags parameters to check for sigops as if OP_CHECKDATASIG is
- * enabled. Can be removed after OP_CHECKDATASIG is activated as the flag is
- * made standard.
- */
-static const uint32_t STANDARD_CHECKDATASIG_VERIFY_FLAGS =
-    STANDARD_SCRIPT_VERIFY_FLAGS | SCRIPT_ENABLE_CHECKDATASIG;
-
 bool IsStandard(const CScript &scriptPubKey, txnouttype &whichType);
 
 /**
diff --git a/src/policy/policy.cpp b/src/policy/policy.cpp
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@@ -165,8 +165,8 @@
             }
 
             CScript subscript(stack.back().begin(), stack.back().end());
-            if (subscript.GetSigOpCount(STANDARD_CHECKDATASIG_VERIFY_FLAGS,
-                                        true) > MAX_P2SH_SIGOPS) {
+            if (subscript.GetSigOpCount(STANDARD_SCRIPT_VERIFY_FLAGS, true) >
+                MAX_P2SH_SIGOPS) {
                 return false;
             }
         }
diff --git a/src/test/checkdatasig_tests.cpp b/src/test/checkdatasig_tests.cpp
--- a/src/test/checkdatasig_tests.cpp
+++ b/src/test/checkdatasig_tests.cpp
@@ -255,7 +255,7 @@
 }
 
 BOOST_AUTO_TEST_CASE(checkdatasig_inclusion_in_standard_and_mandatory_flags) {
-    BOOST_CHECK(!(STANDARD_SCRIPT_VERIFY_FLAGS & SCRIPT_ENABLE_CHECKDATASIG));
+    BOOST_CHECK(STANDARD_SCRIPT_VERIFY_FLAGS & SCRIPT_ENABLE_CHECKDATASIG);
     BOOST_CHECK(!(MANDATORY_SCRIPT_VERIFY_FLAGS & SCRIPT_ENABLE_CHECKDATASIG));
 }
 
diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp
--- a/src/test/script_P2SH_tests.cpp
+++ b/src/test/script_P2SH_tests.cpp
@@ -416,7 +416,7 @@
     BOOST_CHECK(::AreInputsStandard(CTransaction(txTo), coins));
     // 22 P2SH sigops for all inputs (1 for vin[0], 6 for vin[3], 15 for vin[4]
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txTo), coins,
-                                        STANDARD_CHECKDATASIG_VERIFY_FLAGS),
+                                        STANDARD_SCRIPT_VERIFY_FLAGS),
                       22U);
     // Check that no sigops show up when P2SH is not activated.
     BOOST_CHECK_EQUAL(
@@ -434,7 +434,7 @@
 
     BOOST_CHECK(!::AreInputsStandard(CTransaction(txToNonStd1), coins));
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd1), coins,
-                                        STANDARD_CHECKDATASIG_VERIFY_FLAGS),
+                                        STANDARD_SCRIPT_VERIFY_FLAGS),
                       16U);
     // Check that no sigops show up when P2SH is not activated.
     BOOST_CHECK_EQUAL(
@@ -453,7 +453,7 @@
 
     BOOST_CHECK(!::AreInputsStandard(CTransaction(txToNonStd2), coins));
     BOOST_CHECK_EQUAL(GetP2SHSigOpCount(CTransaction(txToNonStd2), coins,
-                                        STANDARD_CHECKDATASIG_VERIFY_FLAGS),
+                                        STANDARD_SCRIPT_VERIFY_FLAGS),
                       20U);
     // Check that no sigops show up when P2SH is not activated.
     BOOST_CHECK_EQUAL(
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -588,8 +588,8 @@
                                  "bad-txns-nonstandard-inputs");
         }
 
-        int64_t nSigOpsCount = GetTransactionSigOpCount(
-            tx, view, STANDARD_CHECKDATASIG_VERIFY_FLAGS);
+        int64_t nSigOpsCount =
+            GetTransactionSigOpCount(tx, view, STANDARD_SCRIPT_VERIFY_FLAGS);
 
         Amount nValueOut = tx.GetValueOut();
         Amount nFees = nValueIn - nValueOut;