diff --git a/src/add-ons/kernel/file_systems/netfs/authentication_server/authentication_server.rdef b/src/add-ons/kernel/file_systems/netfs/authentication_server/authentication_server.rdef
index 43cd3a5585..bbf0652c20 100644
--- a/src/add-ons/kernel/file_systems/netfs/authentication_server/authentication_server.rdef
+++ b/src/add-ons/kernel/file_systems/netfs/authentication_server/authentication_server.rdef
@@ -15,7 +15,7 @@ resource app_version {
 	internal = 0,
 
 	short_info = "authentication_server",
-	long_info = "authentication_server ©2004-2009 Haiku, Inc"
+	long_info = "authentication_server ©2004-2010 Haiku, Inc"
 };
 
 resource vector_icon array {
diff --git a/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/Jamfile b/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/Jamfile
index 7646c34b07..35355e2138 100644
--- a/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/Jamfile
+++ b/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/Jamfile
@@ -6,9 +6,9 @@ SubDirHdrs [ FDirName $(SUBDIR) $(DOTDOT) headers shared ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) shared ] ;
 
 DEFINES += USER=1 ;
-DEFINES += DEBUG_APP="\\\"NetFSServerPrefs\\\"" ;
+DEFINES += DEBUG_APP="\\\"netfs_server_prefs\\\"" ;
 
-Application NetFSServerPrefs
+Application netfs_server_prefs
 	: DebugSupport.cpp
 
 	  NetFSServerRosterDefs.cpp
diff --git a/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/NetFSServerPrefs.cpp b/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/NetFSServerPrefs.cpp
index d7427a7ce3..87f29126a3 100644
--- a/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/NetFSServerPrefs.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/netfs_server_prefs/NetFSServerPrefs.cpp
@@ -20,8 +20,8 @@ static const uint32 kWritePermission
 
 // usage
 static const char* kUsage =
-"Usage: NetFSServerPrefs -h | --help\n"
-"       NetFSServerPrefs <command>\n"
+"Usage: netfs_server_prefs -h | --help\n"
+"       netfs_server_prefs <command>\n"
 "options:\n"
 "  -h, --help        - print this text\n"
 "\n"
@@ -411,7 +411,7 @@ no_more_args(int argc, int argi)
 int
 main(int argc, char** argv)
 {
-	BApplication app("application/x-vnd.yellowbites.NetFSServerPrefs");
+	BApplication app("application/x-vnd.haiku-netfs_server_prefs");
 
 	// parse first argument
 	int argi = 1;
diff --git a/src/add-ons/kernel/file_systems/netfs/server/Jamfile b/src/add-ons/kernel/file_systems/netfs/server/Jamfile
index 2644928d7a..24a4e4ca6c 100644
--- a/src/add-ons/kernel/file_systems/netfs/server/Jamfile
+++ b/src/add-ons/kernel/file_systems/netfs/server/Jamfile
@@ -16,72 +16,76 @@ SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src add-ons kernel file_systems
 	userlandfs shared ] ;
 
 DEFINES += USER=1 ;
-DEFINES += DEBUG_APP="\\\"NetFSServer\\\"" ;
+DEFINES += DEBUG_APP="\\\"netfs_server\\\"" ;
 
-Application NetFSServer
-	: DebugSupport.cpp
+Application netfs_server
+	:
+	DebugSupport.cpp
 
-	  driver_settings.c
-	  DriverSettings.cpp
-	  String.cpp
+	driver_settings.c
+	DriverSettings.cpp
+	String.cpp
 
