diff --git a/src/apps/terminal/FindWindow.cpp b/src/apps/terminal/FindWindow.cpp
index b3571cd403..c449b21acf 100644
--- a/src/apps/terminal/FindWindow.cpp
+++ b/src/apps/terminal/FindWindow.cpp
@@ -19,7 +19,7 @@
 const uint32 MSG_FIND_HIDE = 'Fhid';
 
 
-FindDlg::FindDlg (BRect frame, BMessenger messenger , BString &str, 
+FindWindow::FindWindow (BRect frame, BMessenger messenger , BString &str, 
 	bool findSelection, bool matchWord, bool matchCase, bool forwardSearch)
 	: BWindow(frame, "Find", B_FLOATING_WINDOW, B_NOT_RESIZABLE|B_NOT_ZOOMABLE),
 	fFindDlgMessenger(messenger)
@@ -110,13 +110,13 @@ FindDlg::FindDlg (BRect frame, BMessenger messenger , BString &str,
 }
 
 
-FindDlg::~FindDlg()
+FindWindow::~FindWindow()
 {
 }
 
 
 void
-FindDlg::MessageReceived(BMessage *msg)
+FindWindow::MessageReceived(BMessage *msg)
 {
 	switch (msg->what) {
 		case B_QUIT_REQUESTED:
@@ -139,7 +139,7 @@ FindDlg::MessageReceived(BMessage *msg)
 
 
 void
-FindDlg::Quit()
+FindWindow::Quit()
 {
 	fFindDlgMessenger.SendMessage(MSG_FIND_CLOSED);
 	BWindow::Quit();
@@ -147,7 +147,7 @@ FindDlg::Quit()
 
 
 void
-FindDlg::_SendFindMessage()
+FindWindow::_SendFindMessage()
 {
 	BMessage message(MSG_FIND);
 
diff --git a/src/apps/terminal/FindWindow.h b/src/apps/terminal/FindWindow.h
index 60f1354fb5..18793e4222 100644
--- a/src/apps/terminal/FindWindow.h
+++ b/src/apps/terminal/FindWindow.h
@@ -17,11 +17,11 @@ const ulong MSG_FIND_START = 'msac';
 const ulong MSG_FIND_CLOSED = 'mfcl';
 
 
-class FindDlg : public BWindow {
+class FindWindow : public BWindow {
 	public:
-		FindDlg (BRect frame, BMessenger messenger, BString &str, 
+		FindWindow (BRect frame, BMessenger messenger, BString &str, 
 			bool findSelection, bool matchWord, bool matchCase, bool forwardSearch);
-		virtual ~FindDlg();
+		virtual ~FindWindow();
 
 		virtual void Quit();
 		virtual void MessageReceived(BMessage *msg);
diff --git a/src/apps/terminal/PrefWindow.cpp b/src/apps/terminal/PrefWindow.cpp
index 116a956d6f..5e5fefc056 100644
--- a/src/apps/terminal/PrefWindow.cpp
+++ b/src/apps/terminal/PrefWindow.cpp
@@ -27,7 +27,7 @@
 extern PrefHandler *gTermPref;
 	// Global Preference Handler
 
-PrefDlg::PrefDlg(BMessenger messenger)
+PrefWindow::PrefWindow(BMessenger messenger)
 	: BWindow(_CenteredRect(BRect(0, 0, 350, 215)), "Terminal Settings",
 		B_TITLED_WINDOW_LOOK, B_NORMAL_WINDOW_FEEL,
 		B_NOT_RESIZABLE|B_NOT_ZOOMABLE),
@@ -78,13 +78,13 @@ PrefDlg::PrefDlg(BMessenger messenger)
 }
 
 
-PrefDlg::~PrefDlg()
+PrefWindow::~PrefWindow()
 {
 }
 
 
 void
-PrefDlg::Quit()
+PrefWindow::Quit()
 {
 	fPrefDlgMessenger.SendMessage(MSG_PREF_CLOSED);
 	delete fPrefTemp;
@@ -94,7 +94,7 @@ PrefDlg::Quit()
 
 
 bool
-PrefDlg::QuitRequested()
+PrefWindow::QuitRequested()
 {
 	if (!fDirty)
 		return true;
@@ -119,7 +119,7 @@ PrefDlg::QuitRequested()
 
 
 void
-PrefDlg::_SaveAs()
+PrefWindow::_SaveAs()
 {
 	if (!fSavePanel)
 		fSavePanel = new BFilePanel(B_SAVE_PANEL, new BMessenger(this));
@@ -129,7 +129,7 @@ PrefDlg::_SaveAs()
 
 
 void
-PrefDlg::_SaveRequested(BMessage *msg)
+PrefWindow::_SaveRequested(BMessage *msg)
 {
 	entry_ref dirref;
 	const char *filename;
@@ -145,7 +145,7 @@ PrefDlg::_SaveRequested(BMessage *msg)
 
 
 void
-PrefDlg::_Save()
+PrefWindow::_Save()
 {
 	delete fPrefTemp;
 	fPrefTemp = new PrefHandler(gTermPref);
@@ -159,7 +159,7 @@ PrefDlg::_Save()
 
 
 void
-PrefDlg::_Revert()
+PrefWindow::_Revert()
 {
 	delete gTermPref;
 	gTermPref = new PrefHandler(fPrefTemp);
@@ -173,7 +173,7 @@ PrefDlg::_Revert()
 
 
 void
-PrefDlg::MessageReceived(BMessage *msg)
+PrefWindow::MessageReceived(BMessage *msg)
 {
 	switch (msg->what) {
 		case MSG_SAVE_PRESSED:
@@ -206,7 +206,7 @@ PrefDlg::MessageReceived(BMessage *msg)
 
 
 BRect
-PrefDlg::_CenteredRect(BRect rect)
+PrefWindow::_CenteredRect(BRect rect)
 {
 	BRect screenRect = BScreen().Frame();
 	
diff --git a/src/apps/terminal/PrefWindow.h b/src/apps/terminal/PrefWindow.h
index ebe28f3597..976b896187 100644
--- a/src/apps/terminal/PrefWindow.h
+++ b/src/apps/terminal/PrefWindow.h
@@ -28,11 +28,11 @@ class BTextControl;
 class PrefHandler;
 
 
-class PrefDlg : public BWindow
+class PrefWindow : public BWindow
 {
 	public:
-		PrefDlg(BMessenger messenger);
-		virtual ~PrefDlg();
+		PrefWindow(BMessenger messenger);
+		virtual ~PrefWindow();
 
 		virtual void Quit();
 		virtual bool QuitRequested();
diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp
index b930b466a2..bc1c8bb17f 100644
--- a/src/apps/terminal/TermWindow.cpp
+++ b/src/apps/terminal/TermWindow.cpp
@@ -317,7 +317,7 @@ TermWindow::MessageReceived(BMessage *message)
 		}
 		case MENU_PREF_OPEN: {
 			if (!fPrefWindow)
-				fPrefWindow = new PrefDlg(this);
+				fPrefWindow = new PrefWindow(this);
 			else
 				fPrefWindow->Activate();
 			break;
@@ -333,7 +333,7 @@ TermWindow::MessageReceived(BMessage *message)
 				r.top += 20;
 				r.right = r.left + 260;
 				r.bottom = r.top + 190;
-				fFindPanel = new FindDlg(r, this, fFindString, fFindSelection, fMatchWord, fMatchCase, fForwardSearch);
+				fFindPanel = new FindWindow(r, this, fFindString, fFindSelection, fMatchWord, fMatchCase, fForwardSearch);
 			}
 			else
 				fFindPanel->Activate();
diff --git a/src/apps/terminal/TermWindow.h b/src/apps/terminal/TermWindow.h
index 02611fd874..13c719554b 100644
--- a/src/apps/terminal/TermWindow.h
+++ b/src/apps/terminal/TermWindow.h
@@ -40,9 +40,8 @@ class BFont;
 class TermView;
 class TermParse;
 class CodeConv;
-class PrefDlg;
-class PrefDlg2;
-class FindDlg;
+class PrefWindow;
+class FindWindow;
 
 
 class TermWindow : public BWindow {
@@ -82,8 +81,8 @@ private:
   BView		*fBaseView;
   CodeConv	*fCodeConv;
   BMessage	*fPrintSettings;
-  PrefDlg	*fPrefWindow;
-  FindDlg	*fFindPanel;
+  PrefWindow	*fPrefWindow;
+  FindWindow	*fFindPanel;
   BMessageRunner *fWindowUpdate;
   BMenuItem *item;
   BRect		fSavedFrame;