diff --git a/library/server/request/rest/src/rest_application_i.e b/library/server/request/rest/src/rest_application_i.e
index 4591dee5..d98e4d82 100644
--- a/library/server/request/rest/src/rest_application_i.e
+++ b/library/server/request/rest/src/rest_application_i.e
@@ -8,7 +8,7 @@ deferred class
 	REST_APPLICATION_I [H -> REST_REQUEST_HANDLER [C], C -> REST_REQUEST_HANDLER_CONTEXT]
 
 inherit
-	ROUTED_APPLICATION [H, C]
+	ROUTED_APPLICATION_I [H, C]
 		redefine
 			router
 		end
diff --git a/library/server/request/rest/tests/src/app/app_test.e b/library/server/request/rest/tests/src/app/app_test.e
index 5d3f1ca2..af6dc20f 100644
--- a/library/server/request/rest/tests/src/app/app_test.e
+++ b/library/server/request/rest/tests/src/app/app_test.e
@@ -47,8 +47,8 @@ feature -- Execution
 
 			create s.make_empty
 			s.append_string ("test")
-			if attached req.meta_variable ("REQUEST_COUNT") as l_request_count then
-				s.append_string ("(request_count="+ l_request_count +")%N")
+			if attached req.meta_variable ("REQUEST_COUNT") as l_request_count_val then
+				s.append_string ("(request_count="+ l_request_count_val.as_string +")%N")
 			end
 
 --			ctx.request_format_id ("format", Void)
@@ -57,13 +57,13 @@ feature -- Execution
 				s.append_string (" format=" + l_format + "%N")
 			end
 
-			if attached ctx.parameter ("op") as l_op then
+			if attached ctx.string_parameter ("op") as l_op then
 				s.append_string (" op=" + l_op)
 				if l_op.same_string ("crash") then
 					(create {DEVELOPER_EXCEPTION}).raise
 				elseif l_op.starts_with ("env") then
 					s.append_string ("%N%NAll variables:")
-					s.append (string_hash_table_string_string (req.parameters.new_cursor, False))
+					s.append (wgi_value_iteration_to_string (req.parameters, False))
 					s.append_string ("<br/>script_url(%"" + req.path_info + "%")=" + ctx.script_url (req.path_info) + "%N")
 --					if attached ctx.http_authorization_login_password as t then
 --						s.append_string ("Check login=" + t.login + "<br/>%N")
diff --git a/library/server/request/rest/tests/src/handler/app_application.e b/library/server/request/rest/tests/src/handler/app_application.e
index 325f832f..1f8ba22a 100644
--- a/library/server/request/rest/tests/src/handler/app_application.e
+++ b/library/server/request/rest/tests/src/handler/app_application.e
@@ -8,7 +8,7 @@ deferred class
 	APP_APPLICATION
 
 inherit
-	REST_APPLICATION [APP_REQUEST_HANDLER, APP_REQUEST_HANDLER_CONTEXT]
+	REST_APPLICATION_I [APP_REQUEST_HANDLER, APP_REQUEST_HANDLER_CONTEXT]
 		redefine
 			router
 		end
diff --git a/library/server/request/rest/tests/src/handler/app_request_handler.e b/library/server/request/rest/tests/src/handler/app_request_handler.e
index f0298788..d4434670 100644
--- a/library/server/request/rest/tests/src/handler/app_request_handler.e
+++ b/library/server/request/rest/tests/src/handler/app_request_handler.e
@@ -13,19 +13,18 @@ inherit
 
 feature {NONE} -- Implementation
 
-	string_hash_table_string_string (ht: HASH_TABLE_ITERATION_CURSOR [READABLE_STRING_GENERAL, READABLE_STRING_GENERAL]; using_pre: BOOLEAN): STRING_8
+	wgi_value_iteration_to_string (cur: ITERATION_CURSOR [WGI_VALUE]; using_pre: BOOLEAN): STRING_8
 		do
 			create Result.make (100)
 			if using_pre then
 				Result.append ("<pre>")
 			end
 			from
-				ht.start
 			until
-				ht.after
+				cur.after
 			loop
-				Result.append_string (ht.key.as_string_8 + " = " + ht.item.as_string_8 + "%N")
-				ht.forth
+				Result.append_string (cur.item.name.as_string_8 + " = " + cur.item.as_string.as_string_8 + "%N")
+				cur.forth
 			end
 			if using_pre then
 				Result.append ("</pre>")