-	  AbstractConnection.cpp
-	  AttrDirInfo.cpp
-	  Blocker.cpp
-	  BlockerPool.cpp
-	  Channel.cpp
-	  Connection.cpp
-	  ConnectionFactory.cpp
-	  EntryInfo.cpp
-	  FSObject.cpp
-	  InsecureChannel.cpp
-	  InsecureConnection.cpp
-	  NetAddress.cpp
-	  NetFSDefs.cpp
-	  NetFSServerRosterDefs.cpp
-	  NodeInfo.cpp
-	  PortChannel.cpp
-	  PortConnection.cpp
-	  Request.cpp
-	  RequestChannel.cpp
-	  RequestConnection.cpp
-	  RequestDumper.cpp
-	  RequestFactory.cpp
-	  RequestFlattener.cpp
-	  RequestHandler.cpp
-	  Requests.cpp
-	  RequestUnflattener.cpp
-	  ServerInfo.cpp
-	  ServerNodeID.cpp
-	  TaskManager.cpp
-	  ThreadLocal.cpp
+	AbstractConnection.cpp
+	AttrDirInfo.cpp
+	Blocker.cpp
+	BlockerPool.cpp
+	Channel.cpp
+	Connection.cpp
+	ConnectionFactory.cpp
+	EntryInfo.cpp
+	FSObject.cpp
+	InsecureChannel.cpp
+	InsecureConnection.cpp
+	NetAddress.cpp
+	NetFSDefs.cpp
+	NetFSServerRosterDefs.cpp
+	NodeInfo.cpp
+	PortChannel.cpp
+	PortConnection.cpp
+	Request.cpp
+	RequestChannel.cpp
+	RequestConnection.cpp
+	RequestDumper.cpp
+	RequestFactory.cpp
+	RequestFlattener.cpp
+	RequestHandler.cpp
+	Requests.cpp
+	RequestUnflattener.cpp
+	ServerInfo.cpp
+	ServerNodeID.cpp
+	TaskManager.cpp
+	ThreadLocal.cpp
 
-	  AttributeDirectory.cpp
-	  ClientConnection.cpp
-	  ClientVolume.cpp
-	  ConnectionListener.cpp
-	  ConnectionListenerFactory.cpp
-	  Directory.cpp
-	  Entry.cpp
-	  EntryRef.cpp
-	  FDManager.cpp
-	  GlobalBlockerPool.cpp
-	  InsecureConnectionListener.cpp
-	  Lockable.cpp
-	  NetFSServer.cpp
-	  Node.cpp
-	  NodeHandle.cpp
-	  NodeHandleMap.cpp
-	  NodeMonitor.cpp
-	  NodeMonitoringEvent.cpp
-	  Path.cpp
-	  PortConnectionListener.cpp
-	  QueryDomain.cpp
-	  RequestBufferReplacer.cpp
-	  SecurityContext.cpp
-	  StatisticsManager.cpp
-	  UserSecurityContext.cpp
-	  Volume.cpp
-	  VolumeManager.cpp
-	: be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a
+	AttributeDirectory.cpp
+	ClientConnection.cpp
+	ClientVolume.cpp
+	ConnectionListener.cpp
+	ConnectionListenerFactory.cpp
+	Directory.cpp
+	Entry.cpp
+	EntryRef.cpp
+	FDManager.cpp
+	GlobalBlockerPool.cpp
+	InsecureConnectionListener.cpp
+	Lockable.cpp
+	NetFSServer.cpp
+	Node.cpp
+	NodeHandle.cpp
+	NodeHandleMap.cpp
+	NodeMonitor.cpp
+	NodeMonitoringEvent.cpp
+	Path.cpp
+	PortConnectionListener.cpp
+	QueryDomain.cpp
+	RequestBufferReplacer.cpp
+	SecurityContext.cpp
+	StatisticsManager.cpp
+	UserSecurityContext.cpp
+	Volume.cpp
+	VolumeManager.cpp
+	:
+	be $(TARGET_NETWORK_LIBS) $(TARGET_LIBSUPC++) libshared.a
+	:
+	netfs_server.rdef
 ;
diff --git a/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp b/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
index 65e3ce6fbc..512d075c4b 100644
--- a/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
@@ -41,11 +41,11 @@
 #include "VolumeManager.h"
 
 static const char* kSettingsDirName		= "netfs";
