Converts all tgui_ to ui_

code/game/objects/items/devices/aicard.dm

@@ -37,18 +37,18 @@
 		overlays.Cut()
 
 /obj/item/aicard/attack_self(mob/user)
-	tgui_interact(user)
+	ui_interact(user)
 
 
-/obj/item/aicard/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/aicard/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "AICard", "[name]", 600, 394,  master_ui, state)
 		ui.open()
 
 
-/obj/item/aicard/tgui_data(mob/user)
-	var/data[0]
+/obj/item/aicard/ui_data(mob/user)
+	var/list/data = list()
 
 	var/mob/living/silicon/ai/AI = locate() in src
 	if(istype(AI))
@@ -75,7 +75,7 @@
 	return data
 
 
-/obj/item/aicard/tgui_act(action, params)
+/obj/item/aicard/ui_act(action, params)
 	if(..())
 		return
 
@@ -90,7 +90,7 @@
 				to_chat(user, "<span class='warning'>You are already wiping this AI!</span>")
 				return
 			var/confirm = alert("Are you sure you want to wipe this card's memory? This cannot be undone once started.", "Confirm Wipe", "Yes", "No")
-			if(confirm == "Yes" && (tgui_status(user, GLOB.tgui_inventory_state) == STATUS_INTERACTIVE)) // And make doubly sure they want to wipe (three total clicks)
+			if(confirm == "Yes" && (ui_status(user, GLOB.inventory_state) == STATUS_INTERACTIVE)) // And make doubly sure they want to wipe (three total clicks)
 				msg_admin_attack("[key_name_admin(user)] wiped [key_name_admin(AI)] with \the [src].", ATKLOG_FEW)
 				add_attack_logs(user, AI, "Wiped with [src].")
 				INVOKE_ASYNC(src, .proc/wipe_ai)

code/game/objects/items/devices/camera_bug.dm

@@ -28,10 +28,10 @@
 	return ..()
 
 /obj/item/camera_bug/attack_self(mob/user as mob)
-	tgui_interact(user)
+	ui_interact(user)
 
-/obj/item/camera_bug/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
-	integrated_console.tgui_interact(user, ui_key, ui, force_open, master_ui, state)
+/obj/item/camera_bug/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
+	integrated_console.ui_interact(user, ui_key, ui, force_open, master_ui, state)
 
 
 /obj/item/camera_bug/ert

code/game/objects/items/devices/floor_painter.dm

@@ -50,11 +50,10 @@
 	if(!user)
 		return 0
 	user.set_machine(src)
-	tgui_interact(user)
+	ui_interact(user)
 	return 1
 
-/obj/item/floor_painter/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null,
-		datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/floor_painter/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "FloorPainter", name, 405, 470, master_ui, state)
@@ -64,7 +63,7 @@
 		ui.set_autoupdate(FALSE)
 		ui.open()
 
-/obj/item/floor_painter/tgui_data(mob/user)
+/obj/item/floor_painter/ui_data(mob/user)
 	var/list/data = list()
 	data["availableStyles"] = allowed_states
 	data["selectedStyle"] = floor_state
@@ -78,7 +77,7 @@
 	return data
 
 
-/obj/item/floor_painter/tgui_static_data(mob/user)
+/obj/item/floor_painter/ui_static_data(mob/user)
 	var/list/data = list()
 
 	data["allStylesPreview"] = list()
@@ -88,7 +87,7 @@
 
 	return data
 
-/obj/item/floor_painter/tgui_act(action, params)
+/obj/item/floor_painter/ui_act(action, params)
 	if(..())
 		return
 

code/game/objects/items/devices/radio/electropack.dm

@@ -77,13 +77,13 @@
 	return
 
 
-/obj/item/radio/electropack/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/radio/electropack/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "Electropack", name, 360, 150, master_ui, state)
 		ui.open()
 
-/obj/item/radio/electropack/tgui_data(mob/user)
+/obj/item/radio/electropack/ui_data(mob/user)
 	var/list/data = list()
 	data["power"] = on
 	data["frequency"] = frequency
@@ -92,7 +92,7 @@
 	data["maxFrequency"] = PUBLIC_HIGH_FREQ
 	return data
 
