1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index cadbfc88cb..732ee67268 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -50,7 +50,7 @@ module ActionDispatch
       @original_fullpath = nil
       @fullpath          = nil
       @ip                = nil
-      @uuid              = nil
+      @request_id        = nil
     end
 
     def check_path_parameters!
@@ -114,7 +114,7 @@ module ActionDispatch
     end
 
     def engine_script_name(_routes) # :nodoc:
-      env["ROUTES_#{_routes.object_id}_SCRIPT_NAME"]
+      env[_routes.env_key]
     end
 
     def request_method=(request_method) #:nodoc:
@@ -249,10 +249,12 @@ module ActionDispatch
     #
     # This unique ID is useful for tracing a request from end-to-end as part of logging or debugging.
     # This relies on the rack variable set by the ActionDispatch::RequestId middleware.
-    def uuid
-      @uuid ||= env["action_dispatch.request_id"]
+    def request_id
+      @request_id ||= env["action_dispatch.request_id"]
     end
 
+    alias_method :uuid, :request_id
+
     # Returns the lowercase name of the HTTP server software.
     def server_software
       (@env['SERVER_SOFTWARE'] && /^([a-zA-Z]+)/ =~ @env['SERVER_SOFTWARE']) ? $1.downcase : nil