diff --git a/assemble/bin/accumulo-cluster b/assemble/bin/accumulo-cluster
index 0b3126ce01e..7b065ecb01f 100755
--- a/assemble/bin/accumulo-cluster
+++ b/assemble/bin/accumulo-cluster
@@ -408,9 +408,9 @@ function execute_command() {
   servers_per_host="${!S:-1}"
 
   if [[ $ARG_LOCAL == 1 ]]; then
-    debugOrRunAsync bash -c "ACCUMULO_CLUSTER_ARG=$servers_per_host \"$bin/accumulo-service\" $service $control_cmd -o general.process.bind.addr=$host $*"
+    debugOrRunAsync bash -c "ACCUMULO_CLUSTER_ARG=$servers_per_host \"$bin/accumulo-service\" $service $control_cmd -o rpc.bind.addr=$host $*"
   else
-    debugOrRunAsync "${SSH[@]}" "$host" "bash -c 'ACCUMULO_CLUSTER_ARG=$servers_per_host \"$bin/accumulo-service\" $service $control_cmd -o general.process.bind.addr=$host $*'"
+    debugOrRunAsync "${SSH[@]}" "$host" "bash -c 'ACCUMULO_CLUSTER_ARG=$servers_per_host \"$bin/accumulo-service\" $service $control_cmd -o rpc.bind.addr=$host $*'"
   fi
 }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/cli/ServerOpts.java b/core/src/main/java/org/apache/accumulo/core/cli/ServerOpts.java
index 0158fb4126a..4d8b39e191a 100644
--- a/core/src/main/java/org/apache/accumulo/core/cli/ServerOpts.java
+++ b/core/src/main/java/org/apache/accumulo/core/cli/ServerOpts.java
@@ -49,7 +49,7 @@ public List<String> split(String value) {
       description = "Overrides configuration set in accumulo.properties (but NOT system-wide config"
           + " set in Zookeeper). This is useful when you have process specific configuration items"
           + " that are one-offs from a shared common configuration. Setting the bind address,"
-          + " for example, can be done with the arguments \"-o general.process.bind.addr=127.0.0.1\"."
+          + " for example, can be done with the arguments \"-o rpc.bind.addr=127.0.0.1\"."
           + " Expected format: -o <key>=<value> [-o <key>=<value>]")
   private List<String> overrides = new ArrayList<>();
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
index 1cadeabaa33..321f09d429e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
@@ -99,6 +99,7 @@ public static void startServer(AbstractServer server, Logger LOG) throws Excepti
   private final AtomicBoolean closed = new AtomicBoolean(false);
   private final Set<String> monitorMetricExclusions;
 
+  @SuppressWarnings("deprecation")
   protected AbstractServer(ServerId.Type serverType, ServerOpts opts,
       BiFunction<SiteConfiguration,ResourceGroupId,ServerContext> serverContextFactory,
       String[] args) {
@@ -106,10 +107,10 @@ protected AbstractServer(ServerId.Type serverType, ServerOpts opts,
     this.applicationName = serverType.name();
     opts.parseArgs(applicationName, args);
     var siteConfig = opts.getSiteConfiguration();
-    final String newBindParameter = siteConfig.get(Property.RPC_PROCESS_BIND_ADDRESS);
+    final String newBindParameter = siteConfig.get(siteConfig
+        .resolve(Property.RPC_PROCESS_BIND_ADDRESS, Property.GENERAL_PROCESS_BIND_ADDRESS));
     // If new bind parameter passed on command line or in file, then use it.
-    if (newBindParameter != null
-        && !newBindParameter.equals(Property.RPC_PROCESS_BIND_ADDRESS.getDefaultValue())) {
+    if (newBindParameter != null && !newBindParameter.isBlank()) {
       this.bindAddress = newBindParameter;
     } else {
       this.bindAddress = ServerOpts.BIND_ALL_ADDRESSES;