-/obj/item/radio/electropack/tgui_act(action, params)
+/obj/item/radio/electropack/ui_act(action, params)
 	if(..())
 		return
 	. = TRUE

code/game/objects/items/devices/radio/radio.dm

@@ -118,16 +118,16 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	return interact(user)
 
 /obj/item/radio/attack_self(mob/user)
-	tgui_interact(user)
+	ui_interact(user)
 
 /obj/item/radio/interact(mob/user)
 	if(!user)
 		return 0
 	if(b_stat)
 		wires.Interact(user)
-	tgui_interact(user)
+	ui_interact(user)
 
-/obj/item/radio/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/item/radio/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		var/list/schannels = list_secure_channels(user)
@@ -136,7 +136,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 		ui = new(user, src, ui_key, "Radio", name, 400, calc_height, master_ui, state)
 		ui.open()
 
-/obj/item/radio/tgui_data(mob/user)
+/obj/item/radio/ui_data(mob/user)
 	var/list/data = list()
 
 	data["broadcasting"] = broadcasting
@@ -153,7 +153,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	data["loudspeaker"] = loudspeaker
 	return data
 
-/obj/item/radio/tgui_act(action, params, datum/tgui/ui)
+/obj/item/radio/ui_act(action, params, datum/tgui/ui)
 	if(..())
 		return
 	. = TRUE
@@ -622,7 +622,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 /obj/item/radio/borg/syndicate
 	keyslot = new /obj/item/encryptionkey/syndicate/nukeops
 
-/obj/item/radio/borg/syndicate/tgui_status(mob/user, datum/tgui_state/state)
+/obj/item/radio/borg/syndicate/ui_status(mob/user, datum/ui_state/state)
 	. = ..()
 	if(. == STATUS_UPDATE && istype(user, /mob/living/silicon/robot/syndicate))
 		. = STATUS_INTERACTIVE

code/game/objects/items/devices/sensor_device.dm

@@ -6,7 +6,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	slot_flags = SLOT_BELT
 	origin_tech = "programming=3;materials=3;magnets=3"
-	var/datum/tgui_module/crew_monitor/crew_monitor
+	var/datum/ui_module/crew_monitor/crew_monitor
 
 /obj/item/sensor_device/New()
 	..()
@@ -17,7 +17,7 @@
 	return ..()
 
 /obj/item/sensor_device/attack_self(mob/user as mob)
-	tgui_interact(user)
+	ui_interact(user)
 
-/obj/item/sensor_device/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
-	crew_monitor.tgui_interact(user, ui_key, ui, force_open)
+/obj/item/sensor_device/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
+	crew_monitor.ui_interact(user, ui_key, ui, force_open)

code/game/objects/items/devices/transfer_valve.dm

@@ -88,15 +88,15 @@
 		O.hear_message(M, msg)
 
 /obj/item/transfer_valve/attack_self(mob/user)
-	tgui_interact(user)
+	ui_interact(user)
 
-/obj/item/transfer_valve/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/transfer_valve/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "TransferValve",  name, 460, 320, master_ui, state)
 		ui.open()
 
-/obj/item/transfer_valve/tgui_data(mob/user)
+/obj/item/transfer_valve/ui_data(mob/user)
 	var/list/data = list()
 	data["tank_one"] = tank_one ? tank_one.name : null
 	data["tank_two"] = tank_two ? tank_two.name : null
@@ -106,7 +106,7 @@
 
 
 
-/obj/item/transfer_valve/tgui_act(action, params)
+/obj/item/transfer_valve/ui_act(action, params)
 	if(..())
 		return
 	. = TRUE

code/game/objects/items/devices/uplinks.dm

@@ -24,7 +24,7 @@ GLOBAL_LIST_EMPTY(world_uplinks)
 	var/temp_category
 	var/uplink_type = "traitor"
 
-/obj/item/uplink/tgui_host()
+/obj/item/uplink/ui_host()
 	return loc
 
 /obj/item/uplink/New()
@@ -150,20 +150,20 @@ GLOBAL_LIST_EMPTY(world_uplinks)
 		return TRUE
 	return FALSE
 
