diff --git a/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php b/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php
index ac602129d75..9e699a25083 100644
--- a/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php
+++ b/Neos.Neos/Classes/FrontendRouting/EventSourcedFrontendNodeRoutePartHandler.php
@@ -317,8 +317,8 @@ private function resolveNodeAddress(
             $uriConstraints
         );
 
-        if (!empty($this->options['uriSuffix']) && $nodeInfo->hasUriPath()) {
-            $uriConstraints = $uriConstraints->withPathSuffix($this->options['uriSuffix']);
+        if (!empty($this->options['uriPathSuffix']) && $nodeInfo->hasUriPath()) {
+            $uriConstraints = $uriConstraints->withPathSuffix($this->options['uriPathSuffix']);
         }
         return new ResolveResult($nodeInfo->getUriPath(), $uriConstraints, $nodeInfo->getRouteTags());
     }
@@ -326,8 +326,8 @@ private function resolveNodeAddress(
 
     private function truncateRequestPathAndReturnRemainder(string &$requestPath): string
     {
-        if (!empty($this->options['uriSuffix'])) {
-            $suffixPosition = strpos($requestPath, $this->options['uriSuffix']);
+        if (!empty($this->options['uriPathSuffix'])) {
+            $suffixPosition = strpos($requestPath, $this->options['uriPathSuffix']);
             if ($suffixPosition === false) {
                 return '';
             }