diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_file.e b/draft/library/wsf_js_widget/kernel/input/wsf_file.e
deleted file mode 100644
index ff9cd33e..00000000
--- a/draft/library/wsf_js_widget/kernel/input/wsf_file.e
+++ /dev/null
@@ -1,49 +0,0 @@
-note
-	description: "Summary description for {WSF_FILE}."
-	author: ""
-	date: "$Date$"
-	revision: "$Revision$"
-
-class
-	WSF_FILE
-
-create
-	make
-
-feature {NONE}
-
-	make (a_name, a_type: STRING_32; a_size: INTEGER; a_id: detachable STRING_32)
-		do
-			name := a_name
-			type := a_type
-			size := a_size
-			id := a_id
-		end
-
-feature
-
-	set_id (a_id: detachable STRING_32)
-		do
-			id := a_id
-		end
-
-feature --Properties
-
-	is_uploaded: BOOLEAN
-		do
-			Result := attached id
-		end
-
-	name: STRING_32
-			-- File name
-
-	type: STRING_32
-			-- File mime type
-
-	size: INTEGER
-			-- File size
-
-	id: detachable STRING_32
-			-- Server side file id (e.g. S3 filename)
-
-end
diff --git a/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e b/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e
index f86d2512..0805c422 100644
--- a/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e
+++ b/draft/library/wsf_js_widget/kernel/input/wsf_file_control.e
@@ -9,7 +9,7 @@ class
 
 inherit
 
-	WSF_VALUE_CONTROL [detachable WSF_FILE]
+	WSF_VALUE_CONTROL [detachable WSF_FILE_DEFINITION]
 		rename
 			make as make_value_control
 		end
@@ -112,7 +112,7 @@ feature -- Upload
 
 feature -- Implementation
 
-	value: detachable WSF_FILE
+	value: detachable WSF_FILE_DEFINITION
 		do
 			Result := file
 		end
@@ -159,7 +159,7 @@ feature -- Change
 			end
 		end
 
-	set_value (v: detachable WSF_FILE)
+	set_value (v: detachable WSF_FILE_DEFINITION)
 		do
 			file := v
 		end
@@ -180,7 +180,7 @@ feature -- Properties
 	image_preview: BOOLEAN
 			-- Preview uploaded image
 
-	file: detachable WSF_FILE
+	file: detachable WSF_FILE_DEFINITION
 			-- Text to be displayed
 
 	change_event: detachable PROCEDURE [ANY, TUPLE]
diff --git a/draft/library/wsf_js_widget/kernel/validator/wsf_filesize_validator.e b/draft/library/wsf_js_widget/kernel/validator/wsf_filesize_validator.e
index c444ca3d..be62b81f 100644
--- a/draft/library/wsf_js_widget/kernel/validator/wsf_filesize_validator.e
+++ b/draft/library/wsf_js_widget/kernel/validator/wsf_filesize_validator.e
@@ -11,7 +11,7 @@ class
 
 inherit
 
-	WSF_VALIDATOR [detachable WSF_FILE]
+	WSF_VALIDATOR [detachable WSF_FILE_DEFINITION]
 		rename
 			make as make_validator
 		redefine
@@ -32,7 +32,7 @@ feature {NONE} -- Initialization
 
 feature -- Implementation
 
-	is_valid (input: detachable WSF_FILE): BOOLEAN
+	is_valid (input: detachable WSF_FILE_DEFINITION): BOOLEAN
 		do
 			Result := True
 			if attached input as a_input then