diff --git a/library/server/request/rest/src/contrib/doc/rest_api_documentation.e b/library/server/request/rest/src/contrib/doc/rest_api_documentation.e
index b78a803b..18cb647a 100644
--- a/library/server/request/rest/src/contrib/doc/rest_api_documentation.e
+++ b/library/server/request/rest/src/contrib/doc/rest_api_documentation.e
@@ -50,7 +50,7 @@ feature -- Execution
 			create s.make_empty
 
 			if
-				attached {WSF_STRING_VALUE} ctx.path_parameter ("resource") as l_resource_value and then
+				attached {WSF_STRING} ctx.path_parameter ("resource") as l_resource_value and then
 				attached l_resource_value.string as l_resource
 			then
 				from
diff --git a/library/server/request/router/src/request_handler_context.e b/library/server/request/router/src/request_handler_context.e
index bdd18db7..8c6fbbef 100644
--- a/library/server/request/router/src/request_handler_context.e
+++ b/library/server/request/router/src/request_handler_context.e
@@ -137,7 +137,7 @@ feature -- String query
 
 	string_from (a_value: detachable WSF_VALUE): detachable READABLE_STRING_32
 		do
-			if attached {WSF_STRING_VALUE} a_value as val then
+			if attached {WSF_STRING} a_value as val then
 				Result := val.string
 			end
 		end
diff --git a/library/server/request/router/src/uri_template/request_uri_template_handler_context.e b/library/server/request/router/src/uri_template/request_uri_template_handler_context.e
index 2c1eafb2..0f9ded4c 100644
--- a/library/server/request/router/src/uri_template/request_uri_template_handler_context.e
+++ b/library/server/request/router/src/uri_template/request_uri_template_handler_context.e
@@ -34,14 +34,14 @@ feature -- Query
 	path_parameter (a_name: READABLE_STRING_8): detachable WSF_VALUE
 		do
 			if attached uri_template_match.url_decoded_path_variable (a_name) as s then
-				create {WSF_STRING_VALUE} Result.make (a_name, s)
+				create {WSF_STRING} Result.make (a_name, s)
 			end
 		end
 
 	query_parameter (a_name: READABLE_STRING_8): detachable WSF_VALUE
 		do
 			if attached uri_template_match.url_decoded_query_variable (a_name) as s then
-				create {WSF_STRING_VALUE} Result.make (a_name, s)
+				create {WSF_STRING} Result.make (a_name, s)
 			else
 				Result := request.query_parameter (a_name)
 			end
diff --git a/library/server/wsf/src/request/value/visitor/wsf_value_agent_iterator.e b/library/server/wsf/src/request/value/visitor/wsf_value_agent_iterator.e
index e647f08d..be887be7 100644
--- a/library/server/wsf/src/request/value/visitor/wsf_value_agent_iterator.e
+++ b/library/server/wsf/src/request/value/visitor/wsf_value_agent_iterator.e
@@ -30,26 +30,26 @@ feature {NONE} -- Initialization
 
 feature -- Actions
 
-	on_table_actions: ACTION_SEQUENCE [TUPLE [WSF_TABLE_VALUE]]
+	on_table_actions: ACTION_SEQUENCE [TUPLE [WSF_TABLE]]
 
-	on_string_actions: ACTION_SEQUENCE [TUPLE [WSF_STRING_VALUE]]
+	on_string_actions: ACTION_SEQUENCE [TUPLE [WSF_STRING]]
 
-	on_multiple_string_actions: ACTION_SEQUENCE [TUPLE [WSF_MULTIPLE_STRING_VALUE]]
+	on_multiple_string_actions: ACTION_SEQUENCE [TUPLE [WSF_MULTIPLE_STRING]]
 
 feature -- Visitor
 
-	process_table (v: WSF_TABLE_VALUE)
+	process_table (v: WSF_TABLE)
 		do
 			on_table_actions.call ([v])
 			process_iterable_of_value (v)
 		end
 
-	process_string (v: WSF_STRING_VALUE)
+	process_string (v: WSF_STRING)
 		do
 			on_string_actions.call ([v])
 		end
 
-	process_multiple_string (v: WSF_MULTIPLE_STRING_VALUE)
+	process_multiple_string (v: WSF_MULTIPLE_STRING)
 		do
 			on_multiple_string_actions.call ([v])
 			process_iterable_of_value (v)
diff --git a/library/server/wsf/src/request/value/visitor/wsf_value_iterator.e b/library/server/wsf/src/request/value/visitor/wsf_value_iterator.e
index f0970a1e..a4c8300e 100644
--- a/library/server/wsf/src/request/value/visitor/wsf_value_iterator.e
+++ b/library/server/wsf/src/request/value/visitor/wsf_value_iterator.e
@@ -24,16 +24,16 @@ feature -- Helper
 
 feature -- Visitor
 
