diff --git a/code/modules/server_tools/st_interface.dm b/code/modules/server_tools/st_interface.dm
index 39bebbbb3d..b0b1b0a43c 100644
--- a/code/modules/server_tools/st_interface.dm
+++ b/code/modules/server_tools/st_interface.dm
@@ -30,7 +30,10 @@ SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE)
 		return
 	if(skip_compat_check && !fexists(SERVICE_INTERFACE_DLL))
 		CRASH("Service parameter present but no interface DLL detected. This is symptomatic of running a service less than version 3.1! Please upgrade.")
-	call(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(command)	//trust no retval
+	var/instance = params[SERVICE_INSTANCE_PARAM]
+	if(!instance)
+		instance = "TG Station Server"	//maybe just upgraded
+	call(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance, command)	//trust no retval
 	return TRUE
 
 /world/proc/ChatBroadcast(message)
@@ -72,7 +75,7 @@ SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE)
 	switch(command)
 		if(SERVICE_CMD_API_COMPATIBLE)
 			SERVER_TOOLS_WRITE_GLOBAL(server_tools_api_compatible, TRUE)
-			return "SUCCESS"
+			return SERVICE_RETURN_SUCCESS
 		if(SERVICE_CMD_HARD_REBOOT)
 			if(SERVER_TOOLS_READ_GLOBAL(reboot_mode) != REBOOT_MODE_HARD)
 				SERVER_TOOLS_WRITE_GLOBAL(reboot_mode, REBOOT_MODE_HARD)
@@ -88,7 +91,7 @@ SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE)
 			if(!istext(msg) || !msg)
 				return "No message set!"
 			SERVER_TOOLS_WORLD_ANNOUNCE(msg)
-			return "SUCCESS"
+			return SERVICE_RETURN_SUCCESS
 		if(SERVICE_CMD_PLAYER_COUNT)
 			return "[SERVER_TOOLS_CLIENT_COUNT]"
 		if(SERVICE_CMD_LIST_CUSTOM)
@@ -96,13 +99,13 @@ SERVER_TOOLS_DEFINE_AND_SET_GLOBAL(server_tools_api_compatible, FALSE)
 		else
 			var/custom_command_result = HandleServiceCustomCommand(lowertext(command), params[SERVICE_CMD_PARAM_SENDER], params[SERVICE_CMD_PARAM_CUSTOM])
 			if(custom_command_result)
-				return istext(custom_command_result) ? custom_command_result : "SUCCESS"
+				return istext(custom_command_result) ? custom_command_result : SERVICE_RETURN_SUCCESS
 			return "Unknown command: [command]"
 
 /*
 The MIT License
 
-Copyright (c) 2011 Dominic Tarr
+Copyright (c) 2017 Jordan Brown
 
 Permission is hereby granted, free of charge, 
 to any person obtaining a copy of this software and