diff --git a/code/controllers/subsystem/tcgsetup.dm b/code/controllers/subsystem/tcgsetup.dm
index 763581eb24d..e52474adac5 100644
--- a/code/controllers/subsystem/tcgsetup.dm
+++ b/code/controllers/subsystem/tcgsetup.dm
@@ -124,9 +124,9 @@ SUBSYSTEM_DEF(trading_card_game)
 			message_admins(toPrint.name)
 
 ///Checks the passed type list for missing raritys, or raritys out of bounds
-/datum/controller/subsystem/trading_card_game/proc/checkCardpacks(cardPackList)
+/datum/controller/subsystem/trading_card_game/proc/check_cardpacks(card_pack_list)
 	var/toReturn = ""
-	for(var/cardPack in cardPackList)
+	for(var/cardPack in card_pack_list)
 		var/obj/item/cardpack/pack = new cardPack()
 		//Lets see if someone made a type yeah?
 		if(!cached_cards[pack.series])
@@ -145,10 +145,11 @@ SUBSYSTEM_DEF(trading_card_game)
 			if(!cached_cards[pack.series][pack_rarity])
 				toReturn += "[pack.type] does not have the required rarity [pack_rarity]\n"
 		qdel(pack)
+
 	return toReturn
 
 ///Checks the global card list for cards that don't override all the default values of the card datum
-/datum/controller/subsystem/trading_card_game/proc/checkCardDatums()
+/datum/controller/subsystem/trading_card_game/proc/check_card_datums()
 	var/toReturn = ""
 	var/datum/thing = new()
 	for(var/series in cached_cards)
@@ -166,10 +167,11 @@ SUBSYSTEM_DEF(trading_card_game)
 			if(shouldAdd)
 				toReturn += toAdd
 	qdel(thing)
+
 	return toReturn
 
 ///Used to test open a large amount of cardpacks
-/datum/controller/subsystem/trading_card_game/proc/checkCardDistribution(cardPack, batchSize, batchCount, guaranteed)
+/datum/controller/subsystem/trading_card_game/proc/check_card_distribution(cardPack, batchSize, batchCount, guaranteed)
 	var/totalCards = 0
 	//Gotta make this look like an associated list so the implicit "does this exist" checks work proper later
 	var/list/cardsByCount = list("" = 0)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 62c3bd19b44..f7e2a68c76f 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -647,10 +647,12 @@ GLOBAL_PROTECT(admin_verbs_poll)
 	if(!SStrading_card_game.loaded)
 		message_admins("The card subsystem is not currently loaded")
 		return
-	var/message = SStrading_card_game.checkCardpacks(SStrading_card_game.card_packs)
-	message += SStrading_card_game.checkCardDatums()
+	var/message = SStrading_card_game.check_cardpacks(SStrading_card_game.card_packs)
+	message += SStrading_card_game.check_card_datums()
 	if(message)
 		message_admins(message)
+	else
+		message_admins("No errors found in card rarities or overrides.")
 
 /client/proc/test_cardpack_distribution()
 	set name = "Test Cardpack Distribution"
@@ -660,11 +662,14 @@ GLOBAL_PROTECT(admin_verbs_poll)
 	if(!SStrading_card_game.loaded)
 		message_admins("The card subsystem is not currently loaded")
 		return
-	var/pack = input("Which pack should we test?", "You fucked it didn't you") as null|anything in sort_list(SStrading_card_game.card_packs)
-	var/batchCount = input("How many times should we open it?", "Don't worry, I understand") as null|num
-	var/batchSize = input("How many cards per batch?", "I hope you remember to check the validation") as null|num
-	var/guar = input("Should we use the pack's guaranteed rarity? If so, how many?", "We've all been there. Man you should have seen the old system") as null|num
-	SStrading_card_game.checkCardDistribution(pack, batchSize, batchCount, guar)
+	var/pack = tgui_input_list(usr, "Which pack should we test?", "You fucked it didn't you", sort_list(SStrading_card_game.card_packs))
+	if(!pack)
+		return
+	var/batch_count = tgui_input_number(usr, "How many times should we open it?", "Don't worry, I understand")
+	var/batch_size = tgui_input_number(usr, "How many cards per batch?", "I hope you remember to check the validation")
+	var/guar = tgui_input_number(usr, "Should we use the pack's guaranteed rarity? If so, how many?", "We've all been there. Man you should have seen the old system")
+
+	SStrading_card_game.check_card_distribution(pack, batch_size, batch_count, guar)
 
 /client/proc/print_cards()
 	set name = "Print Cards"
diff --git a/code/modules/unit_tests/card_mismatch.dm b/code/modules/unit_tests/card_mismatch.dm
index 54713984769..90d8250ff0d 100644
--- a/code/modules/unit_tests/card_mismatch.dm
+++ b/code/modules/unit_tests/card_mismatch.dm
@@ -1,6 +1,6 @@
 /datum/unit_test/card_mismatch
 
 /datum/unit_test/card_mismatch/Run()
-	var/message = SStrading_card_game.checkCardpacks(SStrading_card_game.card_packs)
-	message += SStrading_card_game.checkCardDatums()
+	var/message = SStrading_card_game.check_cardpacks(SStrading_card_game.card_packs)
+	message += SStrading_card_game.check_card_datums()
 	TEST_ASSERT(!message, message)