diff --git a/api/api.lua b/api/api.lua
index 46d4de1f..4cbcd09f 100644
--- a/api/api.lua
+++ b/api/api.lua
@@ -208,7 +208,7 @@ function pfUI.api.GetUnbuffedRoster(name)
     end
   end
 
-  if UnitInRaid("player") then
+  if IsInRaid() then
     for i=1,40 do check("raid"..i) end
   else
     check("player")
@@ -485,7 +485,7 @@ end
 -- 'msg'        [string]          the message to send
 function pfUI.api.SendChatMessageWide(msg)
   local channel = "SAY"
-  if UnitInRaid("player") then
+  if IsInRaid() then
     if ( IsRaidLeader() or IsRaidOfficer() ) then
       channel = "RAID_WARNING"
     else
diff --git a/modules/loot.lua b/modules/loot.lua
index 0f417a00..93a88dc6 100644
--- a/modules/loot.lua
+++ b/modules/loot.lua
@@ -323,7 +323,7 @@ pfUI:RegisterModule("loot", function ()
   end
 
   function pfUI.loot:InitGroupDropDown()
-    local inRaid = UnitInRaid("player")
+    local inRaid = IsInRaid()
     if UIDROPDOWNMENU_MENU_LEVEL == 1 then
       if ( inRaid ) then
         pfUI.loot:BuildRaidMenu(UIDROPDOWNMENU_MENU_LEVEL)
diff --git a/modules/raid.lua b/modules/raid.lua
index c1348f78..0f52381f 100644
--- a/modules/raid.lua
+++ b/modules/raid.lua
@@ -106,7 +106,7 @@ pfUI:RegisterModule("raid", function ()
     this.pendingUpdate = nil
 
     -- don't proceed without raid
-    if not UnitInRaid("player") then return end
+    if not IsInRaid() then return end
 
     -- clear all existing frames
     for i=1, maxraid do SetRaidIndex(pfUI.uf.raid[i], 0) end