diff --git a/src/clientversion.cpp b/src/clientversion.cpp
index 2a300ce81..6e91697d6 100644
--- a/src/clientversion.cpp
+++ b/src/clientversion.cpp
@@ -19,7 +19,7 @@
  * for both bitcoind and bitcoin-core, to make it harder for attackers to
  * target servers or GUI users specifically.
  */
-const std::string CLIENT_NAME("YODA");
+const std::string CLIENT_NAME("YODA-EXT");
 
 /**
  * Client version number
diff --git a/src/deprecation.h b/src/deprecation.h
index b19f16fad..1a621246c 100644
--- a/src/deprecation.h
+++ b/src/deprecation.h
@@ -9,7 +9,7 @@
 // Deprecation policy:
 // * Shut down 16 weeks' worth of blocks after the estimated release block height.
 // * A warning is shown during the 2 weeks' worth of blocks prior to shut down.
-static const int APPROX_RELEASE_HEIGHT = 1208650; // Aug 2023
+static const int APPROX_RELEASE_HEIGHT = 1928680; // Assigned many blocks ahead to buy time, this allows about 3.4 years for the next release
 static const int WEEKS_UNTIL_DEPRECATION = 16;
 static const int DEPRECATION_HEIGHT = APPROX_RELEASE_HEIGHT + (WEEKS_UNTIL_DEPRECATION * 7 * 24 * 24);