diff --git a/mozilla/cmd/macfe/central/mforms.h b/mozilla/cmd/macfe/central/mforms.h
index c1c026f5eae..be1bfa23195 100644
--- a/mozilla/cmd/macfe/central/mforms.h
+++ b/mozilla/cmd/macfe/central/mforms.h
@@ -24,7 +24,7 @@
 #include <LPane.h>
 #include <LStdControl.h>
 #include <LListBox.h>
-#include <LTextEdit.h>
+#include <LTextEditView.h>
 #include <LGARadioButton.h>
 #include <LGACheckbox.h>
 #include <LGAPushButton.h>
diff --git a/mozilla/cmd/macfe/gui/macgui.cp b/mozilla/cmd/macfe/gui/macgui.cp
index 65b5a2c0434..640c0ce267e 100644
--- a/mozilla/cmd/macfe/gui/macgui.cp
+++ b/mozilla/cmd/macfe/gui/macgui.cp
@@ -25,6 +25,7 @@
 #include "mimages.h"
 #include "uerrmgr.h"
 #include "macutil.h"
+
 	// Netscape
 #include "client.h"
 #include "ntypes.h"
@@ -814,7 +815,7 @@ CGAEditBroadcaster::BroadcastValueMessage()
  * LTextEdit that keeps track if it has been modified
  *****************************************************************************/
 
-CTextEdit::CTextEdit(LStream *inStream) : LTextEdit(inStream)
+CTextEdit::CTextEdit(LStream *inStream) : LTextEditView(inStream)
 {
 	fModified = FALSE;
 }
@@ -822,7 +823,7 @@ CTextEdit::CTextEdit(LStream *inStream) : LTextEdit(inStream)
 void CTextEdit::UserChangedText()
 {
 	fModified = TRUE;
-	LTextEdit::UserChangedText();
+	LTextEditView::UserChangedText();
 }
 
 /*****************************************************************************
diff --git a/mozilla/cmd/macfe/utility/PrefControls.cp b/mozilla/cmd/macfe/utility/PrefControls.cp
index af793da5694..f7867bb1810 100644
--- a/mozilla/cmd/macfe/utility/PrefControls.cp
+++ b/mozilla/cmd/macfe/utility/PrefControls.cp
@@ -265,12 +265,12 @@ public:
 class CPrefTextEdit
 //======================================
 :	public CValidEditField
-,	public MPreference<LTextEdit,char*>
+,	public MPreference<LTextEditView,char*>
 {
 public:
 	CPrefTextEdit(LStream* inStream)
 		:	CValidEditField(inStream)
-		,	MPreference<LTextEdit,char*>((LTextEdit*)this, inStream)
+		,	MPreference<LTextEditView,char*>((LTextEditView*)this, inStream)
 		{
 		}
 	virtual ~CPrefTextEdit()
@@ -295,13 +295,13 @@ class CIntPrefTextEdit
 // // Note: use CPrefTextEdit template in constructor, just change the class ID to 'Iedt'.
 //======================================
 :	public CValidEditField
-,	public MPreference<LTextEdit,int32>
+,	public MPreference<LTextEditView,int32>
 {
 public:
 	enum { class_ID = 'Iedt' };
 	CIntPrefTextEdit(LStream* inStream)
 		:	CValidEditField(inStream)
-		,	MPreference<LTextEdit,int32>((LTextEdit*)this, inStream)
+		,	MPreference<LTextEditView,int32>((LTextEditView*)this, inStream)
 		{
 		}
 	virtual ~CIntPrefTextEdit()