diff --git a/src/add-ons/screen_savers/Jamfile b/src/add-ons/screen_savers/Jamfile
index e959ca2be4..d656a246d3 100644
--- a/src/add-ons/screen_savers/Jamfile
+++ b/src/add-ons/screen_savers/Jamfile
@@ -1,6 +1,6 @@
 SubDir HAIKU_TOP src add-ons screen_savers ;
 
-SubInclude HAIKU_TOP src add-ons screen_savers buynow ;
+SubInclude HAIKU_TOP src add-ons screen_savers debugnow ;
 SubInclude HAIKU_TOP src add-ons screen_savers haiku ;
 SubInclude HAIKU_TOP src add-ons screen_savers ifs ;
 SubInclude HAIKU_TOP src add-ons screen_savers message ;
diff --git a/src/add-ons/screen_savers/buynow/BuyNow.cpp b/src/add-ons/screen_savers/debugnow/BuyNow.cpp
similarity index 80%
rename from src/add-ons/screen_savers/buynow/BuyNow.cpp
rename to src/add-ons/screen_savers/debugnow/BuyNow.cpp
index 9551c15a0f..1a73cb8fc6 100644
--- a/src/add-ons/screen_savers/buynow/BuyNow.cpp
+++ b/src/add-ons/screen_savers/debugnow/BuyNow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007, Haiku, Inc. All Rights Reserved.
+ * Copyright 2007-2009, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -18,10 +18,10 @@ const rgb_color kWhite = {255, 255, 255};
 
 
 // Inspired by the classic BeOS screensaver, of course
-class BuyNow : public BScreenSaver
+class DebugNow : public BScreenSaver
 {
 	public:
-					BuyNow(BMessage *archive, image_id);
+					DebugNow(BMessage *archive, image_id);
 		void		Draw(BView *view, int32 frame);
 		void		StartConfig(BView *view);
 		status_t	StartSaver(BView *view, bool preview);
@@ -36,27 +36,28 @@ class BuyNow : public BScreenSaver
 
 BScreenSaver *instantiate_screen_saver(BMessage *msg, image_id image) 
 { 
-	return new BuyNow(msg, image);
+	return new DebugNow(msg, image);
 } 
 
 
-BuyNow::BuyNow(BMessage *archive, image_id id)
+DebugNow::DebugNow(BMessage *archive, image_id id)
  :	BScreenSaver(archive, id)
- ,	fLine1("BUY")
+ ,	fLine1("DEBUG")
  ,	fLine2("NOW")
 {
 }
 
 
 void 
-BuyNow::StartConfig(BView *view) 
+DebugNow::StartConfig(BView *view) 
 { 
-	view->AddChild(new BStringView(BRect(20, 10, 200, 35), "", "BUY NOW, by Ryan Leavengood"));
+	view->AddChild(new BStringView(BRect(20, 10, 200, 35), "", "DEBUG NOW, "
+		"by Ryan Leavengood"));
 } 
 
 
 status_t 
-BuyNow::StartSaver(BView *view, bool preview)
+DebugNow::StartSaver(BView *view, bool preview)
 {
 	float width = view->Bounds().Width();
 	float height = view->Bounds().Height();
@@ -82,7 +83,7 @@ BuyNow::StartSaver(BView *view, bool preview)
 
 
 void 
-BuyNow::Draw(BView *view, int32 frame)
+DebugNow::Draw(BView *view, int32 frame)
 {
 	if (frame == 0) { 
 		// fill with blue on first frame
diff --git a/src/add-ons/screen_savers/buynow/Jamfile b/src/add-ons/screen_savers/debugnow/Jamfile
similarity index 64%
rename from src/add-ons/screen_savers/buynow/Jamfile
rename to src/add-ons/screen_savers/debugnow/Jamfile
index d70aaa75b2..f42291e246 100644
--- a/src/add-ons/screen_savers/buynow/Jamfile
+++ b/src/add-ons/screen_savers/debugnow/Jamfile
@@ -1,13 +1,13 @@
-SubDir HAIKU_TOP src add-ons screen_savers buynow ;
+SubDir HAIKU_TOP src add-ons screen_savers debugnow ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
-ScreenSaver BuyNow :
+ScreenSaver DebugNow :
 	BuyNow.cpp : 
 	be libscreensaver.so ;
 
 Package haiku-screensaverkit-cvs :
-	BuyNow :
+	DebugNow :
 	boot home config add-ons Screen\ Savers
 ;