diff --git a/library/server/request/router/src/router/request_router.e b/library/server/request/router/src/router/request_router.e
index 78bce332..b5f0e414 100644
--- a/library/server/request/router/src/router/request_router.e
+++ b/library/server/request/router/src/router/request_router.e
@@ -8,7 +8,7 @@ deferred class
 	REQUEST_ROUTER
 
 inherit
-	ITERABLE [TUPLE [handler: REQUEST_HANDLER; id: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
+	ITERABLE [TUPLE [handler: REQUEST_HANDLER; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
 
 feature -- Registration
 
diff --git a/library/server/request/router/src/router/request_uri_router.e b/library/server/request/router/src/router/request_uri_router.e
index 9b5fa7fe..303a1c3c 100644
--- a/library/server/request/router/src/router/request_uri_router.e
+++ b/library/server/request/router/src/router/request_uri_router.e
@@ -77,7 +77,7 @@ feature {NONE} -- Access: Implementation
 				l_handlers.after or Result /= Void
 			loop
 				l_item := l_handlers.item
-				if is_matching_request_methods (rqst_method, l_item.request_methods) and a_path.same_string (l_item.uri) then
+				if is_matching_request_methods (rqst_method, l_item.request_methods) and a_path.same_string (l_item.resource) then
 					Result := l_item.handler
 				end
 				l_handlers.forth
@@ -128,7 +128,7 @@ feature -- Context factory
 
 feature -- Access
 
-	new_cursor: ITERATION_CURSOR [TUPLE [handler: REQUEST_HANDLER; id: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
+	new_cursor: ITERATION_CURSOR [TUPLE [handler: REQUEST_HANDLER; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
 			-- Fresh cursor associated with current structure
 		do
 			Result := handlers.new_cursor
@@ -136,7 +136,7 @@ feature -- Access
 
 feature {NONE} -- Implementation
 
-	handlers: ARRAYED_LIST [TUPLE [handler: REQUEST_HANDLER; uri: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
+	handlers: ARRAYED_LIST [TUPLE [handler: REQUEST_HANDLER; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
 			-- Handlers indexed by the template expression
 			-- see `templates'
 
diff --git a/library/server/request/router/src/router/request_uri_template_router.e b/library/server/request/router/src/router/request_uri_template_router.e
index 3fa801d6..d4554320 100644
--- a/library/server/request/router/src/router/request_uri_template_router.e
+++ b/library/server/request/router/src/router/request_uri_template_router.e
@@ -63,7 +63,7 @@ feature {NONE} -- Access: Implementation
 			loop
 				if attached l_handlers.item as l_info then
 					if is_matching_request_methods (l_req_method, l_info.request_methods) then
-						t := l_info.template
+						t := l_info.resource
 						if attached templates.item (t) as tpl and then
 							attached tpl.match (p) as res
 						then
@@ -89,7 +89,7 @@ feature -- Context factory
 
 feature -- Access: ITERABLE
 
-	new_cursor: ITERATION_CURSOR [TUPLE [handler: REQUEST_HANDLER; template: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
+	new_cursor: ITERATION_CURSOR [TUPLE [handler: REQUEST_HANDLER; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
 			-- Fresh cursor associated with current structure
 		do
 			Result := handlers.new_cursor
@@ -97,7 +97,7 @@ feature -- Access: ITERABLE
 
 feature {NONE} -- Implementation
 
-	handlers: ARRAYED_LIST [TUPLE [handler: REQUEST_HANDLER; template: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
+	handlers: ARRAYED_LIST [TUPLE [handler: REQUEST_HANDLER; resource: READABLE_STRING_8; request_methods: detachable ARRAY [READABLE_STRING_8]]]
 			-- Handlers indexed by the template expression
 			-- see `templates'