diff --git a/2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua b/2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua
index ed43848..78f57c5 100644
--- a/2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua
+++ b/2/3/4/5/6/7/ElvUI/Modules/Tooltip/Tooltip.lua
@@ -48,17 +48,17 @@ function TT:GameTooltip_SetDefaultAnchor(tt, parent)
 		if self.db.healthBar.statusPosition == "BOTTOM" then
 			if GameTooltipStatusBar.anchoredToTop then
 				GameTooltipStatusBar:ClearAllPoints()
-				GameTooltipStatusBar:Point("TOPLEFT", GameTooltip, "BOTTOMLEFT", E.Border, -(E.Spacing * 3))
-				GameTooltipStatusBar:Point("TOPRIGHT", GameTooltip, "BOTTOMRIGHT", -E.Border, -(E.Spacing * 3))
-				GameTooltipStatusBar.text:Point("CENTER", GameTooltipStatusBar, 0, -3)
+				E:Point(GameTooltipStatusBar, "TOPLEFT", GameTooltip, "BOTTOMLEFT", E.Border, -(E.Spacing * 3))
+				E:PointGameTooltipStatusBar, "TOPRIGHT", GameTooltip, "BOTTOMRIGHT", -E.Border, -(E.Spacing * 3))
+				E:PointGameTooltipStatusBar.text, "CENTER", GameTooltipStatusBar, 0, -3)
 				GameTooltipStatusBar.anchoredToTop = nil
 			end
 		else
 			if not GameTooltipStatusBar.anchoredToTop then
 				GameTooltipStatusBar:ClearAllPoints()
-				GameTooltipStatusBar:Point("BOTTOMLEFT", GameTooltip, "TOPLEFT", E.Border, (E.Spacing * 3))
-				GameTooltipStatusBar:Point("BOTTOMRIGHT", GameTooltip, "TOPRIGHT", -E.Border, (E.Spacing * 3))
-				GameTooltipStatusBar.text:Point("CENTER", GameTooltipStatusBar, 0, 3)
+				E:Point(GameTooltipStatusBar, "BOTTOMLEFT", GameTooltip, "TOPLEFT", E.Border, (E.Spacing * 3))
+				E:Point(GameTooltipStatusBar, "BOTTOMRIGHT", GameTooltip, "TOPRIGHT", -E.Border, (E.Spacing * 3))
+				E:Point(GameTooltipStatusBar.text, "CENTER", GameTooltipStatusBar, 0, 3)
 				GameTooltipStatusBar.anchoredToTop = true
 			end
 		end
diff --git a/2/3/4/5/6/7/ElvUI_Config/Tooltip.lua b/2/3/4/5/6/7/ElvUI_Config/Tooltip.lua
index 0e91828..7895e6b 100644
--- a/2/3/4/5/6/7/ElvUI_Config/Tooltip.lua
+++ b/2/3/4/5/6/7/ElvUI_Config/Tooltip.lua
@@ -84,7 +84,7 @@ E.Options.args.tooltip = {
 				colorAlpha = {
 					order = 8,
 					type = "range",
-					name = "OPACITY",
+					name = OPACITY,
 					isPercent = true,
 					min = 0, max = 1, step = 0.01
 				},
@@ -224,12 +224,6 @@ E.Options.args.tooltip = {
 						--["ALT"] = ALT_KEY,
 						--["CTRL"] = CTRL_KEY
 					}
-				},
-				combat = {
-					order = 4,
-					type = "toggle",
-					name = "COMBAT",
-					desc = L["Hide tooltip while in combat."]
 				}
 			}
 		},