-/obj/item/uplink/hidden/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/uplink/hidden/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "Uplink", name, 900, 600, master_ui, state)
 		ui.open()
 
-/obj/item/uplink/hidden/tgui_data(mob/user)
+/obj/item/uplink/hidden/ui_data(mob/user)
 	var/list/data = list()
 
 	data["crystals"] = uses
 
 	return data
 
-/obj/item/uplink/hidden/tgui_static_data(mob/user)
+/obj/item/uplink/hidden/ui_static_data(mob/user)
 	var/list/data = list()
 
 	// Actual items
@@ -190,10 +190,10 @@ GLOBAL_LIST_EMPTY(world_uplinks)
 
 // Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button.
 /obj/item/uplink/hidden/interact(mob/user)
-	tgui_interact(user)
+	ui_interact(user)
 
 // The purchasing code.
-/obj/item/uplink/hidden/tgui_act(action, list/params)
+/obj/item/uplink/hidden/ui_act(action, list/params)
 	if(..())
 		return
 

code/game/objects/items/weapons/RCD.dm

@@ -199,15 +199,15 @@
 		if(MODE_AIRLOCK, MODE_DECON, MODE_WINDOW, MODE_TURF)
 			mode = choice
 		if("UI")
-			tgui_interact(user)
+			ui_interact(user)
 			return
 		if("Change Access")
 			ui_tab = TAB_AIRLOCK_ACCESS
-			tgui_interact(user)
+			ui_interact(user)
 			return
 		if("Change Airlock Type")
 			ui_tab = TAB_AIRLOCK_TYPE
-			tgui_interact(user)
+			ui_interact(user)
 			return
 		else
 			return
@@ -222,13 +222,13 @@
 /obj/item/rcd/attack_self_tk(mob/user)
 	radial_menu(user)
 
-/obj/item/rcd/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/rcd/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "RCD", "Rapid Construction Device", 471, 673, master_ui, state)
 		ui.open()
 
-/obj/item/rcd/tgui_data(mob/user)
+/obj/item/rcd/ui_data(mob/user)
 	var/list/data = list(
 		"tab" = ui_tab,
 		"mode" = mode,
@@ -238,11 +238,11 @@
 		"door_name" = door_name,
 		"one_access" = one_access,
 		"selected_accesses" = selected_accesses,
-		"modal" = tgui_modal_data(src)
+		"modal" = ui_modal_data(src)
 	)
 	return data
 
-/obj/item/rcd/tgui_static_data(mob/user)
+/obj/item/rcd/ui_static_data(mob/user)
 	var/list/data = list(
 		"max_matter" = max_matter,
 		"regions" = get_accesslist_static_data(REGION_GENERAL, REGION_COMMAND),
@@ -251,14 +251,14 @@
 	)
 	return data
 
-/obj/item/rcd/tgui_act(action, list/params)
+/obj/item/rcd/ui_act(action, list/params)
 	if(..())
 		return
 
 	if(prob(20))
 		spark_system.start()
 
-	if(tgui_act_modal(action, params))
+	if(ui_act_modal(action, params))
 		return TRUE
 
 	. = TRUE
@@ -319,22 +319,22 @@
 			selected_accesses = get_all_accesses()
 
 /**
-  * Called in tgui_act() to process modal actions
+  * Called in ui_act() to process modal actions
   *
   * Arguments:
   * * action - The action passed by tgui
   * * params - The params passed by tgui
   */
-/obj/item/rcd/proc/tgui_act_modal(action, list/params)
+/obj/item/rcd/proc/ui_act_modal(action, list/params)
 	. = TRUE
-	switch(tgui_modal_act(src, action, params))
-		if(TGUI_MODAL_OPEN)
-			tgui_modal_input(src, "renameAirlock", "Enter a new name:", value = door_name, max_length = TGUI_MODAL_INPUT_MAX_LENGTH_NAME)
-		if(TGUI_MODAL_ANSWER)
+	switch(ui_modal_act(src, action, params))
+		if(UI_MODAL_OPEN)
+			ui_modal_input(src, "renameAirlock", "Enter a new name:", value = door_name, max_length = UI_MODAL_INPUT_MAX_LENGTH_NAME)
+		if(UI_MODAL_ANSWER)
 			var/answer = params["answer"]
 			if(!answer)
 				return
