diff --git a/.luacheckrc b/.luacheckrc
index dfd098b..164c383 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -31,7 +31,6 @@ globals = {
 	"IsEncounterInProgress",
 	"IsGuildMember",
 	"PlayerLocation",
-	"SetCVar",
 	"tremove",
 	"UnitInParty",
 	"UnitInRaid",
@@ -43,4 +42,8 @@ globals = {
 	"GameTooltip_Hide",
 	"PlaySound",
 	"UIParent",
+
+	-- Classic
+	"BNGetGameAccountInfoByGUID",
+	"C_ChatInfo",
 }
diff --git a/BadBoy_Classic.lua b/BadBoy_Classic.lua
index 0ded2fa..ad8b8d2 100644
--- a/BadBoy_Classic.lua
+++ b/BadBoy_Classic.lua
@@ -47,7 +47,7 @@ local repTbl = {
 
 --[[ Chat Scanning ]]--
 local Ambiguate, BNGetGameAccountInfoByGUID, strfind, gsub, lower, next, type, tremove = Ambiguate, BNGetGameAccountInfoByGUID, string.find, string.gsub, string.lower, next, type, tremove
-local IsFriend, IsGuildMember, UnitInRaid, UnitInParty, SetCVar, GetCVarBool = C_FriendList.IsFriend, IsGuildMember, UnitInRaid, UnitInParty, SetCVar, GetCVarBool
+local IsFriend, IsGuildMember, UnitInRaid, UnitInParty, SetCVar, GetCVarBool = C_FriendList.IsFriend, IsGuildMember, UnitInRaid, UnitInParty, C_CVar.SetCVar, C_CVar.GetCVarBool
 local CanReportPlayer, ReportPlayer, PlayerLocation = C_ChatInfo.CanReportPlayer, C_ChatInfo.ReportPlayer, PlayerLocation
 local spamCollector, spamLogger, prevShow, enableBubble = {}, {}, 0, false
 local blockedLineId, et, chatLines, chatPlayers = 0, 7, {}, {}