diff --git a/code/modules/tgui/modules/camera.dm b/code/modules/tgui/modules/camera.dm
index 2b5b856087a..20c6aeb0ef9 100644
--- a/code/modules/tgui/modules/camera.dm
+++ b/code/modules/tgui/modules/camera.dm
@@ -135,7 +135,7 @@
 	if(action == "switch_camera")
 		var/c_tag = params["name"]
 		var/list/cameras = get_available_cameras(usr)
-		var/obj/machinery/camera/C = cameras[c_tag]
+		var/obj/machinery/camera/C = cameras["[ckey(c_tag)]"]
 		active_camera = C
 		playsound(tgui_host(), get_sfx("terminal_type"), 25, FALSE)
 
@@ -216,7 +216,7 @@
 			continue
 		var/list/tempnetwork = C.network & all_networks
 		if(tempnetwork.len)
-			D["[C.c_tag]"] = C
+			D["[ckey(C.c_tag)]"] = C
 	return D
 
 /datum/tgui_module/camera/proc/can_access_network(mob/user, network_access, station_network = 0)
diff --git a/maps/tether/submaps/offmap/talon.dm b/maps/tether/submaps/offmap/talon.dm
index c530e24b08a..722cd150a5d 100644
--- a/maps/tether/submaps/offmap/talon.dm
+++ b/maps/tether/submaps/offmap/talon.dm
@@ -386,7 +386,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
 	filedesc = "Helmet Camera Monitoring (Talon)"
 	extended_desc = "This program allows remote access to Talon helmet camera systems."
 	size = 4 //Smaller because limited scope
-	nanomodule_path = /datum/nano_module/camera_monitor/talon_helmet
+	tguimodule_path = /datum/tgui_module/camera/ntos/talon_helmet
 	required_access = access_talon
 
 // Talon ship cameras
@@ -395,23 +395,18 @@ Once in open space, consider disabling nonessential power-consuming electronics
 	filedesc = "Ship Camera Monitoring (Talon)"
 	extended_desc = "This program allows remote access to the Talon's camera system."
 	size = 10 //Smaller because limited scope
-	nanomodule_path = /datum/nano_module/camera_monitor/talon_ship
+	tguimodule_path = /datum/tgui_module/camera/ntos/talon_ship
 	required_access = access_talon
 
-/datum/nano_module/camera_monitor/talon_ship
+/datum/tgui_module/camera/ntos/talon_ship
 	name = "Talon Ship Camera Monitor"
-/datum/nano_module/camera_monitor/talon_ship/modify_networks_list(var/list/networks)
-	networks.Cut()
-	networks.Add(list(list("tag" = NETWORK_TALON_SHIP, "has_access" = 1)))
-	networks.Add(list(list("tag" = NETWORK_THUNDER, "has_access" = 1))) //THUNDERRRRR
-	return networks
+/datum/nano_module/camera_monitor/talon_ship/New(host)
+	. = ..(host, list(NETWORK_TALON_SHIP, NETWORK_THUNDER))
 
-/datum/nano_module/camera_monitor/talon_helmet
+/datum/tgui_module/camera/ntos/talon_helmet
 	name = "Talon Helmet Camera Monitor"
-/datum/nano_module/camera_monitor/talon_helmet/modify_networks_list(var/list/networks)
-	networks.Cut()
-	networks.Add(list(list("tag" = NETWORK_TALON_HELMETS, "has_access" = 1)))
-	return networks
+/datum/tgui_module/camera/ntos/talon_helmet/New(host)
+	. = ..(host, list(NETWORK_TALON_HELMETS))
 
 /datum/computer_file/program/power_monitor/talon
 	filename = "tpowermonitor"