-			door_name = sanitize(copytext(answer, 1, TGUI_MODAL_INPUT_MAX_LENGTH_NAME))
+			door_name = sanitize(copytext(answer, 1, UI_MODAL_INPUT_MAX_LENGTH_NAME))
 		else
 			return FALSE
 

code/game/objects/items/weapons/rpd.dm

@@ -168,9 +168,9 @@
 // TGUI stuff
 
 /obj/item/rpd/attack_self(mob/user)
-	tgui_interact(user)
+	ui_interact(user)
 
-/obj/item/rpd/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/rpd/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
 	user.set_machine(src)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
@@ -181,7 +181,7 @@
 /obj/item/rpd/AltClick(mob/user)
 	radial_menu(user)
 
-/obj/item/rpd/tgui_data(mob/user)
+/obj/item/rpd/ui_data(mob/user)
 	var/list/data = list()
 	data["iconrotation"] = iconrotation
 	data["mainmenu"] = mainmenu
@@ -193,7 +193,7 @@
 	data["whatpipe"] = whatpipe
 	return data
 
-/obj/item/rpd/tgui_act(action, list/params)
+/obj/item/rpd/ui_act(action, list/params)
 	if(..())
 		return
 
@@ -235,7 +235,7 @@
 	if(!check_menu(user))
 		return
 	if(selected_mode == "UI")
-		tgui_interact(user)
+		ui_interact(user)
 	else
 		switch(selected_mode)
 			if(RPD_MENU_ROTATE)

code/game/objects/items/weapons/tanks/tanks.dm

@@ -137,15 +137,15 @@
 	if(!(air_contents))
 		return
 
-	tgui_interact(user)
+	ui_interact(user)
 
-/obj/item/tank/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_inventory_state)
+/obj/item/tank/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "Tank",  name, 300, 150, master_ui, state)
 		ui.open()
 
-/obj/item/tank/tgui_data(mob/user)
+/obj/item/tank/ui_data(mob/user)
 	var/list/data = list()
 	data["tankPressure"] = round(air_contents.return_pressure() ? air_contents.return_pressure() : 0)
 	data["releasePressure"] = round(distribute_pressure ? distribute_pressure : 0)
@@ -161,7 +161,7 @@
 	data["connected"] = (C.internal && C.internal == src) ? TRUE : FALSE
 	return data
 
-/obj/item/tank/tgui_act(action, params)
+/obj/item/tank/ui_act(action, params)
 	if(..())
 		return
 	. = TRUE

code/game/objects/objs.dm

@@ -50,14 +50,14 @@
 	else if(!istype(armor, /datum/armor))
 		stack_trace("Invalid type [armor.type] found in .armor during /obj Initialize()")
 
