diff --git a/elm.json b/elm.json
index 6046abd0..3d1a46f5 100644
--- a/elm.json
+++ b/elm.json
@@ -64,6 +64,7 @@
         "Nri.Ui.TextArea.V4",
         "Nri.Ui.TextInput.V6",
         "Nri.Ui.Tooltip.V1",
+        "Nri.Ui.Tooltip.V2",
         "Nri.Ui.UiIcon.V1"
     ],
     "elm-version": "0.19.0 <= v < 0.20.0",
diff --git a/src/Nri/Ui/Tooltip/V2.elm b/src/Nri/Ui/Tooltip/V2.elm
index 5514baa5..45022bd5 100644
--- a/src/Nri/Ui/Tooltip/V2.elm
+++ b/src/Nri/Ui/Tooltip/V2.elm
@@ -1,4 +1,4 @@
-module Nri.Ui.Tooltip.V1 exposing
+module Nri.Ui.Tooltip.V2 exposing
     ( Tooltip, tooltip
     , Position(..), withPosition
     , Width(..), withWidth
@@ -248,7 +248,7 @@ toggleTip { isOpen, onTrigger, extraButtonAttrs, label } tooltip_ =
             20
     in
     Nri.Ui.styled Html.div
-        "Nri-Ui-Tooltip-V1-ToggleTip"
+        "Nri-Ui-Tooltip-V2-ToggleTip"
         (tooltipContainerStyles
             ++ [ -- Take up enough room within the document flow
                  Css.width (Css.px contentSize)
@@ -346,7 +346,7 @@ viewTooltip_ :
     -> Html msg
 viewTooltip_ purpose { trigger, triggerHtml, onTrigger, isOpen, id, extraButtonAttrs } tooltip_ =
     Nri.Ui.styled Html.div
-        "Nri-Ui-Tooltip-V1"
+        "Nri-Ui-Tooltip-V2"
         tooltipContainerStyles
         []
         [ Html.button
diff --git a/styleguide-app/Examples/Tooltip.elm b/styleguide-app/Examples/Tooltip.elm
index 00085783..60e68156 100644
--- a/styleguide-app/Examples/Tooltip.elm
+++ b/styleguide-app/Examples/Tooltip.elm
@@ -15,7 +15,7 @@ import Html.Styled.Attributes exposing (css, href)
 import KeyboardSupport exposing (Direction(..), Key(..))
 import Nri.Ui.Heading.V2 as Heading
 import Nri.Ui.Text.V4 as Text
-import Nri.Ui.Tooltip.V1 as Tooltip
+import Nri.Ui.Tooltip.V2 as Tooltip
 
 
 type TooltipType
@@ -55,7 +55,7 @@ update msg model =
 
 example : Example State Msg
 example =
-    { name = "Nri.Ui.Tooltip.V1"
+    { name = "Nri.Ui.Tooltip.V2"
     , categories = [ Widgets ]
     , atomicDesignType = Molecule
     , keyboardSupport = []
diff --git a/tests/elm-verify-examples.json b/tests/elm-verify-examples.json
index 4a706924..e71730c6 100644
--- a/tests/elm-verify-examples.json
+++ b/tests/elm-verify-examples.json
@@ -60,6 +60,7 @@
         "Nri.Ui.TextArea.V4",
         "Nri.Ui.TextInput.V6",
         "Nri.Ui.Tooltip.V1",
+        "Nri.Ui.Tooltip.V2",
         "Nri.Ui.UiIcon.V1"
     ]
 }