diff --git a/library/client/http_client/http_client-safe.ecf b/library/client/http_client/http_client-safe.ecf
index b5c3a2c6..8bc13e78 100644
--- a/library/client/http_client/http_client-safe.ecf
+++ b/library/client/http_client/http_client-safe.ecf
@@ -10,12 +10,12 @@
 		<option warning="true" full_class_checking="true" is_attached_by_default="true" void_safety="all" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY\library\base\base-safe.ecf"/>
-		<library name="curl" location="$ISE_LIBRARY\library\cURL\curl-safe.ecf">
+		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL-safe.ecf">
 			<condition>
 				<version type="compiler" min="7.0.8.7340"/>
 			</condition>
 		</library>
-		<library name="curl_local" location="..\..\..\ext\ise_library\curl-safe.ecf">
+		<library name="curl_local" location="..\..\..\ext\ise_library\cURL-safe.ecf">
 			<condition>
 				<version type="compiler" max="7.0.8.7339"/>
 			</condition>
diff --git a/library/client/http_client/http_client.ecf b/library/client/http_client/http_client.ecf
index b130180b..9fbf1763 100644
--- a/library/client/http_client/http_client.ecf
+++ b/library/client/http_client/http_client.ecf
@@ -10,12 +10,12 @@
 		<option warning="true" full_class_checking="true" void_safety="none" syntax="provisional">
 		</option>
 		<library name="base" location="$ISE_LIBRARY/library/base/base.ecf"/>
-		<library name="curl" location="$ISE_LIBRARY\library\cURL\curl.ecf">
+		<library name="curl" location="$ISE_LIBRARY\library\cURL\cURL.ecf">
 			<condition>
 				<version type="compiler" min="7.0.8.7340"/>
 			</condition>
 		</library>
-		<library name="curl_local" location="..\..\..\ext\ise_library\curl.ecf">
+		<library name="curl_local" location="..\..\..\ext\ise_library\cURL.ecf">
 			<condition>
 				<version type="compiler" max="7.0.8.7339"/>
 			</condition>
diff --git a/library/server/wsf/tests/src/test_wsf_request.e b/library/server/wsf/tests/src/test_wsf_request.e
index 3ddcf576..d7d4f85a 100644
--- a/library/server/wsf/tests/src/test_wsf_request.e
+++ b/library/server/wsf/tests/src/test_wsf_request.e
@@ -8,7 +8,7 @@ note
 	testing: "type/manual"
 
 class
-	TEST_EWSGI_REQUEST
+	TEST_WSF_REQUEST
 
 inherit
 	EQA_TEST_SET
@@ -91,7 +91,7 @@ feature {NONE} -- Events
 
 
 					across
-						req.form_data_parameters as fcur
+						req.form_parameters as fcur
 					loop
 						if not q.is_empty then
 							q.append_character ('&')
@@ -198,7 +198,7 @@ feature -- Test routines
 			get_http_session
 			if attached http_session as sess then
 				create ctx.make
-				ctx.add_form_data_parameter ("id", "123")
+				ctx.add_form_parameter ("id", "123")
 				test_post_request ("post/01", ctx, "post-01 : id=123")
 				test_post_request ("post/01/?foo=bar", ctx, "post-01(foo=bar) : id=123")
 				test_post_request ("post/01/?foo=bar&abc=def", ctx, "post-01(foo=bar&abc=def) : id=123")