-/obj/Topic(href, href_list, nowindow = FALSE, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/Topic(href, href_list, nowindow = FALSE, datum/ui_state/state = GLOB.default_state)
 	// Calling Topic without a corresponding window open causes runtime errors
 	if(!nowindow && ..())
 		return TRUE
 
 	// In the far future no checks are made in an overriding Topic() beyond if(..()) return
 	// Instead any such checks are made in CanUseTopic()
-	if(tgui_status(usr, state, href_list) == STATUS_INTERACTIVE)
+	if(ui_status(usr, state, href_list) == STATUS_INTERACTIVE)
 		CouldUseTopic(usr)
 		return FALSE
 
@@ -65,7 +65,7 @@
 	return TRUE
 
 /obj/proc/CouldUseTopic(mob/user)
-	var/atom/host = tgui_host()
+	var/atom/host = ui_host()
 	host.add_fingerprint(user)
 
 /obj/proc/CouldNotUseTopic(mob/user)

code/game/objects/structures/mirror.dm

@@ -28,13 +28,13 @@
 		return
 
 	if(ishuman(user))
-		var/datum/tgui_module/appearance_changer/AC = ui_users[user]
+		var/datum/ui_module/appearance_changer/AC = ui_users[user]
 		if(!AC)
 			AC = new(src, user)
 			AC.name = "SalonPro Nano-Mirror"
 			AC.flags = APPEARANCE_ALL_BODY
 			ui_users[user] = AC
-		AC.tgui_interact(user)
+		AC.ui_interact(user)
 
 /obj/structure/mirror/obj_break(damage_flag, mapload)
 	if(!broken && !(flags & NODECONSTRUCT))
@@ -121,14 +121,14 @@
 			else
 				race_list += GLOB.whitelisted_species
 
-			var/datum/tgui_module/appearance_changer/AC = ui_users[user]
+			var/datum/ui_module/appearance_changer/AC = ui_users[user]
 			if(!AC)
 				AC = new(src, user)
 				AC.name = "Magic Mirror"
 				AC.flags = APPEARANCE_ALL
 				AC.whitelist = race_list
 				ui_users[user] = AC
-			AC.tgui_interact(user)
+			AC.ui_interact(user)
 
 		if("Voice")
 			var/voice_choice = input(user, "Perhaps...", "Voice effects") as null|anything in list("Comic Sans", "Wingdings", "Swedish", "Chav", "Mute")
@@ -155,7 +155,7 @@
 			if(voice_choice)
 				curse(user)
 
-/obj/structure/mirror/magic/tgui_close(mob/user)
+/obj/structure/mirror/magic/ui_close(mob/user)
 	curse(user)
 
 /obj/structure/mirror/magic/attackby(obj/item/I, mob/living/user, params)

code/game/objects/structures/safe.dm

@@ -139,7 +139,7 @@ GLOBAL_LIST_EMPTY(safes)
 /obj/structure/safe/attack_ghost(mob/user)
 	if(..() || drill)
 		return TRUE
-	tgui_interact(user)
+	ui_interact(user)
 
 /obj/structure/safe/attack_hand(mob/user)
 	if(..())
@@ -171,7 +171,7 @@ GLOBAL_LIST_EMPTY(safes)
 			if("Cancel")
 				return
 	else
-		tgui_interact(user)
+		ui_interact(user)
 
 /obj/structure/safe/attackby(obj/item/I, mob/user, params)
 	if(open)
@@ -209,7 +209,7 @@ GLOBAL_LIST_EMPTY(safes)
 			to_chat(user, "<span class='warning'>You can't put [I] into the safe while it is closed!</span>")
 			return
 
-/obj/structure/safe/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_physical_state)
+/obj/structure/safe/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = TRUE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.physical_state)
 	var/datum/asset/safe_assets = get_asset_datum(/datum/asset/simple/safe)
 	safe_assets.send(user)
 
@@ -219,7 +219,7 @@ GLOBAL_LIST_EMPTY(safes)
 		ui.open()
 		ui.set_autoupdate(FALSE)
 
-/obj/structure/safe/tgui_data(mob/user)
+/obj/structure/safe/ui_data(mob/user)
 	var/list/data = list()
 	data["dial"] = dial
 	data["open"] = open
@@ -234,7 +234,7 @@ GLOBAL_LIST_EMPTY(safes)
 
 	return data
 
-/obj/structure/safe/tgui_act(action, params)
+/obj/structure/safe/ui_act(action, params)
 	if(..())
 		return
 

code/game/objects/structures/tank_dispenser.dm

@@ -57,24 +57,24 @@
 	if(..())
 		return 1
 	add_fingerprint(user)
-	tgui_interact(user)
+	ui_interact(user)
 
 /obj/structure/dispenser/attack_ghost(mob/user)
-	tgui_interact(user)
+	ui_interact(user)
 
-/obj/structure/dispenser/tgui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/tgui_state/state = GLOB.tgui_default_state)
+/obj/structure/dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
 		ui = new(user, src, ui_key, "TankDispenser", name, 275, 100, master_ui, state)
 		ui.open()
 
-/obj/structure/dispenser/tgui_data(user)
+/obj/structure/dispenser/ui_data(user)
 	var/list/data = list()
 	data["o_tanks"] = LAZYLEN(stored_oxygen_tanks)
 	data["p_tanks"] = LAZYLEN(stored_plasma_tanks)
 	return data
 
-/obj/structure/dispenser/tgui_act(action, list/params)
+/obj/structure/dispenser/ui_act(action, list/params)
 	if(..())
 		return