diff --git a/library/server/request/rest/tests/src/handler/app_request_router.e b/library/server/request/rest/tests/src/handler/app_request_router.e
index 25bd2a14..35c9093f 100644
--- a/library/server/request/rest/tests/src/handler/app_request_router.e
+++ b/library/server/request/rest/tests/src/handler/app_request_router.e
@@ -8,7 +8,7 @@ class
 	APP_REQUEST_ROUTER
 
 inherit
-	REST_REQUEST_URI_TEMPLATE_ROUTER [APP_REQUEST_HANDLER, APP_REQUEST_HANDLER_CONTEXT]
+	REST_REQUEST_URI_TEMPLATE_ROUTER_I [APP_REQUEST_HANDLER, APP_REQUEST_HANDLER_CONTEXT]
 
 create
 	make
diff --git a/library/server/request/rest/tests/src/handler/app_request_routing_handler.e b/library/server/request/rest/tests/src/handler/app_request_routing_handler.e
index e7bcee5e..63e0196f 100644
--- a/library/server/request/rest/tests/src/handler/app_request_routing_handler.e
+++ b/library/server/request/rest/tests/src/handler/app_request_routing_handler.e
@@ -15,7 +15,7 @@ inherit
 			post_execute
 		end
 
-	REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER [APP_REQUEST_HANDLER, APP_REQUEST_HANDLER_CONTEXT]
+	REST_REQUEST_URI_TEMPLATE_ROUTING_HANDLER_I [APP_REQUEST_HANDLER, APP_REQUEST_HANDLER_CONTEXT]
 		redefine
 			router
 		end
diff --git a/library/server/request/router/src/default/default_routed_application.e b/library/server/request/router/src/default/routed_application.e
similarity index 81%
rename from library/server/request/router/src/default/default_routed_application.e
rename to library/server/request/router/src/default/routed_application.e
index 1113a09f..a309e4c8 100644
--- a/library/server/request/router/src/default/default_routed_application.e
+++ b/library/server/request/router/src/default/routed_application.e
@@ -5,10 +5,10 @@ note
 	revision: "$Revision$"
 
 deferred class
-	DEFAULT_ROUTED_APPLICATION
+	ROUTED_APPLICATION
 
 inherit
-	ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_HANDLER_CONTEXT], REQUEST_HANDLER_CONTEXT]
+	ROUTED_APPLICATION_I [REQUEST_HANDLER [REQUEST_HANDLER_CONTEXT], REQUEST_HANDLER_CONTEXT]
 
 note
 	copyright: "2011-2011, Eiffel Software and others"
diff --git a/library/server/request/router/src/default/uri_routed_application.e b/library/server/request/router/src/default/uri_routed_application.e
index f8410b9a..038266bc 100644
--- a/library/server/request/router/src/default/uri_routed_application.e
+++ b/library/server/request/router/src/default/uri_routed_application.e
@@ -8,7 +8,7 @@ deferred class
 	URI_ROUTED_APPLICATION
 
 inherit
-	ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I], REQUEST_URI_HANDLER_CONTEXT_I]
+	ROUTED_APPLICATION_I [REQUEST_HANDLER [REQUEST_URI_HANDLER_CONTEXT_I], REQUEST_URI_HANDLER_CONTEXT_I]
 		redefine
 			router
 		end
diff --git a/library/server/request/router/src/default/uri_template_routed_application.e b/library/server/request/router/src/default/uri_template_routed_application.e
index bc174e35..8e33f204 100644
--- a/library/server/request/router/src/default/uri_template_routed_application.e
+++ b/library/server/request/router/src/default/uri_template_routed_application.e
@@ -8,7 +8,7 @@ deferred class
 	URI_TEMPLATE_ROUTED_APPLICATION
 
 inherit
-	ROUTED_APPLICATION [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I]
+	ROUTED_APPLICATION_I [REQUEST_HANDLER [REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I], REQUEST_URI_TEMPLATE_HANDLER_CONTEXT_I]
 		redefine
 			router
 		end
diff --git a/library/server/request/router/src/routed_application.e b/library/server/request/router/src/routed_application_i.e
similarity index 94%
rename from library/server/request/router/src/routed_application.e
rename to library/server/request/router/src/routed_application_i.e
index 848d57de..eabefeb4 100644
--- a/library/server/request/router/src/routed_application.e
+++ b/library/server/request/router/src/routed_application_i.e
@@ -5,7 +5,7 @@ note
 	revision: "$Revision$"
 
 deferred class
-	ROUTED_APPLICATION [H -> REQUEST_HANDLER [C], C -> REQUEST_HANDLER_CONTEXT]
+	ROUTED_APPLICATION_I [H -> REQUEST_HANDLER [C], C -> REQUEST_HANDLER_CONTEXT]
 
 feature -- Setup