diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index 734fd90afd..e55d58db08 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -47,7 +47,7 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2
 	netcat netstat nl nohup notify nproc
 	od open
 	passwd paste patch pathchk pc ping ping6 play playfile playsound playwav
-	pr prio printenv printf print_server_add_on profile ps ptx pwd
+	pr prio printenv printf profile ps ptx pwd
 	query quit
 	rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr
 	rmindex rmdir roster route
@@ -100,7 +100,7 @@ PRIVATE_SYSTEM_LIBS =
 ;
 SYSTEM_SERVERS = app_server cddb_daemon debug_server input_server mail_daemon
 	media_addon_server media_server midi_server mount_server net_server
-	notification_server print_server registrar syslog_daemon
+	notification_server print_server print_addon_server registrar syslog_daemon
 ;
 
 SYSTEM_NETWORK_DEVICES = ethernet loopback ;
diff --git a/src/kits/print/PrintServerAddOnProtocol.cpp b/src/kits/print/PrintServerAddOnProtocol.cpp
index 6013a52fbe..0941ac1971 100644
--- a/src/kits/print/PrintServerAddOnProtocol.cpp
+++ b/src/kits/print/PrintServerAddOnProtocol.cpp
@@ -1,7 +1,7 @@
 #include "PrintServerAddOnProtocol.h"
 
 const char* kPrintServerAddOnApplicationSignature =
-	"application/x-vnd.haiku-print-server-add-on";
+	"application/x-vnd.haiku-print-addon-server";
 
 const char* kPrintServerAddOnStatusAttribute = "status";
 const char* kPrinterDriverAttribute = "driver";
diff --git a/src/servers/print/Printer.cpp b/src/servers/print/Printer.cpp
index 2ef1cf0f1a..9b79ffeeee 100644
--- a/src/servers/print/Printer.cpp
+++ b/src/servers/print/Printer.cpp
@@ -10,13 +10,7 @@
 
 #include "BeUtils.h"
 #include "pr_server.h"
-// TODO enable when issue launching print_server_add_on is resolved
-#if 0
-#	include "PrintServerAddOn.h"
-#else
-#	include "PrinterDriverAddOn.h"
-#	define PrintServerAddOn PrinterDriverAddOn
-#endif
+#include "PrintServerAddOn.h"
 #include "PrintServerApp.h"
 
 	// posix
diff --git a/src/servers/print_addon/Jamfile b/src/servers/print_addon/Jamfile
index 46664076f8..fb2d5b9390 100644
--- a/src/servers/print_addon/Jamfile
+++ b/src/servers/print_addon/Jamfile
@@ -2,15 +2,15 @@ SubDir HAIKU_TOP src servers print_addon ;
 
 UsePrivateHeaders shared print ;
 
-AddResources print_server_add_on :
-	print_server_add_on.rdef
+AddResources print_addon_server :
+	print_addon_server.rdef
 ;
 
-Application print_server_add_on :
+Application print_addon_server :
 	PrintServerAddOnApplication.cpp
 ;
 
-LinkAgainst print_server_add_on : 
+LinkAgainst print_addon_server : 
 	be 
 	root
 	libprintutils.a
diff --git a/src/servers/print_addon/print_server_add_on.rdef b/src/servers/print_addon/print_addon_server.rdef
similarity index 94%
rename from src/servers/print_addon/print_server_add_on.rdef
rename to src/servers/print_addon/print_addon_server.rdef
index c3ca7abcc9..8cf065da36 100644
--- a/src/servers/print_addon/print_server_add_on.rdef
+++ b/src/servers/print_addon/print_addon_server.rdef
@@ -1,16 +1,16 @@
 
-resource app_signature "application/x-vnd.haiku-print-server-add-on";
+resource app_signature "application/x-vnd.haiku-print-addon-server";
 
 resource app_version {
 	major = 1,
 	middle = 0,
 	minor = 0,
 
-	variety = B_APPV_BETA,
+	variety = B_APPV_ALPHA,
 	internal = 0,
 
-	short_info = "print_server_add_on",
-	long_info = "print_server_add_on ©2010 Haiku"
+	short_info = "print_addon_server",
+	long_info = "print_addon_server ©2010 Haiku"
 };
 
 resource app_flags B_MULTIPLE_LAUNCH | B_BACKGROUND_APP;