diff --git a/src/preferences/screensaver/Jamfile b/src/preferences/screensaver/Jamfile
index c74e882bdd..a9546ed7a4 100644
--- a/src/preferences/screensaver/Jamfile
+++ b/src/preferences/screensaver/Jamfile
@@ -13,7 +13,7 @@ Preference ScreenSaver :
 	ScreenSaverWindow.cpp
 	PasswordWindow.cpp
 	PreviewView.cpp
-	MouseAreaView.cpp
+	ScreenCornerSelector.cpp
 
 	ScreenSaver.cpp
 		# needed for some old/broken screen saver add-ons that do not
diff --git a/src/preferences/screensaver/MouseAreaView.cpp b/src/preferences/screensaver/ScreenCornerSelector.cpp
similarity index 90%
rename from src/preferences/screensaver/MouseAreaView.cpp
rename to src/preferences/screensaver/ScreenCornerSelector.cpp
index 9071e93ff3..2ff496c2d5 100644
--- a/src/preferences/screensaver/MouseAreaView.cpp
+++ b/src/preferences/screensaver/ScreenCornerSelector.cpp
@@ -6,7 +6,7 @@
  *		Michael Phipps
  */
 
-#include "MouseAreaView.h"
+#include "ScreenCornerSelector.h"
 #include "Constants.h"
 #include "Utility.h"
 
@@ -32,7 +32,7 @@ scale_arrow(int x, int y, BRect area, bool invertX, bool invertY)
 //	#pragma mark -
 
 
-MouseAreaView::MouseAreaView(BRect frame, const char *name, uint32 resizingMode)
+ScreenCornerSelector::ScreenCornerSelector(BRect frame, const char *name, uint32 resizingMode)
 	: BView(frame, name, resizingMode, B_WILL_DRAW),
 	fCurrentCorner(NONE)
 {
@@ -41,7 +41,7 @@ MouseAreaView::MouseAreaView(BRect frame, const char *name, uint32 resizingMode)
 
 
 void
-MouseAreaView::Draw(BRect update) 
+ScreenCornerSelector::Draw(BRect update) 
 {
 	// Top of monitor
 	SetHighColor(kGrey);
@@ -70,7 +70,7 @@ MouseAreaView::Draw(BRect update)
 
 
 void
-MouseAreaView::SetCorner(screen_corner corner)
+ScreenCornerSelector::SetCorner(screen_corner corner)
 {
 	fCurrentCorner = corner;
 	Invalidate();
@@ -78,7 +78,7 @@ MouseAreaView::SetCorner(screen_corner corner)
 
 
 BRect
-MouseAreaView::_ArrowSize(BRect monitorRect, bool isCentered)
+ScreenCornerSelector::_ArrowSize(BRect monitorRect, bool isCentered)
 {
 	int arrowSize = monitorRect.IntegerWidth();
 	if (monitorRect.IntegerHeight() < arrowSize)
@@ -97,7 +97,7 @@ MouseAreaView::_ArrowSize(BRect monitorRect, bool isCentered)
 
 
 void
-MouseAreaView::DrawArrow() 
+ScreenCornerSelector::DrawArrow() 
 {
 	PushState();
 
@@ -135,7 +135,7 @@ MouseAreaView::DrawArrow()
 
 
 void
-MouseAreaView::MouseUp(BPoint point) 
+ScreenCornerSelector::MouseUp(BPoint point) 
 {
 	if (fMonitorFrame.Contains(point)) {
 		if (_ArrowSize(fMonitorFrame, true).Contains(point))
diff --git a/src/preferences/screensaver/MouseAreaView.h b/src/preferences/screensaver/ScreenCornerSelector.h
similarity index 69%
rename from src/preferences/screensaver/MouseAreaView.h
rename to src/preferences/screensaver/ScreenCornerSelector.h
index 5e6b4ba1eb..f50ec89cff 100644
--- a/src/preferences/screensaver/MouseAreaView.h
+++ b/src/preferences/screensaver/ScreenCornerSelector.h
@@ -5,8 +5,8 @@
  * Authors:
  *		Michael Phipps
  */
-#ifndef MOUSEAREAVIEW_H
-#define MOUSEAREAVIEW_H
+#ifndef SCREEN_CORNER_SELECTOR_H
+#define SCREEN_CORNER_SELECTOR_H
 
 
 #include "ScreenSaverPrefs.h"
@@ -14,9 +14,9 @@
 #include <View.h>
 
 
-class MouseAreaView : public BView {
+class ScreenCornerSelector : public BView {
 	public:
-		MouseAreaView(BRect frame, const char *name, uint32 resizingMode);
+		ScreenCornerSelector(BRect frame, const char *name, uint32 resizingMode);
 
 		virtual void Draw(BRect update); 
 		virtual void MouseUp(BPoint point);
@@ -32,4 +32,4 @@ class MouseAreaView : public BView {
 		screen_corner fCurrentCorner;
 };
 
-#endif	// MOUSEAREAVIEW_H
+#endif	// SCREEN_CORNER_SELECTOR_H
diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp
index cefdfb6f8d..75e5b9233a 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -9,8 +9,8 @@
  */
 
 
-#include "MouseAreaView.h"
 #include "PreviewView.h"
+#include "ScreenCornerSelector.h"
 #include "ScreenSaverItem.h"
 #include "ScreenSaverWindow.h"
 
@@ -706,9 +706,9 @@ ScreenSaverWindow::_SetupFadeTab(BRect rect)
 
 	// Bottom
 
-	box->AddChild(fFadeNow = new MouseAreaView(BRect(20,205,80,260),"fadeNow",
+	box->AddChild(fFadeNow = new ScreenCornerSelector(BRect(20,205,80,260),"fadeNow",
 		B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
-	box->AddChild(fFadeNever = new MouseAreaView(BRect(220,205,280,260),"fadeNever",
+	box->AddChild(fFadeNever = new ScreenCornerSelector(BRect(220,205,280,260),"fadeNever",
 		B_FOLLOW_LEFT | B_FOLLOW_BOTTOM));
 
 	stringView = new BStringView(BRect(90,215,193,230),
diff --git a/src/preferences/screensaver/ScreenSaverWindow.h b/src/preferences/screensaver/ScreenSaverWindow.h
index 3ab2cfc71c..e78c96a0c6 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.h
+++ b/src/preferences/screensaver/ScreenSaverWindow.h
@@ -23,7 +23,7 @@
 class BButton;
 
 class ModulesView;
-class MouseAreaView;
+class ScreenCornerSelector;
 class ScreenSaverRunner;
 class TimeSlider;
 
@@ -63,8 +63,8 @@ class ScreenSaverWindow : public BWindow {
 		BButton*		fPasswordButton;
 		PasswordWindow*	fPasswordWindow;
 
-		MouseAreaView*	fFadeNow;
-		MouseAreaView*	fFadeNever;
+		ScreenCornerSelector* fFadeNow;
+		ScreenCornerSelector* fFadeNever;
 };
 
 static const int32 kMsgUpdateList = 'UPDL';