diff --git a/code/modules/modular_computers/file_system/programs/file_browser.dm b/code/modules/modular_computers/file_system/programs/file_browser.dm
index 97a71496eab..60a9536543b 100644
--- a/code/modules/modular_computers/file_system/programs/file_browser.dm
+++ b/code/modules/modular_computers/file_system/programs/file_browser.dm
@@ -38,14 +38,27 @@
 				return
 			RHDD.remove_file(file)
 			return TRUE
-		if("PRG_rename")
+		if("PRG_renamefile")
 			if(!HDD)
 				return
 			var/datum/computer_file/file = HDD.find_file_by_name(params["name"])
 			if(!file)
 				return
-			var/newname = params["new_name"]
-			if(!newname)
+			var/newname = reject_bad_name(params["new_name"])
+			if(!newname || newname != params["new_name"])
+				playsound(computer, 'sound/machines/terminal_error.ogg', 25, FALSE)
+				return
+			file.filename = newname
+			return TRUE
+		if("PRG_usbrenamefile")
+			if(!RHDD)
+				return
+			var/datum/computer_file/file = RHDD.find_file_by_name(params["name"])
+			if(!file)
+				return
+			var/newname = reject_bad_name(params["new_name"])
+			if(!newname || newname != params["new_name"])
+				playsound(computer, 'sound/machines/terminal_error.ogg', 25, FALSE)
 				return
 			file.filename = newname
 			return TRUE
diff --git a/tgui/packages/tgui/interfaces/NtosFileManager.js b/tgui/packages/tgui/interfaces/NtosFileManager.js
index c9dde399693..e8a85f5602d 100644
--- a/tgui/packages/tgui/interfaces/NtosFileManager.js
+++ b/tgui/packages/tgui/interfaces/NtosFileManager.js
@@ -19,7 +19,7 @@ export const NtosFileManager = (props, context) => {
             usbconnected={usbconnected}
             onUpload={file => act('PRG_copytousb', { name: file })}
             onDelete={file => act('PRG_deletefile', { name: file })}
-            onRename={(file, newName) => act('PRG_rename', {
+            onRename={(file, newName) => act('PRG_renamefile', {
               name: file,
               new_name: newName,
             })}
@@ -33,8 +33,8 @@ export const NtosFileManager = (props, context) => {
               files={usbfiles}
               usbconnected={usbconnected}
               onUpload={file => act('PRG_copyfromusb', { name: file })}
-              onDelete={file => act('PRG_deletefile', { name: file })}
-              onRename={(file, newName) => act('PRG_rename', {
+              onDelete={file => act('PRG_usbdeletefile', { name: file })}
+              onRename={(file, newName) => act('PRG_usbrenamefile', {
                 name: file,
                 new_name: newName,
               })}