-	process_table (v: WSF_TABLE_VALUE)
+	process_table (v: WSF_TABLE)
 		do
 			process_iterable_of_value (v)
 		end
 
-	process_string (v: WSF_STRING_VALUE)
+	process_string (v: WSF_STRING)
 		do
 		end
 
-	process_multiple_string (v: WSF_MULTIPLE_STRING_VALUE)
+	process_multiple_string (v: WSF_MULTIPLE_STRING)
 		do
 			process_iterable_of_value (v)
 		end
diff --git a/library/server/wsf/src/request/value/visitor/wsf_value_null_visitor.e b/library/server/wsf/src/request/value/visitor/wsf_value_null_visitor.e
index 0ff11115..ffa0bf14 100644
--- a/library/server/wsf/src/request/value/visitor/wsf_value_null_visitor.e
+++ b/library/server/wsf/src/request/value/visitor/wsf_value_null_visitor.e
@@ -13,15 +13,15 @@ inherit
 
 feature -- Visitor
 
-	process_table (v: WSF_TABLE_VALUE)
+	process_table (v: WSF_TABLE)
 		do
 		end
 
-	process_string (v: WSF_STRING_VALUE)
+	process_string (v: WSF_STRING)
 		do
 		end
 
-	process_multiple_string (v: WSF_MULTIPLE_STRING_VALUE)
+	process_multiple_string (v: WSF_MULTIPLE_STRING)
 		do
 		end
 
diff --git a/library/server/wsf/src/request/value/visitor/wsf_value_visitor.e b/library/server/wsf/src/request/value/visitor/wsf_value_visitor.e
index d57c1cde..401caa92 100644
--- a/library/server/wsf/src/request/value/visitor/wsf_value_visitor.e
+++ b/library/server/wsf/src/request/value/visitor/wsf_value_visitor.e
@@ -10,26 +10,26 @@ deferred class
 
 feature -- Visitor
 
-	safe_process_value (v: detachable WSF_TABLE_VALUE)
+	safe_process_value (v: detachable WSF_TABLE)
 		do
 			if v /= Void then
 				v.process (Current)
 			end
 		end
 
-	process_table (v: WSF_TABLE_VALUE)
+	process_table (v: WSF_TABLE)
 		require
 			v_attached: v /= Void
 		deferred
 		end
 
-	process_string (v: WSF_STRING_VALUE)
+	process_string (v: WSF_STRING)
 		require
 			v_attached: v /= Void
 		deferred
 		end
 
-	process_multiple_string (v: WSF_MULTIPLE_STRING_VALUE)
+	process_multiple_string (v: WSF_MULTIPLE_STRING)
 		require
 			v_attached: v /= Void
 		deferred
diff --git a/library/server/wsf/src/request/value/wsf_multiple_string_value.e b/library/server/wsf/src/request/value/wsf_multiple_string.e
similarity index 82%
rename from library/server/wsf/src/request/value/wsf_multiple_string_value.e
rename to library/server/wsf/src/request/value/wsf_multiple_string.e
index beb3334b..c2ee1f2d 100644
--- a/library/server/wsf/src/request/value/wsf_multiple_string_value.e
+++ b/library/server/wsf/src/request/value/wsf_multiple_string.e
@@ -1,16 +1,16 @@
 note
-	description: "Summary description for {WSF_MULTIPLE_STRING_VALUE}."
+	description: "Summary description for {WSF_MULTIPLE_STRING}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
-	WSF_MULTIPLE_STRING_VALUE
+	WSF_MULTIPLE_STRING
 
 inherit
 	WSF_VALUE
 
-	ITERABLE [WSF_STRING_VALUE]
+	ITERABLE [WSF_STRING]
 
 create
 	make_with_value,
@@ -22,7 +22,7 @@ feature {NONE} -- Initialization
 	make_with_value (a_value: WSF_VALUE)
 		do
 			name := a_value.name
-			create {LINKED_LIST [WSF_STRING_VALUE]} string_values.make
+			create {LINKED_LIST [WSF_STRING]} string_values.make
 			add_value (a_value)
 		end
 
@@ -48,23 +48,23 @@ feature {NONE} -- Initialization
 
 	make_with_string (a_name: like name; a_string: READABLE_STRING_32)
 		do
-			make_with_value (create {WSF_STRING_VALUE}.make (a_name, a_string))
+			make_with_value (create {WSF_STRING}.make (a_name, a_string))
 		end
 
 feature -- Access
 
 	name: READABLE_STRING_32
 
-	string_values: LIST [WSF_STRING_VALUE]
+	string_values: LIST [WSF_STRING]
 
