diff --git a/GNUmakefile b/GNUmakefile
index 4ff4a95..3668732 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -28,7 +28,7 @@ L_LIBS = $(LIBS)
 
 L_OBJS = src/core.o src/default.o src/draw.o src/lowlevel.o src/font.o src/boldfont.o src/error.o
 L_OBJS += src/external/ds.o src/external/image.o
-L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/text.o
+L_OBJS += src/widget/window.o src/widget/button.o src/widget/frame.o src/widget/menu.o src/widget/submenu.o src/widget/image.o src/widget/scrollbar.o src/widget/checkbox.o src/widget/label.o src/widget/entry.o
 L_OBJS += src/cursor/default.o src/cursor/cross.o src/cursor/text.o
 
 OOL_CXXFLAGS = $(DEPINC) $(CFLAGS) -std=c++98 -fPIC
diff --git a/NTMakefile b/NTMakefile
index 70343ca..544b53e 100644
--- a/NTMakefile
+++ b/NTMakefile
@@ -2,8 +2,8 @@
 CC = cl
 LD = link
 
-OBJS = src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\font.obj src\boldfont.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\submenu.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\text.obj src\external\ds.obj src\external\image.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\backend\gdi.obj
-OOOBJS = oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\text.obj oosrc\widget\label.obj
+OBJS = src\core.obj src\draw.obj src\default.obj src\lowlevel.obj src\error.obj src\font.obj src\boldfont.obj src\widget\button.obj src\widget\frame.obj src\widget\opengl.obj src\widget\window.obj src\widget\menu.obj src\widget\submenu.obj src\widget\image.obj src\widget\scrollbar.obj src\widget\checkbox.obj src\widget\label.obj src\widget\entry.obj src\external\ds.obj src\external\image.obj src\cursor\default.obj src\cursor\cross.obj src\cursor\text.obj src\backend\gdi.obj
+OOOBJS = oosrc\base.obj oosrc\widget\button.obj oosrc\widget\frame.obj oosrc\widget\image.obj oosrc\widget\menu.obj oosrc\widget\opengl.obj oosrc\widget\scrollbar.obj oosrc\widget\submenu.obj oosrc\widget\window.obj oosrc\widget\checkbox.obj oosrc\widget\text.obj oosrc\widget\label.obj oosrc\widget\entry.obj
 CFLAGS = /nologo /DSTBI_NO_SIMD /D_MILSKO /DUSE_GDI /DUSE_STB_IMAGE /Iinclude
 CXXFLAGS = /nologo /Iinclude
 LDFLAGS = /nologo /DLL /LIBPATH:src /LIBPATH:oosrc
diff --git a/include/Mw/Milsko.h b/include/Mw/Milsko.h
index 67f12fc..8ea962d 100644
--- a/include/Mw/Milsko.h
+++ b/include/Mw/Milsko.h
@@ -26,7 +26,7 @@
 #include <Mw/Widget/CheckBox.h>
 #include <Mw/Widget/Frame.h>
 #include <Mw/Widget/Image.h>
-#include <Mw/Widget/Text.h>
+#include <Mw/Widget/Entry.h>
 #include <Mw/Widget/ScrollBar.h>
 
 #endif
diff --git a/include/Mw/Widget/Text.h b/include/Mw/Widget/Entry.h
similarity index 50%
rename from include/Mw/Widget/Text.h
rename to include/Mw/Widget/Entry.h
index 953dc39..adff244 100644
--- a/include/Mw/Widget/Text.h
+++ b/include/Mw/Widget/Entry.h
@@ -1,11 +1,11 @@
 /* $Id$ */
 /*!
- * %file Mw/Widget/Text.h
- * %brief Text widget
+ * %file Mw/Widget/Entry.h
+ * %brief Entry widget
  * %prop MwNtext
  */
-#ifndef __MW_WIDGET_TEXT_H__
-#define __MW_WIDGET_TEXT_H__
+#ifndef __MW_WIDGET_ENTRY_H__
+#define __MW_WIDGET_ENTRY_H__
 
 #include <Mw/MachDep.h>
 #include <Mw/TypeDefs.h>
@@ -15,9 +15,9 @@ extern "C" {
 #endif
 
 /*!
- * %brief Text widget class
+ * %brief Entry widget class
  */
-MWDECL MwClass MwTextClass;
+MWDECL MwClass MwEntryClass;
 
 #ifdef __cplusplus
 }
diff --git a/include/MwOO/Widget/Text.h b/include/MwOO/Widget/Entry.h
similarity index 64%
rename from include/MwOO/Widget/Text.h
rename to include/MwOO/Widget/Entry.h
index 908f504..30d1c77 100644
--- a/include/MwOO/Widget/Text.h
+++ b/include/MwOO/Widget/Entry.h
@@ -1,13 +1,13 @@
 /* $Id$ */
-#ifndef __MWOO_WIDGET_TEXT_H__
-#define __MWOO_WIDGET_TEXT_H__
+#ifndef __MWOO_WIDGET_ENTRY_H__
+#define __MWOO_WIDGET_ENTRY_H__
 
 #include <MwOO/Base.h>
 
 namespace MwOO {
-class Text : public MwOO::Base {
+class Entry : public MwOO::Base {
       public:
-	Text(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h);
+	Entry(const char* widget_name, MwOO::Base* parent, int x, int y, int w, int h);
 	void	    SetText(const char* value);
 	const char* GetText(void);
 	void	    SetBackground(const char* value);
diff --git a/oosrc/deps.mk b/oosrc/deps.mk
index a8067a0..e6fc702 100644
--- a/oosrc/deps.mk
+++ b/oosrc/deps.mk
@@ -1,2 +1,2 @@
 # $Id$
-OOL_OBJS += oosrc/widget/button.o oosrc/widget/frame.o oosrc/widget/image.o oosrc/widget/menu.o oosrc/widget/scrollbar.o oosrc/widget/submenu.o oosrc/widget/window.o oosrc/widget/checkbox.o oosrc/widget/label.o oosrc/widget/text.o
+OOL_OBJS += oosrc/widget/button.o oosrc/widget/frame.o oosrc/widget/image.o oosrc/widget/menu.o oosrc/widget/scrollbar.o oosrc/widget/submenu.o oosrc/widget/window.o oosrc/widget/checkbox.o oosrc/widget/label.o oosrc/widget/entry.o
diff --git a/src/widget/text.c b/src/widget/entry.c
similarity index 97%
rename from src/widget/text.c
rename to src/widget/entry.c
index 3edca98..e75bd28 100644
--- a/src/widget/text.c
+++ b/src/widget/entry.c
@@ -127,7 +127,7 @@ static void key(MwWidget handle, int code) {
 	MwForceRender(handle);
 }
 
-MwClassRec MwTextClassRec = {
+MwClassRec MwEntryClassRec = {
     create,	   /* create */
     destroy,	   /* destroy */
     draw,	   /* draw */
@@ -143,4 +143,4 @@ MwClassRec MwTextClassRec = {
     NULL,
     NULL,
     NULL};
-MwClass MwTextClass = &MwTextClassRec;
+MwClass MwEntryClass = &MwEntryClassRec;