diff --git a/library/server/ewsgi/examples/hello_world/src/hello_world.e b/library/server/ewsgi/examples/hello_world/src/hello_world.e
index e9abac5c..28cf9d4b 100644
--- a/library/server/ewsgi/examples/hello_world/src/hello_world.e
+++ b/library/server/ewsgi/examples/hello_world/src/hello_world.e
@@ -15,7 +15,7 @@ feature {NONE} -- Initialization
 	make
 		do
 			print ("Example: start a Nino web server on port " + port_number.out + ", %Nand reply Hello World for any request such as http://localhost:8123/%N")
-			(create {GW_NINO_APPLICATION}.make (agent (req: GW_REQUEST_CONTEXT; res: GW_RESPONSE)
+			(create {GW_NINO_APPLICATION}.make (agent (req: GW_REQUEST; res: GW_RESPONSE)
 				do
 					res.output.put_header (200, <<["Content-Type", "text/plain"]>>)
 					res.output.put_string ("Hello World!%N")
diff --git a/library/server/ewsgi/src/context/gw_environment.e b/library/server/ewsgi/src/context/gw_environment.e
index 1c7f4146..aed30588 100644
--- a/library/server/ewsgi/src/context/gw_environment.e
+++ b/library/server/ewsgi/src/context/gw_environment.e
@@ -581,7 +581,7 @@ feature -- Extra
 		deferred
 		end
 
-feature {GW_REQUEST_CONTEXT} -- Element change
+feature {GW_REQUEST} -- Element change
 
 	set_orig_path_info (s: STRING)
 			-- Set ORIG_PATH_INFO to `s'
diff --git a/library/server/ewsgi/src/context/gw_environment_variables.e b/library/server/ewsgi/src/context/gw_environment_variables.e
index 392dbd3d..542cc566 100644
--- a/library/server/ewsgi/src/context/gw_environment_variables.e
+++ b/library/server/ewsgi/src/context/gw_environment_variables.e
@@ -102,7 +102,7 @@ feature -- Access
 			Result := table.has_key (a_name)
 		end
 
-feature {GW_REQUEST_CONTEXT, GW_APPLICATION, GW_CONNECTOR} -- Element change
+feature {GW_REQUEST, GW_APPLICATION, GW_CONNECTOR} -- Element change
 
 	set_variable (a_name: STRING; a_value: STRING)
 		do
@@ -251,7 +251,7 @@ feature -- Extra
 	orig_path_info: detachable STRING
 			-- Original version of `path_info' before processed by Current environment
 
-feature {GW_REQUEST_CONTEXT} -- Update
+feature {GW_REQUEST} -- Update
 
 	set_orig_path_info (s: STRING)
 		do
diff --git a/library/server/ewsgi/src/context/gw_execution_variables.e b/library/server/ewsgi/src/context/gw_execution_variables.e
index 7408955c..0b85ce3f 100644
--- a/library/server/ewsgi/src/context/gw_execution_variables.e
+++ b/library/server/ewsgi/src/context/gw_execution_variables.e
@@ -31,7 +31,7 @@ feature -- Status report
 			Result := has (a_name)
 		end
 
-feature {GW_REQUEST_CONTEXT, GW_APPLICATION, GW_CONNECTOR} -- Element change
+feature {GW_REQUEST, GW_APPLICATION, GW_CONNECTOR} -- Element change
 
 	set_variable (a_name: STRING; a_value: STRING_32)
 		do
diff --git a/library/server/ewsgi/src/context/gw_request_context.e b/library/server/ewsgi/src/context/gw_request.e
similarity index 99%
rename from library/server/ewsgi/src/context/gw_request_context.e
rename to library/server/ewsgi/src/context/gw_request.e
index 4fe03084..28d4ffdc 100644
--- a/library/server/ewsgi/src/context/gw_request_context.e
+++ b/library/server/ewsgi/src/context/gw_request.e
@@ -13,7 +13,7 @@ note
 	revision: "$Revision$"
 
 deferred class
-	GW_REQUEST_CONTEXT
+	GW_REQUEST
 
 feature -- Access: Input/Output
 
diff --git a/library/server/ewsgi/src/context/gw_request_variables.e b/library/server/ewsgi/src/context/gw_request_variables.e
index 00fc5069..f820de3b 100644
--- a/library/server/ewsgi/src/context/gw_request_variables.e
+++ b/library/server/ewsgi/src/context/gw_request_variables.e
@@ -51,7 +51,7 @@ feature -- Status report
 			Result := table.has (a_name)
 		end
 
-feature {GW_REQUEST_CONTEXT, GW_APPLICATION, GW_CONNECTOR} -- Element change
+feature {GW_REQUEST, GW_APPLICATION, GW_CONNECTOR} -- Element change
 
 	set_variable (a_name: STRING; a_value: STRING_32)
 		do
@@ -112,7 +112,7 @@ feature -- Access: table
 			create Result.make (table)
 		end
 
-feature {GW_REQUEST_CONTEXT} -- Element change
+feature {GW_REQUEST} -- Element change
 
 	add_variable (v: STRING_32; k: STRING_32)
 			-- Added `k,v' to variables table
@@ -125,7 +125,7 @@ feature {GW_REQUEST_CONTEXT} -- Element change
 			table.force (v, k)
 		end
 
-feature {GW_REQUEST_CONTEXT} -- Element change		
+feature {GW_REQUEST} -- Element change		
 
 	table: HASH_TABLE [STRING_32, STRING_32]
 			-- Variables table
diff --git a/library/server/ewsgi/src/context/gw_variables.e b/library/server/ewsgi/src/context/gw_variables.e
index 818eda07..4233f677 100644
--- a/library/server/ewsgi/src/context/gw_variables.e
+++ b/library/server/ewsgi/src/context/gw_variables.e
@@ -46,7 +46,7 @@ feature -- Access
 			end
 		end
 
-feature {GW_REQUEST_CONTEXT, GW_APPLICATION, GW_CONNECTOR} -- Element change
+feature {GW_REQUEST, GW_APPLICATION, GW_CONNECTOR} -- Element change
 
 	set_variable (a_name: STRING; a_value: G)
 		require
diff --git a/library/server/ewsgi/src/gw_application.e b/library/server/ewsgi/src/gw_application.e
index 0688073a..341e2106 100644
--- a/library/server/ewsgi/src/gw_application.e
+++ b/library/server/ewsgi/src/gw_application.e
@@ -30,7 +30,7 @@ feature -- Process request
 
 feature {NONE} -- Execution
 
-	execute (req: GW_REQUEST_CONTEXT; res: GW_RESPONSE)
+	execute (req: GW_REQUEST; res: GW_RESPONSE)
 			-- Execute the request
 			-- See `req.input' and `res.output' for i/o streams
 			--     `req.environment' for the Gateway environment
@@ -44,12 +44,12 @@ feature {NONE} -- Execution
 		do
 		end
 
-	post_execute (req: detachable GW_REQUEST_CONTEXT; res: detachable GW_RESPONSE)
+	post_execute (req: detachable GW_REQUEST; res: detachable GW_RESPONSE)
 			-- Operation processed after `execute', or after `rescue_execute'
 		do
 		end
 
-	rescue_execute (req: detachable GW_REQUEST_CONTEXT; res: detachable GW_RESPONSE; a_exception: detachable EXCEPTION)
+	rescue_execute (req: detachable GW_REQUEST; res: detachable GW_RESPONSE; a_exception: detachable EXCEPTION)
 			-- Operation processed on rescue of `execute'
 		do
 			post_execute (req, res)
@@ -57,7 +57,7 @@ feature {NONE} -- Execution
 
 feature -- Factory
 
-	new_request_context (env: GW_ENVIRONMENT; a_input: GW_INPUT_STREAM): GW_REQUEST_CONTEXT
+	new_request_context (env: GW_ENVIRONMENT; a_input: GW_INPUT_STREAM): GW_REQUEST
 			-- New Request context based on `env' and `a_input'
 			--| note: you can redefine this function to create your own
 			--| descendant of GW_REQUEST_CONTEXT , or even to reuse/recycle existing
diff --git a/library/server/ewsgi/src/implementation/gw_application_imp.e b/library/server/ewsgi/src/implementation/gw_application_imp.e
index 5f2e05f3..f11af8df 100644
--- a/library/server/ewsgi/src/implementation/gw_application_imp.e
+++ b/library/server/ewsgi/src/implementation/gw_application_imp.e
@@ -30,9 +30,9 @@ feature -- Execution
 
 feature -- Factory
 
-	new_request_context (env: GW_ENVIRONMENT; a_input: GW_INPUT_STREAM): GW_REQUEST_CONTEXT
+	new_request_context (env: GW_ENVIRONMENT; a_input: GW_INPUT_STREAM): GW_REQUEST
 		do
-			create {GW_REQUEST_CONTEXT_IMP} Result.make (env, a_input)
+			create {GW_REQUEST_IMP} Result.make (env, a_input)
 			Result.execution_variables.set_variable (request_count.out, "REQUEST_COUNT")
 		end
 
diff --git a/library/server/ewsgi/src/implementation/gw_request_context_imp.e b/library/server/ewsgi/src/implementation/gw_request_imp.e
similarity index 99%
rename from library/server/ewsgi/src/implementation/gw_request_context_imp.e
rename to library/server/ewsgi/src/implementation/gw_request_imp.e
index aff3cf97..4b1f8ee5 100644
--- a/library/server/ewsgi/src/implementation/gw_request_context_imp.e
+++ b/library/server/ewsgi/src/implementation/gw_request_imp.e
@@ -13,10 +13,10 @@ note
 	revision: "$Revision$"
 
 class
-	GW_REQUEST_CONTEXT_IMP
+	GW_REQUEST_IMP
 
 inherit
-	GW_REQUEST_CONTEXT
+	GW_REQUEST
 
 create
 	make