-	first_string_value: WSF_STRING_VALUE
+	first_string_value: WSF_STRING
 		do
 			Result := string_values.first
 		end
 
 feature -- Traversing
 
-	new_cursor: ITERATION_CURSOR [WSF_STRING_VALUE]
+	new_cursor: ITERATION_CURSOR [WSF_STRING]
 		do
 			Result := string_values.new_cursor
 		end
@@ -111,9 +111,9 @@ feature -- Element change
 		require
 			same_name: a_value.name.same_string (name)
 		do
-			if attached {WSF_STRING_VALUE} a_value as sval then
+			if attached {WSF_STRING} a_value as sval then
 				add_string_value (sval)
-			elseif attached {WSF_MULTIPLE_STRING_VALUE} a_value as slst then
+			elseif attached {WSF_MULTIPLE_STRING} a_value as slst then
 				across
 					slst as cur
 				loop
@@ -122,7 +122,7 @@ feature -- Element change
 			end
 		end
 
-	add_string_value (s: WSF_STRING_VALUE)
+	add_string_value (s: WSF_STRING)
 		do
 			string_values.extend (s)
 		end
diff --git a/library/server/wsf/src/request/value/wsf_string_value.e b/library/server/wsf/src/request/value/wsf_string.e
similarity index 95%
rename from library/server/wsf/src/request/value/wsf_string_value.e
rename to library/server/wsf/src/request/value/wsf_string.e
index af7b482e..41b451dc 100644
--- a/library/server/wsf/src/request/value/wsf_string_value.e
+++ b/library/server/wsf/src/request/value/wsf_string.e
@@ -1,11 +1,11 @@
 note
-	description: "Summary description for {WSF_STRING_VALUE}."
+	description: "Summary description for {WSF_STRING}."
 	author: ""
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
-	WSF_STRING_VALUE
+	WSF_STRING
 
 inherit
 	WSF_VALUE
diff --git a/library/server/wsf/src/request/value/wsf_table_value.e b/library/server/wsf/src/request/value/wsf_table.e
similarity index 96%
rename from library/server/wsf/src/request/value/wsf_table_value.e
rename to library/server/wsf/src/request/value/wsf_table.e
index ff601e4f..e59fe082 100644
--- a/library/server/wsf/src/request/value/wsf_table_value.e
+++ b/library/server/wsf/src/request/value/wsf_table.e
@@ -1,12 +1,12 @@
 note
 	description: "[
-			Table value which can contain value indexed by a key
+			Table which can contain value indexed by a key
 		]"
 	date: "$Date$"
 	revision: "$Revision$"
 
 class
-	WSF_TABLE_VALUE
+	WSF_TABLE
 
 inherit
 	WSF_VALUE
diff --git a/library/server/wsf/src/wsf_request.e b/library/server/wsf/src/wsf_request.e
index 08de1527..a2d67d50 100644
--- a/library/server/wsf/src/wsf_request.e
+++ b/library/server/wsf/src/wsf_request.e
@@ -173,7 +173,7 @@ feature -- Access: global variable
 
 	string_item (a_name: READABLE_STRING_8): detachable READABLE_STRING_32
 		do
-			if attached {WSF_STRING_VALUE} item (a_name) as val then
+			if attached {WSF_STRING} item (a_name) as val then
 				Result := val.string
 			else
 				check is_string_value: False end
@@ -182,7 +182,7 @@ feature -- Access: global variable
 
 feature -- Access: CGI Meta variables
 
