diff --git a/VDS/Components/Tooltip/Tooltip.swift b/VDS/Components/Tooltip/Tooltip.swift
index b8ce0bf6..679c260e 100644
--- a/VDS/Components/Tooltip/Tooltip.swift
+++ b/VDS/Components/Tooltip/Tooltip.swift
@@ -177,9 +177,9 @@ open class Tooltip: Control, TooltipLaunchable {
         if let label, !label.isEmpty {
             accessibilityLabel = label
         } else {
-            accessibilityLabel = "Tooltip"
+            accessibilityLabel = "Modal"
         }
-        accessibilityHint = isEnabled ? "Click to open Tooltip." : ""
+        accessibilityHint = isEnabled ? "Double tap to open." : ""
         accessibilityValue = "collapsed"
     }
     
diff --git a/VDS/Components/Tooltip/TooltipDialog.swift b/VDS/Components/Tooltip/TooltipDialog.swift
index c80b8637..5480c8c5 100644
--- a/VDS/Components/Tooltip/TooltipDialog.swift
+++ b/VDS/Components/Tooltip/TooltipDialog.swift
@@ -46,7 +46,7 @@ open class TooltipDialog: View, UIScrollViewDelegate {
     }
         
     lazy var primaryAccessibilityElement = UIAccessibilityElement(accessibilityContainer: self).with {
-        $0.accessibilityLabel = "Tooltip"
+        $0.accessibilityLabel = "Modal"
         $0.accessibilityValue = "expanded"
         $0.accessibilityFrameInContainerSpace = .init(origin: .zero, size: .init(width: fullWidth, height: VDSLayout.Spacing.space1X.value))
     }
@@ -181,10 +181,12 @@ open class TooltipDialog: View, UIScrollViewDelegate {
             }
             let wrapper = View()
             wrapper.addSubview(contentView)
-            contentView.pinTop()
-            contentView.pinLeading()
-            contentView.pinBottom()
-            contentView.pinTrailingLessThanOrEqualTo()
+            contentView
+                .pinTop()
+                .pinLeading()
+                .pinBottom()
+                .pinTrailingLessThanOrEqualTo()
+            
             contentView.setNeedsLayout()
             contentStackView.addArrangedSubview(wrapper)
             addedContent = true
@@ -232,7 +234,7 @@ open class TooltipDialog: View, UIScrollViewDelegate {
     open override func updateAccessibility() {
         super.updateAccessibility()
         
-        primaryAccessibilityElement.accessibilityHint = "Click on the \(closeButtonText) button to close."
+        primaryAccessibilityElement.accessibilityHint = "Double tap on the \(closeButtonText) button to close."
         
         var elements: [Any] = [primaryAccessibilityElement]
         contentStackView.arrangedSubviews.forEach{ elements.append($0) }