-static const char* kSettingsFileName	= "NetFSServer";
+static const char* kSettingsFileName	= "netfs_server";
 
 // usage
 static const char* kUsage =
-"Usage: NetFSServer <options>\n"
+"Usage: netfs_server <options>\n"
 "options:\n"
 "  --dont-broadcast  - don't use broadcasting to announce the server's\n"
 "                      availability to clients\n"
@@ -186,25 +186,26 @@ private:
 
 // constructor
 NetFSServer::NetFSServer(bool useBroadcasting)
-	: BApplication(kNetFSServerSignature),
-	  fSecurityContext(NULL),
-	  fConnectionListenerFactory(),
-	  fConnectionListener(NULL),
-	  fLock("netfs server"),
-	  fClientConnections(),
-	  fVolumeManager(NULL),
-	  fClosedConnections(),
-	  fClosedConnectionsSemaphore(-1),
-	  fConnectionListenerThread(-1),
-	  fConnectionDeleter(-1),
-	  fBroadcaster(-1),
-	  fBroadcastingSocket(-1),
-	  fBroadcasterSemaphore(-1),
-	  fServerInfoConnectionListener(-1),
-	  fServerInfoConnectionListenerSocket(-1),
-	  fServerInfoUpdated(0),
-	  fUseBroadcasting(useBroadcasting),
-	  fTerminating(false)
+	:
+	BApplication(kNetFSServerSignature),
+	fSecurityContext(NULL),
+	fConnectionListenerFactory(),
+	fConnectionListener(NULL),
+	fLock("netfs server"),
+	fClientConnections(),
+	fVolumeManager(NULL),
+	fClosedConnections(),
+	fClosedConnectionsSemaphore(-1),
+	fConnectionListenerThread(-1),
+	fConnectionDeleter(-1),
+	fBroadcaster(-1),
+	fBroadcastingSocket(-1),
+	fBroadcasterSemaphore(-1),
+	fServerInfoConnectionListener(-1),
+	fServerInfoConnectionListenerSocket(-1),
+	fServerInfoUpdated(0),
+	fUseBroadcasting(useBroadcasting),
+	fTerminating(false)
 {
 }
 
diff --git a/src/add-ons/kernel/file_systems/netfs/server/netfs_server.rdef b/src/add-ons/kernel/file_systems/netfs/server/netfs_server.rdef
new file mode 100644
index 0000000000..2570d32251
--- /dev/null
+++ b/src/add-ons/kernel/file_systems/netfs/server/netfs_server.rdef
@@ -0,0 +1,21 @@
+/*
+ * netfs_server.rdef
+ */
+
+resource app_signature "application/x-vnd.haiku-netfs_server";
+
+resource app_flags B_EXCLUSIVE_LAUNCH|B_BACKGROUND_APP;
+
+resource app_version {
+	major  = 1,
+	middle = 0,
+	minor  = 0,
+
+	variety = B_APPV_ALPHA,
+	internal = 0,
+
+	short_info = "netfs_server",
+	long_info = "netfs_server ©2004-2010 Haiku, Inc"
+};
+
+
diff --git a/src/add-ons/kernel/file_systems/netfs/shared/NetFSServerRosterDefs.cpp b/src/add-ons/kernel/file_systems/netfs/shared/NetFSServerRosterDefs.cpp
index 75a87e8500..16419c0246 100644
--- a/src/add-ons/kernel/file_systems/netfs/shared/NetFSServerRosterDefs.cpp
+++ b/src/add-ons/kernel/file_systems/netfs/shared/NetFSServerRosterDefs.cpp
@@ -3,4 +3,4 @@
 #include "NetFSServerRosterDefs.h"
 
 const char* kNetFSServerSignature
-	= "application/x-vnd.yellowbites.netfs-server";
+	= "application/x-vnd.haiku-netfs_server";