-	meta_variable (a_name: READABLE_STRING_8): detachable WSF_STRING_VALUE
+	meta_variable (a_name: READABLE_STRING_8): detachable WSF_STRING
 			-- CGI Meta variable related to `a_name'
 		require
 			a_name_valid: a_name /= Void and then not a_name.is_empty
@@ -200,7 +200,7 @@ feature -- Access: CGI Meta variables
 			end
 		end
 
-	meta_variables: ITERABLE [WSF_STRING_VALUE]
+	meta_variables: ITERABLE [WSF_STRING]
 			-- CGI meta variables values
 
 	meta_string_variable_or_default (a_name: READABLE_STRING_8; a_default: READABLE_STRING_32; use_default_when_empty: BOOLEAN): READABLE_STRING_32
@@ -223,7 +223,7 @@ feature -- Access: CGI Meta variables
 		do
 			meta_variables_table.force (new_string_value (a_name, a_value), a_name)
 		ensure
-			param_set: attached {WSF_STRING_VALUE} meta_variable (a_name) as val and then val ~ a_value
+			param_set: attached {WSF_STRING} meta_variable (a_name) as val and then val ~ a_value
 		end
 
 	unset_meta_variable (a_name: READABLE_STRING_8)
@@ -235,7 +235,7 @@ feature -- Access: CGI Meta variables
 
 feature {NONE} -- Access: CGI meta parameters
 
-	meta_variables_table: HASH_TABLE [WSF_STRING_VALUE, READABLE_STRING_8]
+	meta_variables_table: HASH_TABLE [WSF_STRING, READABLE_STRING_8]
 			-- CGI Environment parameters		
 
 feature -- Access: CGI meta parameters - 1.1			
@@ -711,7 +711,7 @@ feature -- Extra CGI environment variables
 			-- Request time (UTC)
 		do
 			if
-				attached {WSF_STRING_VALUE} meta_variable ({CGI_META_NAMES}.request_time) as t and then
+				attached {WSF_STRING} meta_variable ({CGI_META_NAMES}.request_time) as t and then
 				t.string.is_integer_64
 			then
 				Result := date_time_utilities.unix_time_stamp_to_date_time (t.string.to_integer_64)
@@ -742,7 +742,7 @@ feature {NONE} -- Cookies
 		do
 			l_cookies := internal_cookies_table
 			if l_cookies = Void then
-				if attached {WSF_STRING_VALUE} meta_variable ({CGI_META_NAMES}.http_cookie) as val then
+				if attached {WSF_STRING} meta_variable ({CGI_META_NAMES}.http_cookie) as val then
 					s := val.string
 					create l_cookies.make (5)
 					l_cookies.compare_objects
@@ -873,7 +873,7 @@ feature {NONE} -- Query parameters: implementation
 			n,k,r: STRING_8
 			k32: STRING_32
 			p,q: INTEGER
-			tb,ptb: detachable WSF_TABLE_VALUE
+			tb,ptb: detachable WSF_TABLE
 		do
 			--| Check if this is a list format such as   choice[]  or choice[a] or even choice[a][] or choice[a][b][c]...
 			p := a_name.index_of ('[', 1)
@@ -885,7 +885,7 @@ feature {NONE} -- Query parameters: implementation
 					r.left_adjust; r.right_adjust
 
 					create tb.make (n)
-					if a_table.has_key (tb.name) and then attached {WSF_TABLE_VALUE} a_table.found_item as l_existing_table then
+					if a_table.has_key (tb.name) and then attached {WSF_TABLE} a_table.found_item as l_existing_table then
 						tb := l_existing_table
 					end
 
@@ -909,7 +909,7 @@ feature {NONE} -- Query parameters: implementation
 							q := r.index_of ({CHARACTER_8} ']', p + 1)
 							if q > p then
 								k32 := url_encoder.decoded_string (k)
-								if attached {WSF_TABLE_VALUE} ptb.value (k32) as l_tb_value then
+								if attached {WSF_TABLE} ptb.value (k32) as l_tb_value then
 									tb := l_tb_value
 								else
 									create tb.make (n)
@@ -942,10 +942,10 @@ feature {NONE} -- Query parameters: implementation
 			if a_table.has_key (v.name) and then attached a_table.found_item as l_existing_value then
 				if tb /= Void then
 					--| Already done in previous part
-				elseif attached {WSF_MULTIPLE_STRING_VALUE} l_existing_value as l_multi then
+				elseif attached {WSF_MULTIPLE_STRING} l_existing_value as l_multi then
 					l_multi.add_value (v)
 				else
-					a_table.force (create {WSF_MULTIPLE_STRING_VALUE}.make_with_array (<<l_existing_value, v>>), v.name)
+					a_table.force (create {WSF_MULTIPLE_STRING}.make_with_array (<<l_existing_value, v>>), v.name)
 					check replaced: a_table.found and then a_table.found_item ~ l_existing_value end
 				end
 			else
@@ -1605,7 +1605,7 @@ feature {NONE} -- Implementation: utilities
 			one_starting_slash: Result[1] = '/' and (Result.count = 1 or else Result[2] /= '/')
 		end
 
-	new_string_value (a_name: READABLE_STRING_8; a_value: READABLE_STRING_8): WSF_STRING_VALUE
+	new_string_value (a_name: READABLE_STRING_8; a_value: READABLE_STRING_8): WSF_STRING
 		do
 			create Result.make (a_name, a_value)
 		end
diff --git a/library/server/wsf/tests/src/test_wsf_value.e b/library/server/wsf/tests/src/test_wsf_value.e
index 79c553f0..12ff986e 100644
--- a/library/server/wsf/tests/src/test_wsf_value.e
+++ b/library/server/wsf/tests/src/test_wsf_value.e
@@ -14,7 +14,7 @@ feature {NONE} -- Events
 
 	test_table
 		local
-			tb: WSF_TABLE_VALUE
+			tb: WSF_TABLE
 		do
 			create tb.make ("table")
 			assert ("Ok", True)