diff --git a/source/NVDAObjects/IAccessible/__init__.py b/source/NVDAObjects/IAccessible/__init__.py
index ebe78723975..295a982d15b 100644
--- a/source/NVDAObjects/IAccessible/__init__.py
+++ b/source/NVDAObjects/IAccessible/__init__.py
@@ -1471,10 +1471,10 @@ def event_alert(self):
 			api.processPendingEvents()
 		if self in api.getFocusAncestors():
 			return
-		speech.speakObject(self, reason=controlTypes.REASON_FOCUS, priority=speech.Spri.NOW)
+		speech.speakObject(self, reason=controlTypes.OutputReason.FOCUS, priority=speech.Spri.NOW)
 		for child in self.recursiveDescendants:
 			if controlTypes.STATE_FOCUSABLE in child.states:
-				speech.speakObject(child, reason=controlTypes.REASON_FOCUS, priority=speech.Spri.NOW)
+				speech.speakObject(child, reason=controlTypes.OutputReason.FOCUS, priority=speech.Spri.NOW)
 
 	def event_caret(self):
 		focus = api.getFocusObject()
@@ -1956,11 +1956,11 @@ class IENotificationBar(Dialog,IAccessible):
 
 	def event_alert(self):
 		speech.cancelSpeech()
-		speech.speakObject(self,reason=controlTypes.REASON_FOCUS)
+		speech.speakObject(self, reason=controlTypes.OutputReason.FOCUS)
 		child=self.simpleFirstChild
 		while child:
 			if child.role!=controlTypes.ROLE_STATICTEXT:
-				speech.speakObject(child,reason=controlTypes.REASON_FOCUS)
+				speech.speakObject(child, reason=controlTypes.OutputReason.FOCUS)
 			child=child.simpleNext
 
 
diff --git a/source/NVDAObjects/IAccessible/ia2Web.py b/source/NVDAObjects/IAccessible/ia2Web.py
index 2f69390c967..d475130c6d0 100644
--- a/source/NVDAObjects/IAccessible/ia2Web.py
+++ b/source/NVDAObjects/IAccessible/ia2Web.py
@@ -87,7 +87,10 @@ def event_IA2AttributeChange(self):
 		if self is api.getFocusObject():
 			# Report aria-current if it changed.
 			speech.speakObjectProperties(
-				self, current=True, reason=controlTypes.REASON_CHANGE)
+				self,
+				current=True,
+				reason=controlTypes.OutputReason.CHANGE
+			)
 		# super calls event_stateChange which updates braille, so no need to
 		# update braille here.
 
diff --git a/source/NVDAObjects/IAccessible/winword.py b/source/NVDAObjects/IAccessible/winword.py
index 57bcce07eb1..acc273a6377 100644
--- a/source/NVDAObjects/IAccessible/winword.py
+++ b/source/NVDAObjects/IAccessible/winword.py
@@ -269,7 +269,7 @@ def script_caret_moveByCell(self,gesture):
 		isCollapsed=info.isCollapsed
 		if inTable:
 			info.expand(textInfos.UNIT_CELL)
-			speech.speakTextInfo(info,reason=controlTypes.REASON_FOCUS)
+			speech.speakTextInfo(info, reason=controlTypes.OutputReason.FOCUS)
 			braille.handler.handleCaretMove(self)
 
 	def script_reportCurrentComment(self,gesture):
@@ -339,7 +339,7 @@ def _moveInTable(self,row=True,forward=True):
 			ui.message(_("Edge of table"))
 			return False
 		newInfo=WordDocumentTextInfo(self,textInfos.POSITION_CARET,_rangeObj=foundCell)
-		speech.speakTextInfo(newInfo,reason=controlTypes.REASON_CARET, unit=textInfos.UNIT_CELL)
+		speech.speakTextInfo(newInfo, reason=controlTypes.OutputReason.CARET, unit=textInfos.UNIT_CELL)
 		newInfo.collapse()
 		newInfo.updateCaret()
 		return True
diff --git a/source/NVDAObjects/UIA/__init__.py b/source/NVDAObjects/UIA/__init__.py
index 37cd11a9599..639d65e80f8 100644
--- a/source/NVDAObjects/UIA/__init__.py
+++ b/source/NVDAObjects/UIA/__init__.py
@@ -1668,7 +1668,7 @@ def event_UIA_systemAlert(self):
 		This just reports the element that received the alert in speech and braille, similar to how focus is presented.
 		Skype for business toast notifications being one example.
 		"""
-		speech.speakObject(self, reason=controlTypes.REASON_FOCUS)
+		speech.speakObject(self, reason=controlTypes.OutputReason.FOCUS)
 		# Ideally, we wouldn't use getPropertiesBraille directly.
 		braille.handler.message(braille.getPropertiesBraille(name=self.name, role=self.role))
 
@@ -1768,7 +1768,7 @@ def event_focusEntered(self):
 	def event_valueChange(self):
 		focusParent=api.getFocusObject().parent
 		if self==focusParent:
-			speech.speakObjectProperties(self,value=True,reason=controlTypes.REASON_CHANGE)
+			speech.speakObjectProperties(self, value=True, reason=controlTypes.OutputReason.CHANGE)
 		else:
 			super(SensitiveSlider,self).event_valueChange()
 
diff --git a/source/NVDAObjects/UIA/edge.py b/source/NVDAObjects/UIA/edge.py
index cbd84185868..beb661d9808 100644
--- a/source/NVDAObjects/UIA/edge.py
+++ b/source/NVDAObjects/UIA/edge.py
@@ -588,7 +588,11 @@ def _iterNodesByType(self,nodeType,direction="next",pos=None):
 
 	def shouldPassThrough(self,obj,reason=None):
 		# Enter focus mode for selectable list items (<select> and role=listbox)
-		if reason==controlTypes.REASON_FOCUS and obj.role==controlTypes.ROLE_LISTITEM and controlTypes.STATE_SELECTABLE in obj.states:
+		if(
+			reason == controlTypes.OutputReason.FOCUS
+			and obj.role == controlTypes.ROLE_LISTITEM
+			and controlTypes.STATE_SELECTABLE in obj.states
+		):
 			return True
 		return super(EdgeHTMLTreeInterceptor,self).shouldPassThrough(obj,reason=reason)
 
diff --git a/source/NVDAObjects/UIA/wordDocument.py b/source/NVDAObjects/UIA/wordDocument.py
index 08bf414210e..b5df742331c 100644
--- a/source/NVDAObjects/UIA/wordDocument.py
+++ b/source/NVDAObjects/UIA/wordDocument.py
@@ -292,7 +292,7 @@ def script_tab(self,gesture):
 			return
 		info=self.makeTextInfo(textInfos.POSITION_SELECTION)
 		if not info.isCollapsed:
-			speech.speakTextInfo(info,reason=controlTypes.REASON_FOCUS)
+			speech.speakTextInfo(info, reason=controlTypes.OutputReason.FOCUS)
 	script_shiftTab=script_tab
 
 	def _iterNodesByType(self,nodeType,direction="next",pos=None):
diff --git a/source/NVDAObjects/__init__.py b/source/NVDAObjects/__init__.py
index 47021689e36..97067b92011 100644
--- a/source/NVDAObjects/__init__.py
+++ b/source/NVDAObjects/__init__.py
@@ -992,7 +992,7 @@ def _get_shouldAcceptShowHideCaretEvent(self):
 	def reportFocus(self):
 		"""Announces this object in a way suitable such that it gained focus.
 		"""
-		speech.speakObject(self,reason=controlTypes.REASON_FOCUS)
+		speech.speakObject(self, reason=controlTypes.OutputReason.FOCUS)
 
 	def _get_placeholder(self):
 		"""If it exists for this object get the value of the placeholder text.
@@ -1109,7 +1109,7 @@ def event_mouseMove(self,x,y):
 
 	def event_stateChange(self):
 		if self is api.getFocusObject():
-			speech.speakObjectProperties(self,states=True, reason=controlTypes.REASON_CHANGE)
+			speech.speakObjectProperties(self, states=True, reason=controlTypes.OutputReason.CHANGE)
 		braille.handler.handleUpdate(self)
 		vision.handler.handleUpdate(self, property="states")
 
@@ -1118,7 +1118,7 @@ def event_focusEntered(self):
 			speech.cancelSpeech()
 			return
 		if self.isPresentableFocusAncestor:
-			speech.speakObject(self,reason=controlTypes.REASON_FOCUSENTERED)
+			speech.speakObject(self, reason=controlTypes.OutputReason.FOCUSENTERED)
 
 	def event_gainFocus(self):
 		"""
@@ -1156,19 +1156,19 @@ def event_becomeNavigatorObject(self, isFocus=False):
 
 	def event_valueChange(self):
 		if self is api.getFocusObject():
-			speech.speakObjectProperties(self, value=True, reason=controlTypes.REASON_CHANGE)
+			speech.speakObjectProperties(self, value=True, reason=controlTypes.OutputReason.CHANGE)
 		braille.handler.handleUpdate(self)
 		vision.handler.handleUpdate(self, property="value")
 
 	def event_nameChange(self):
 		if self is api.getFocusObject():
-			speech.speakObjectProperties(self, name=True, reason=controlTypes.REASON_CHANGE)
+			speech.speakObjectProperties(self, name=True, reason=controlTypes.OutputReason.CHANGE)
 		braille.handler.handleUpdate(self)
 		vision.handler.handleUpdate(self, property="name")
 
 	def event_descriptionChange(self):
 		if self is api.getFocusObject():
-			speech.speakObjectProperties(self, description=True, reason=controlTypes.REASON_CHANGE)
+			speech.speakObjectProperties(self, description=True, reason=controlTypes.OutputReason.CHANGE)
 		braille.handler.handleUpdate(self)
 		vision.handler.handleUpdate(self, property="description")
 
diff --git a/source/NVDAObjects/behaviors.py b/source/NVDAObjects/behaviors.py
index 6713ef9c296..6d94181831b 100755
--- a/source/NVDAObjects/behaviors.py
+++ b/source/NVDAObjects/behaviors.py
@@ -534,7 +534,7 @@ def _moveToColumn(self, obj):
 			# Use the focused copy of the row as the parent for all cells to make comparison faster.
 			obj.parent = self
 		api.setNavigatorObject(obj)
-		speech.speakObject(obj, reason=controlTypes.REASON_FOCUS)
+		speech.speakObject(obj, reason=controlTypes.OutputReason.FOCUS)
 
 	def _moveToColumnNumber(self, column):
 		child = column - 1
@@ -732,7 +732,7 @@ class ToolTip(NVDAObject):
 	def event_show(self):
 		if not config.conf["presentation"]["reportTooltips"]:
 			return
-		speech.speakObject(self, reason=controlTypes.REASON_FOCUS)
+		speech.speakObject(self, reason=controlTypes.OutputReason.FOCUS)
 		# Ideally, we wouldn't use getPropertiesBraille directly.
 		braille.handler.message(braille.getPropertiesBraille(name=self.name, role=self.role))
 
@@ -745,7 +745,7 @@ class Notification(NVDAObject):
 	def event_alert(self):
 		if not config.conf["presentation"]["reportHelpBalloons"]:
 			return
-		speech.speakObject(self, reason=controlTypes.REASON_FOCUS)
+		speech.speakObject(self, reason=controlTypes.OutputReason.FOCUS)
 		# Ideally, we wouldn't use getPropertiesBraille directly.
 		braille.handler.message(braille.getPropertiesBraille(name=self.name, role=self.role))
 
diff --git a/source/NVDAObjects/window/winword.py b/source/NVDAObjects/window/winword.py
index 7b44739f4cf..2d83596adba 100755
--- a/source/NVDAObjects/window/winword.py
+++ b/source/NVDAObjects/window/winword.py
@@ -672,7 +672,7 @@ def activate(self):
 			self.updateCaret()
 			tiCopy = self.copy()
 			tiCopy.expand(textInfos.UNIT_LINE)
-			speech.speakTextInfo(tiCopy,reason=controlTypes.REASON_FOCUS)
+			speech.speakTextInfo(tiCopy, reason=controlTypes.OutputReason.FOCUS)
 			braille.handler.handleCaretMove(self)
 			return
 
@@ -1413,7 +1413,7 @@ def reportTab(self):
 			info.expand(textInfos.UNIT_PARAGRAPH)
 			isCollapsed=info.isCollapsed
 		if not isCollapsed:
-			speech.speakTextInfo(info,reason=controlTypes.REASON_FOCUS)
+			speech.speakTextInfo(info, reason=controlTypes.OutputReason.FOCUS)
 		braille.handler.handleCaretMove(self)
 		if selectionObj and isCollapsed:
 			offset=selectionObj.information(wdHorizontalPositionRelativeToPage)
@@ -1421,7 +1421,7 @@ def reportTab(self):
 			ui.message(msg)
 			if selectionObj.paragraphs[1].range.start==selectionObj.start:
 				info.expand(textInfos.UNIT_LINE)
-				speech.speakTextInfo(info,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET)
+				speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.OutputReason.CARET)
 
 	def getLocalizedMeasurementTextForPointSize(self,offset):
 		options=self.WinwordApplicationObject.options
diff --git a/source/appModules/kindle.py b/source/appModules/kindle.py
index c0b6fa358a4..500125d519e 100644
--- a/source/appModules/kindle.py
+++ b/source/appModules/kindle.py
@@ -59,7 +59,7 @@ def event_pageChange(self, obj, nextHandler):
 			# Don't report anything if the book area isn't focused.
 			return
 		info.expand(textInfos.UNIT_LINE)
-		speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=OutputReason.CARET)
 
 	def isAlive(self):
 		return winUser.isWindow(self.rootNVDAObject.windowHandle)
@@ -100,7 +100,8 @@ def _changePageScriptHelper(self,gesture,previous=False):
 		info=self.makeTextInfo(textInfos.POSITION_FIRST)
 		self.selection=info
 		info.expand(textInfos.UNIT_LINE)
-		if not willSayAllResume(gesture): speech.speakTextInfo(info,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET)
+		if not willSayAllResume(gesture):
+			speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=OutputReason.CARET)
 
 	def script_moveByPage_forward(self,gesture):
 		self._changePageScriptHelper(gesture)
diff --git a/source/appModules/miranda32.py b/source/appModules/miranda32.py
index 54e83fb1950..2cb3b1c1785 100644
--- a/source/appModules/miranda32.py
+++ b/source/appModules/miranda32.py
@@ -166,7 +166,7 @@ def script_changeItem(self,gesture):
 		gesture.send()
 		if not isScriptWaiting():
 			api.processPendingEvents()
-			speech.speakObject(self,reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(self, reason=controlTypes.OutputReason.FOCUS)
 			braille.handler.handleGainFocus(self)
 
 	__changeItemGestures = (
diff --git a/source/appModules/outlook.py b/source/appModules/outlook.py
index 5fc629819c8..6c410b4aaef 100644
--- a/source/appModules/outlook.py
+++ b/source/appModules/outlook.py
@@ -546,7 +546,7 @@ def script_tab(self,gesture):
 			info.expand(textInfos.UNIT_CELL)
 			isCollapsed=False
 		if not isCollapsed:
-			speech.speakTextInfo(info,reason=controlTypes.REASON_FOCUS)
+			speech.speakTextInfo(info, reason=controlTypes.OutputReason.FOCUS)
 		braille.handler.handleCaretMove(self)
 
 	__gestures={
diff --git a/source/appModules/powerpnt.py b/source/appModules/powerpnt.py
index f79b77229b3..d05bc596c8f 100644
--- a/source/appModules/powerpnt.py
+++ b/source/appModules/powerpnt.py
@@ -1085,7 +1085,7 @@ def event_treeInterceptor_gainFocus(self):
 				speech.speakPreselectedText(info.text)
 			else:
 				info.expand(textInfos.UNIT_LINE)
-				speech.speakTextInfo(info, reason=controlTypes.REASON_CARET, unit=textInfos.UNIT_LINE)
+				speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET, unit=textInfos.UNIT_LINE)
 
 	def event_gainFocus(self,obj,nextHandler):
 		pass
diff --git a/source/appModules/winamp.py b/source/appModules/winamp.py
index 3984800fb7c..52e6f907ea8 100644
--- a/source/appModules/winamp.py
+++ b/source/appModules/winamp.py
@@ -127,7 +127,7 @@ def script_changeItem(self,gesture):
 		gesture.send()
 		if not isScriptWaiting():
 			api.processPendingEvents()
-			speech.speakObject(self,reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(self, reason=controlTypes.OutputReason.FOCUS)
 			braille.handler.handleGainFocus(self)
 
 	def event_nameChange(self):
diff --git a/source/braille.py b/source/braille.py
index ec3b5772523..082aea7d9f4 100644
--- a/source/braille.py
+++ b/source/braille.py
@@ -524,7 +524,15 @@ def getPropertiesBraille(**propertyValues) -> str:  # noqa: C901
 		textList.append(value)
 	if states is not None:
 		textList.extend(
-			controlTypes.processAndLabelStates(role, states, controlTypes.REASON_FOCUS, states, None, positiveStateLabels, negativeStateLabels)
+			controlTypes.processAndLabelStates(
+				role,
+				states,
+				controlTypes.OutputReason.FOCUS,
+				states,
+				None,
+				positiveStateLabels,
+				negativeStateLabels
+			)
 		)
 	if roleText:
 		textList.append(roleText)
diff --git a/source/browseMode.py b/source/browseMode.py
index b00b4d1c42b..3956e8d50ff 100644
--- a/source/browseMode.py
+++ b/source/browseMode.py
@@ -45,8 +45,6 @@
 from typing import Optional
 
 
-REASON_QUICKNAV = OutputReason.QUICKNAV
-
 def reportPassThrough(treeInterceptor,onlyIfChanged=True):
 	"""Reports the pass through mode if it has changed.
 	@param treeInterceptor: The current Browse Mode treeInterceptor.
@@ -203,7 +201,7 @@ def report(self,readUnit=None):
 			if info.compareEndPoints(fieldInfo, "endToEnd") > 0:
 				# We've expanded past the end of the field, so limit to the end of the field.
 				info.setEndPoint(fieldInfo, "endToEnd")
-		speech.speakTextInfo(info, reason=controlTypes.REASON_FOCUS)
+		speech.speakTextInfo(info, reason=OutputReason.FOCUS)
 
 	def activate(self):
 		self.textInfo.obj._activatePosition(info=self.textInfo)
@@ -217,7 +215,7 @@ def moveTo(self):
 			reportPassThrough(self.document)
 		info = self.textInfo.copy()
 		info.collapse()
-		self.document._set_selection(info, reason=REASON_QUICKNAV)
+		self.document._set_selection(info, reason=OutputReason.QUICKNAV)
 
 	@property
 	def isAfterSelection(self):
@@ -251,7 +249,7 @@ def _getLabelForProperties(self, labelPropertyGetter):
 			# Translators: Reported label in the elements list for an element which which has no name and value
 			unlabeled = _("Unlabeled")
 			realStates = labelPropertyGetter("states")
-			labeledStates = " ".join(controlTypes.processAndLabelStates(role, realStates, controlTypes.REASON_FOCUS))
+			labeledStates = " ".join(controlTypes.processAndLabelStates(role, realStates, OutputReason.FOCUS))
 			if self.itemType == "formField":
 				if role in (controlTypes.ROLE_BUTTON,controlTypes.ROLE_DROPDOWNBUTTON,controlTypes.ROLE_TOGGLEBUTTON,controlTypes.ROLE_SPLITBUTTON,controlTypes.ROLE_MENUBUTTON,controlTypes.ROLE_DROPDOWNBUTTONGRID,controlTypes.ROLE_SPINBUTTON,controlTypes.ROLE_TREEVIEWBUTTON):
 					# Example output: Mute; toggle button; pressed
@@ -323,17 +321,18 @@ def shouldPassThrough(self, obj, reason: Optional[OutputReason] = None):
 		"""Determine whether pass through mode should be enabled (focus mode) or disabled (browse mode) for a given object.
 		@param obj: The object in question.
 		@type obj: L{NVDAObjects.NVDAObject}
-		@param reason: The reason for this query; one of the output reasons, L{REASON_QUICKNAV}, or C{None} for manual pass through mode activation by the user.
+		@param reason: The reason for this query;
+		one of the output reasons, or C{None} for manual pass through mode activation by the user.
 		@return: C{True} if pass through mode (focus mode) should be enabled, C{False} if it should be disabled (browse mode).
 		"""
 		if reason and (
 			self.disableAutoPassThrough
-			or (reason == controlTypes.REASON_FOCUS and not config.conf["virtualBuffers"]["autoPassThroughOnFocusChange"])
-			or (reason == controlTypes.REASON_CARET and not config.conf["virtualBuffers"]["autoPassThroughOnCaretMove"])
+			or (reason == OutputReason.FOCUS and not config.conf["virtualBuffers"]["autoPassThroughOnFocusChange"])
+			or (reason == OutputReason.CARET and not config.conf["virtualBuffers"]["autoPassThroughOnCaretMove"])
 		):
 			# This check relates to auto pass through and auto pass through is disabled, so don't change the pass through state.
 			return self.passThrough
-		if reason == REASON_QUICKNAV:
+		if reason == OutputReason.QUICKNAV:
 			return False
 		states = obj.states
 		role = obj.role
@@ -351,7 +350,7 @@ def shouldPassThrough(self, obj, reason: Optional[OutputReason] = None):
 		if role in self.ALWAYS_SWITCH_TO_PASS_THROUGH_ROLES or controlTypes.STATE_EDITABLE in states:
 			return True
 		# focus is moving to this control. Perhaps after pressing tab or clicking a button that brings up a menu (via javascript)
-		if reason == controlTypes.REASON_FOCUS:
+		if reason == OutputReason.FOCUS:
 			if role in self.SWITCH_TO_PASS_THROUGH_ON_FOCUS_ROLES:
 				return True
 			# If this is a focus change, pass through should be enabled for certain ancestor containers.
@@ -519,7 +518,7 @@ def _activatePosition(self, obj=None):
 			reportPassThrough(self)
 		elif obj.role == controlTypes.ROLE_EMBEDDEDOBJECT or obj.role in self.APPLICATION_ROLES:
 			obj.setFocus()
-			speech.speakObject(obj, reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(obj, reason=OutputReason.FOCUS)
 		else:
 			self._activateNVDAObject(obj)
 
@@ -547,7 +546,7 @@ def _focusLastFocusableObject(self, activatePosition=False):
 			# this object to change (e.g. checking a check box). However, we won't
 			# actually get the focus event until after the change has occurred.
 			# Therefore, we must cache properties for speech before the change occurs.
-			speech.speakObject(obj, controlTypes.REASON_ONLYCACHE)
+			speech.speakObject(obj, OutputReason.ONLYCACHE)
 			self._objPendingFocusBeforeActivate = obj
 		if activatePosition:
 			# Make sure we activate the object at the caret, which is not necessarily focusable.
@@ -1278,13 +1277,13 @@ def event_treeInterceptor_gainFocus(self):
 
 		if not self.passThrough:
 			if doSayAll:
-				speech.speakObjectProperties(self.rootNVDAObject,name=True,states=True,reason=controlTypes.REASON_FOCUS)
+				speech.speakObjectProperties(self.rootNVDAObject, name=True, states=True, reason=OutputReason.Focus)
 				sayAllHandler.readText(sayAllHandler.CURSOR_CARET)
 			else:
 				# Speak it like we would speak focus on any other document object.
 				# This includes when entering the treeInterceptor for the first time:
 				if not hadFirstGainFocus:
-					speech.speakObject(self.rootNVDAObject, reason=controlTypes.REASON_FOCUS)
+					speech.speakObject(self.rootNVDAObject, reason=OutputReason.FOCUS)
 				else:
 					# And when coming in from an outside object
 					# #4069 But not when coming up from a non-rendered descendant.
@@ -1295,13 +1294,13 @@ def event_treeInterceptor_gainFocus(self):
 					except ValueError:
 						tl=len(ancestors)
 					if fdl<=tl:
-						speech.speakObject(self.rootNVDAObject, reason=controlTypes.REASON_FOCUS)
+						speech.speakObject(self.rootNVDAObject, reason=OutputReason.FOCUS)
 				info = self.selection
 				if not info.isCollapsed:
 					speech.speakPreselectedText(info.text)
 				else:
 					info.expand(textInfos.UNIT_LINE)
-					speech.speakTextInfo(info, reason=controlTypes.REASON_CARET, unit=textInfos.UNIT_LINE)
+					speech.speakTextInfo(info, reason=OutputReason.CARET, unit=textInfos.UNIT_LINE)
 
 		reportPassThrough(self)
 		braille.handler.handleGainFocus(self)
@@ -1325,7 +1324,7 @@ def _activatePosition(self, obj=None, info=None):
 				return
 		super(BrowseModeDocumentTreeInterceptor,self)._activatePosition(obj=obj)
 
-	def _set_selection(self, info, reason=controlTypes.REASON_CARET):
+	def _set_selection(self, info, reason=OutputReason.CARET):
 		super(BrowseModeDocumentTreeInterceptor, self)._set_selection(info)
 		if isScriptWaiting() or not info.isCollapsed:
 			return
@@ -1336,7 +1335,7 @@ def _set_selection(self, info, reason=controlTypes.REASON_CARET):
 		caret.collapse()
 		self._lastCaretPosition = caret.bookmark
 		review.handleCaretMove(caret)
-		if reason == controlTypes.REASON_FOCUS:
+		if reason == OutputReason.FOCUS:
 			self._lastCaretMoveWasFocus = True
 			focusObj = api.getFocusObject()
 			if focusObj==self.rootNVDAObject:
@@ -1471,11 +1470,11 @@ def _tabOverride(self, direction):
 			# This node is already focused, so we need to move to and speak this node here.
 			newCaret = newInfo.copy()
 			newCaret.collapse()
-			self._set_selection(newCaret,reason=controlTypes.REASON_FOCUS)
+			self._set_selection(newCaret, reason=OutputReason.FOCUS)
 			if self.passThrough:
 				obj.event_gainFocus()
 			else:
-				speech.speakTextInfo(newInfo,reason=controlTypes.REASON_FOCUS)
+				speech.speakTextInfo(newInfo, reason=OutputReason.FOCUS)
 		else:
 			# This node doesn't have the focus, so just set focus to it. The gainFocus event will handle the rest.
 			obj.setFocus()
@@ -1560,7 +1559,7 @@ def event_gainFocus(self, obj, nextHandler):
 		except:
 			# This object is not in the treeInterceptor, even though it resides beneath the document.
 			# Automatic pass through should be enabled in certain circumstances where this occurs.
-			if not self.passThrough and self.shouldPassThrough(obj,reason=controlTypes.REASON_FOCUS):
+			if not self.passThrough and self.shouldPassThrough(obj, reason=OutputReason.FOCUS):
 				self.passThrough=True
 				reportPassThrough(self)
 				self._replayFocusEnteredEvents()
@@ -1573,7 +1572,7 @@ def event_gainFocus(self, obj, nextHandler):
 		if not self._hadFirstGainFocus or not focusInfo.isOverlapping(caretInfo):
 			# The virtual caret is not within the focus node.
 			oldPassThrough=self.passThrough
-			passThrough=self.shouldPassThrough(obj,reason=controlTypes.REASON_FOCUS)
+			passThrough = self.shouldPassThrough(obj, reason=OutputReason.FOCUS)
 			if not oldPassThrough and (passThrough or sayAllHandler.isRunning()):
 				# If pass-through is disabled, cancel speech, as a focus change should cause page reading to stop.
 				# This must be done before auto-pass-through occurs, as we want to stop page reading even if pass-through will be automatically enabled by this focus change.
@@ -1581,9 +1580,9 @@ def event_gainFocus(self, obj, nextHandler):
 			self.passThrough=passThrough
 			if not self.passThrough:
 				# We read the info from the browseMode document  instead of the control itself.
-				speech.speakTextInfo(focusInfo,reason=controlTypes.REASON_FOCUS)
+				speech.speakTextInfo(focusInfo, reason=OutputReason.FOCUS)
 				# However, we still want to update the speech property cache so that property changes will be spoken properly.
-				speech.speakObject(obj,controlTypes.REASON_ONLYCACHE)
+				speech.speakObject(obj, controlTypes.OutputReason.ONLYCACHE)
 				# As we do not call nextHandler which would trigger the vision framework to handle gain focus,
 				# we need to call it manually here.
 				vision.handler.handleGainFocus(obj)
@@ -1591,17 +1590,17 @@ def event_gainFocus(self, obj, nextHandler):
 				# Although we are going to speak the object rather than textInfo content, we still need to silently speak the textInfo content so that the textInfo speech cache is updated correctly.
 				# Not doing this would cause  later browseMode speaking to either not speak controlFields it had entered, or speak controlField exits after having already exited.
 				# See #7435 for a discussion on this.
-				speech.speakTextInfo(focusInfo,reason=controlTypes.REASON_ONLYCACHE)
+				speech.speakTextInfo(focusInfo, reason=OutputReason.ONLYCACHE)
 				self._replayFocusEnteredEvents()
 				nextHandler()
 			focusInfo.collapse()
-			self._set_selection(focusInfo,reason=controlTypes.REASON_FOCUS)
+			self._set_selection(focusInfo, reason=OutputReason.FOCUS)
 		else:
 			# The virtual caret was already at the focused node.
 			if not self.passThrough:
 				# This focus change was caused by a virtual caret movement, so don't speak the focused node to avoid double speaking.
 				# However, we still want to update the speech property cache so that property changes will be spoken properly.
-				speech.speakObject(obj,controlTypes.REASON_ONLYCACHE)
+				speech.speakObject(obj, OutputReason.ONLYCACHE)
 				if config.conf["virtualBuffers"]["autoFocusFocusableElements"]:
 					# As we do not call nextHandler which would trigger the vision framework to handle gain focus,
 					# we need to call it manually here.
@@ -1622,7 +1621,8 @@ def event_gainFocus(self, obj, nextHandler):
 					# the properties before the activation/key, so use that to speak any
 					# changes.
 					speech.speakObject(
-						self._objPendingFocusBeforeActivate, controlTypes.REASON_CHANGE
+						self._objPendingFocusBeforeActivate,
+						OutputReason.CHANGE
 					)
 					self._objPendingFocusBeforeActivate = None
 			else:
@@ -1661,7 +1661,7 @@ def _handleScrollTo(self, obj):
 		if not scrollInfo.isOverlapping(caretInfo):
 			if scrollInfo.isCollapsed:
 				scrollInfo.expand(textInfos.UNIT_LINE)
-			speech.speakTextInfo(scrollInfo,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(scrollInfo, reason=OutputReason.CARET)
 			scrollInfo.collapse()
 			self.selection = scrollInfo
 			return True
@@ -1794,10 +1794,10 @@ def script_moveToStartOfContainer(self,gesture):
 			ui.message(_("Not in a container"))
 			return
 		container.collapse()
-		self._set_selection(container, reason=REASON_QUICKNAV)
+		self._set_selection(container, reason=OutputReason.QUICKNAV)
 		if not willSayAllResume(gesture):
 			container.expand(textInfos.UNIT_LINE)
-			speech.speakTextInfo(container, reason=controlTypes.REASON_FOCUS)
+			speech.speakTextInfo(container, reason=OutputReason.FOCUS)
 	script_moveToStartOfContainer.resumeSayAllMode=sayAllHandler.CURSOR_CARET
 	# Translators: Description for the Move to start of container command in browse mode. 
 	script_moveToStartOfContainer.__doc__=_("Moves to the start of the container element, such as a list or table")
@@ -1819,10 +1819,10 @@ def script_movePastEndOfContainer(self,gesture):
 			# Review cursor is at the bottom line of the current navigator object.
 			# Landing at the end of a browse mode document when trying to jump to the end of the current container. 
 			ui.message(_("Bottom"))
-		self._set_selection(container, reason=REASON_QUICKNAV)
+		self._set_selection(container, reason=OutputReason.QUICKNAV)
 		if not willSayAllResume(gesture):
 			container.expand(textInfos.UNIT_LINE)
-			speech.speakTextInfo(container, reason=controlTypes.REASON_FOCUS)
+			speech.speakTextInfo(container, reason=OutputReason.FOCUS)
 	script_movePastEndOfContainer.resumeSayAllMode=sayAllHandler.CURSOR_CARET
 	# Translators: Description for the Move past end of container command in browse mode. 
 	script_movePastEndOfContainer.__doc__=_("Moves past the end  of the container element, such as a list or table")
diff --git a/source/compoundDocuments.py b/source/compoundDocuments.py
index 97a437db056..8087b02c3dd 100644
--- a/source/compoundDocuments.py
+++ b/source/compoundDocuments.py
@@ -449,7 +449,7 @@ def _get_caretObject(self):
 		return eventHandler.lastQueuedFocusObject
 
 	def event_treeInterceptor_gainFocus(self):
-		speech.speakObject(self.rootNVDAObject, reason=controlTypes.REASON_FOCUS)
+		speech.speakObject(self.rootNVDAObject, reason=controlTypes.OutputReason.FOCUS)
 		try:
 			info = self.makeTextInfo(textInfos.POSITION_SELECTION)
 		except RuntimeError:
@@ -457,7 +457,7 @@ def event_treeInterceptor_gainFocus(self):
 		else:
 			if info.isCollapsed:
 				info.expand(textInfos.UNIT_LINE)
-				speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.REASON_CARET)
+				speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.OutputReason.CARET)
 			else:
 				speech.speakPreselectedText(info.text)
 			braille.handler.handleGainFocus(self)
diff --git a/source/controlTypes.py b/source/controlTypes.py
index d74e8b73636..639a0e3d0a3 100644
--- a/source/controlTypes.py
+++ b/source/controlTypes.py
@@ -648,19 +648,6 @@ class OutputReason(Enum):
 
 	QUICKNAV = auto()
 
-# The following constants are kept for backwards compatibility.
-# In future, OutputReason should be used directly
-
-
-REASON_FOCUS = OutputReason.FOCUS
-REASON_FOCUSENTERED = OutputReason.FOCUSENTERED
-REASON_MOUSE = OutputReason.MOUSE
-REASON_QUERY = OutputReason.QUERY
-REASON_CHANGE = OutputReason.CHANGE
-REASON_MESSAGE = OutputReason.MESSAGE
-REASON_SAYALL = OutputReason.SAYALL
-REASON_CARET = OutputReason.CARET
-REASON_ONLYCACHE = OutputReason.ONLYCACHE
 
 #: Text to use for 'current' values. These describe if an item is the current item 
 #: within a particular kind of selection.
@@ -687,8 +674,8 @@ def processPositiveStates(role, states, reason: OutputReason, positiveStates=Non
 	@type role: int
 	@param states: The raw states for an object to process.
 	@type states: set
-	@param reason: The reason to process the states (e.g. C{REASON_FOCUS}.
-	@param positiveStates: Used for C{REASON_CHANGE}, specifies states changed from negative to positive;
+	@param reason: The reason to process the states (e.g. C{OutputReason.FOCUS}.
+	@param positiveStates: Used for C{OutputReason.CHANGE}, specifies states changed from negative to positive;
 	@type positiveStates: set
 	@return: The processed positive states.
 	@rtype: set
@@ -714,14 +701,14 @@ def processPositiveStates(role, states, reason: OutputReason, positiveStates=Non
 		# or reporting clickable just isn't useful,
 		# or the user has explicitly requested no reporting clickable
 		positiveStates.discard(STATE_CLICKABLE)
-	if reason == REASON_QUERY:
+	if reason == OutputReason.QUERY:
 		return positiveStates
 	positiveStates.discard(STATE_DEFUNCT)
 	positiveStates.discard(STATE_MODAL)
 	positiveStates.discard(STATE_FOCUSED)
 	positiveStates.discard(STATE_OFFSCREEN)
 	positiveStates.discard(STATE_INVISIBLE)
-	if reason != REASON_CHANGE:
+	if reason != OutputReason.CHANGE:
 		positiveStates.discard(STATE_LINKED)
 		if role in (
 			ROLE_LISTITEM,
@@ -751,13 +738,13 @@ def processNegativeStates(role, states, reason: OutputReason, negativeStates=Non
 	@type role: int
 	@param states: The raw states for an object to process.
 	@type states: set
-	@param reason: The reason to process the states (e.g. C{REASON_FOCUS}.
-	@param negativeStates: Used for C{REASON_CHANGE}, specifies states changed from positive to negative;
+	@param reason: The reason to process the states (e.g. C{OutputReason.FOCUS}.
+	@param negativeStates: Used for C{OutputReason.CHANGE}, specifies states changed from positive to negative;
 	@type negativeStates: set
 	@return: The processed negative states.
 	@rtype: set
 	"""
-	if reason == REASON_CHANGE and not isinstance(negativeStates, set):
+	if reason == OutputReason.CHANGE and not isinstance(negativeStates, set):
 		raise TypeError("negativeStates must be a set for this reason")
 	speakNegatives = set()
 	# Add the negative selected state if the control is selectable,
@@ -771,7 +758,7 @@ def processNegativeStates(role, states, reason: OutputReason, negativeStates=Non
 		and STATE_FOCUSABLE in states
 		# Only include  if reporting the focus or when states are changing on the focus.
 		# This is to avoid exposing it for things like caret movement in browse mode. 
-		and (reason == REASON_FOCUS or (reason == REASON_CHANGE and STATE_FOCUSED in states))
+		and (reason == OutputReason.FOCUS or (reason == OutputReason.CHANGE and STATE_FOCUSED in states))
 		and role in (
 			ROLE_LISTITEM, 
 			ROLE_TREEVIEWITEM, 
@@ -784,11 +771,15 @@ def processNegativeStates(role, states, reason: OutputReason, negativeStates=Non
 	):
 		speakNegatives.add(STATE_SELECTED)
 	# Restrict "not checked" in a similar way to "not selected".
-	if (role in (ROLE_CHECKBOX, ROLE_RADIOBUTTON, ROLE_CHECKMENUITEM) or STATE_CHECKABLE in states)  and (STATE_HALFCHECKED not in states) and (reason != REASON_CHANGE or STATE_FOCUSED in states):
+	if(
+		(role in (ROLE_CHECKBOX, ROLE_RADIOBUTTON, ROLE_CHECKMENUITEM) or STATE_CHECKABLE in states)
+		and (STATE_HALFCHECKED not in states)
+		and (reason != OutputReason.CHANGE or STATE_FOCUSED in states)
+	):
 		speakNegatives.add(STATE_CHECKED)
 	if role == ROLE_TOGGLEBUTTON:
 		speakNegatives.add(STATE_PRESSED)
-	if reason == REASON_CHANGE:
+	if reason == OutputReason.CHANGE:
 		# We want to speak this state only if it is changing to negative.
 		speakNegatives.add(STATE_DROPTARGET)
 		# We were given states which have changed to negative.
@@ -821,9 +812,9 @@ def processAndLabelStates(
 	"""Processes the states for an object and returns the appropriate state labels for both positive and negative states.
 	@param role: The role of the object to process states for (e.g. C{ROLE_CHECKBOX}.
 	@param states: The raw states for an object to process.
-	@param reason: The reason to process the states (e.g. C{REASON_FOCUS}.
-	@param positiveStates: Used for C{REASON_CHANGE}, specifies states changed from negative to positive;
-	@param negativeStates: Used for C{REASON_CHANGE}, specifies states changed from positive to negative;
+	@param reason: The reason to process the states (e.g. C{OutputReason.FOCUS}.
+	@param positiveStates: Used for C{OutputReason.CHANGE}, specifies states changed from negative to positive;
+	@param negativeStates: Used for C{OutputReason.CHANGE}, specifies states changed from positive to negative;
 	@param positiveStateLabelDict: Dictionary containing state identifiers as keys and associated positive labels as their values.
 	@param negativeStateLabelDict: Dictionary containing state identifiers as keys and associated negative labels as their values.
 	@return: The labels of the relevant positive and negative states.
diff --git a/source/cursorManager.py b/source/cursorManager.py
index 3c2e17aaea1..a297b649de2 100644
--- a/source/cursorManager.py
+++ b/source/cursorManager.py
@@ -158,7 +158,8 @@ def _caretMovementScriptHelper(self,gesture,unit,direction=None,posConstant=text
 		# info if it is offset-based.
 		selection = info.copy()
 		info.expand(unit)
-		if not willSayAllResume(gesture): speech.speakTextInfo(info,unit=unit,reason=controlTypes.REASON_CARET)
+		if not willSayAllResume(gesture):
+			speech.speakTextInfo(info, unit=unit, reason=controlTypes.OutputReason.CARET)
 		if not oldInfo.isCollapsed:
 			speech.speakSelectionChange(oldInfo, selection)
 		self.selection = selection
@@ -173,7 +174,7 @@ def doFindText(self, text, reverse=False, caseSensitive=False, willSayAllResume=
 			speech.cancelSpeech()
 			info.move(textInfos.UNIT_LINE,1,endPoint="end")
 			if not willSayAllResume:
-				speech.speakTextInfo(info, reason=controlTypes.REASON_CARET)
+				speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET)
 		else:
 			wx.CallAfter(gui.messageBox,_('text "%s" not found')%text,_("Find Error"),wx.OK|wx.ICON_ERROR)
 		CursorManager._lastFindText=text
diff --git a/source/documentBase.py b/source/documentBase.py
index 51aee3d3b24..84e949e26e4 100644
--- a/source/documentBase.py
+++ b/source/documentBase.py
@@ -162,7 +162,7 @@ def _tableMovementScriptHelper(self, movement="next", axis=None):
 			# Retrieve the cell on which we started.
 			info = self._getTableCellAt(tableID, self.selection,origRow, origCol)
 
-		speech.speakTextInfo(info,formatConfig=formatConfig,reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, formatConfig=formatConfig, reason=controlTypes.OutputReason.CARET)
 		info.collapse()
 		self.selection = info
 
diff --git a/source/editableText.py b/source/editableText.py
index bcc8c9b5a7b..b425f8117c0 100755
--- a/source/editableText.py
+++ b/source/editableText.py
@@ -146,7 +146,7 @@ def _caretScriptPostMovedHelper(self, speakUnit, gesture, info=None):
 		review.handleCaretMove(info)
 		if speakUnit and not willSayAllResume(gesture):
 			info.expand(speakUnit)
-			speech.speakTextInfo(info, unit=speakUnit, reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(info, unit=speakUnit, reason=controlTypes.OutputReason.CARET)
 		braille.handler.handleCaretMove(self)
 
 	def _caretMovementScriptHelper(self, gesture, unit):
@@ -200,7 +200,13 @@ def script_caret_newLine(self,gesture):
 			onlyInitial=True
 		else:
 			onlyInitial=False
-		speech.speakTextInfo(lineInfo,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET,onlyInitialFields=onlyInitial,suppressBlanks=True)
+		speech.speakTextInfo(
+			lineInfo,
+			unit=textInfos.UNIT_LINE,
+			reason=controlTypes.OutputReason.CARET,
+			onlyInitialFields=onlyInitial,
+			suppressBlanks=True
+		)
 
 	def _caretMoveBySentenceHelper(self, gesture, direction):
 		if isScriptWaiting():
diff --git a/source/eventHandler.py b/source/eventHandler.py
index 1d722135dd4..f456944c985 100755
--- a/source/eventHandler.py
+++ b/source/eventHandler.py
@@ -213,7 +213,7 @@ def _getFocusLossCancellableSpeechCommand(
 		obj,
 		reason: controlTypes.OutputReason
 ) -> Optional[_CancellableSpeechCommand]:
-	if reason != controlTypes.REASON_FOCUS or not speech.manager._shouldCancelExpiredFocusEvents():
+	if reason != controlTypes.OutputReason.FOCUS or not speech.manager._shouldCancelExpiredFocusEvents():
 		return None
 	from NVDAObjects import NVDAObject
 	if not isinstance(obj, NVDAObject):
diff --git a/source/globalCommands.py b/source/globalCommands.py
index 10aaf7d11e5..5b7ccf10454 100644
--- a/source/globalCommands.py
+++ b/source/globalCommands.py
@@ -179,7 +179,7 @@ def script_reportCurrentLine(self,gesture):
 		info.expand(textInfos.UNIT_LINE)
 		scriptCount=scriptHandler.getLastScriptRepeatCount()
 		if scriptCount==0:
-			speech.speakTextInfo(info,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.OutputReason.CARET)
 		else:
 			speech.spellTextInfo(info,useCharacterDescriptions=scriptCount>1)
 
@@ -1041,7 +1041,7 @@ def script_navigatorObject_current(self,gesture):
 				else:
 					api.copyToClip(text, notify=True)
 		else:
-			speech.speakObject(curObject,reason=controlTypes.REASON_QUERY)
+			speech.speakObject(curObject, reason=controlTypes.OutputReason.QUERY)
 
 	@script(
 		description=_(
@@ -1111,7 +1111,7 @@ def script_navigatorObject_moveFocus(self,gesture):
 				return
 			info=review.copy()
 			info.expand(textInfos.UNIT_LINE)
-			speech.speakTextInfo(info,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		# Translators: Input help mode message for move to parent object command.
@@ -1130,7 +1130,7 @@ def script_navigatorObject_parent(self,gesture):
 		curObject=curObject.simpleParent if simpleReviewMode else curObject.parent
 		if curObject is not None:
 			api.setNavigatorObject(curObject)
-			speech.speakObject(curObject,reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(curObject, reason=controlTypes.OutputReason.FOCUS)
 		else:
 			# Translators: Reported when there is no containing (parent) object such as when focused on desktop.
 			ui.reviewMessage(_("No containing object"))
@@ -1152,7 +1152,7 @@ def script_navigatorObject_next(self,gesture):
 		curObject=curObject.simpleNext if simpleReviewMode else curObject.next
 		if curObject is not None:
 			api.setNavigatorObject(curObject)
-			speech.speakObject(curObject,reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(curObject, reason=controlTypes.OutputReason.FOCUS)
 		else:
 			# Translators: Reported when there is no next object (current object is the last object).
 			ui.reviewMessage(_("No next"))
@@ -1174,7 +1174,7 @@ def script_navigatorObject_previous(self,gesture):
 		curObject=curObject.simplePrevious if simpleReviewMode else curObject.previous
 		if curObject is not None:
 			api.setNavigatorObject(curObject)
-			speech.speakObject(curObject,reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(curObject, reason=controlTypes.OutputReason.FOCUS)
 		else:
 			# Translators: Reported when there is no previous object (current object is the first object).
 			ui.reviewMessage(_("No previous"))
@@ -1196,7 +1196,7 @@ def script_navigatorObject_firstChild(self,gesture):
 		curObject=curObject.simpleFirstChild if simpleReviewMode else curObject.firstChild
 		if curObject is not None:
 			api.setNavigatorObject(curObject)
-			speech.speakObject(curObject,reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(curObject, reason=controlTypes.OutputReason.FOCUS)
 		else:
 			# Translators: Reported when there is no contained (first child) object such as inside a document.
 			ui.reviewMessage(_("No objects inside"))
@@ -1251,7 +1251,7 @@ def script_review_top(self,gesture):
 		info=api.getReviewPosition().obj.makeTextInfo(textInfos.POSITION_FIRST)
 		api.setReviewPosition(info)
 		info.expand(textInfos.UNIT_LINE)
-		speech.speakTextInfo(info,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		# Translators: Input help mode message for move review cursor to previous line command.
@@ -1271,7 +1271,7 @@ def script_review_previousLine(self,gesture):
 		else:
 			api.setReviewPosition(info)
 		info.expand(textInfos.UNIT_LINE)
-		speech.speakTextInfo(info,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		description=_(
@@ -1290,7 +1290,7 @@ def script_review_currentLine(self,gesture):
 		braille.handler.setTether(braille.handler.TETHER_REVIEW, auto=True)
 		scriptCount=scriptHandler.getLastScriptRepeatCount()
 		if scriptCount==0:
-			speech.speakTextInfo(info,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.OutputReason.CARET)
 		else:
 			speech.spellTextInfo(info,useCharacterDescriptions=scriptCount>1)
 
@@ -1312,7 +1312,7 @@ def script_review_nextLine(self,gesture):
 		else:
 			api.setReviewPosition(info)
 		info.expand(textInfos.UNIT_LINE)
-		speech.speakTextInfo(info,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		# Translators: Input help mode message for move review cursor to bottom line command.
@@ -1324,7 +1324,7 @@ def script_review_bottom(self,gesture):
 		info=api.getReviewPosition().obj.makeTextInfo(textInfos.POSITION_LAST)
 		api.setReviewPosition(info)
 		info.expand(textInfos.UNIT_LINE)
-		speech.speakTextInfo(info,unit=textInfos.UNIT_LINE,reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, unit=textInfos.UNIT_LINE, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		# Translators: Input help mode message for move review cursor to previous word command.
@@ -1343,7 +1343,7 @@ def script_review_previousWord(self,gesture):
 		else:
 			api.setReviewPosition(info)
 		info.expand(textInfos.UNIT_WORD)
-		speech.speakTextInfo(info,reason=controlTypes.REASON_CARET,unit=textInfos.UNIT_WORD)
+		speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET, unit=textInfos.UNIT_WORD)
 
 	@script(
 		description=_(
@@ -1362,7 +1362,7 @@ def script_review_currentWord(self,gesture):
 		braille.handler.setTether(braille.handler.TETHER_REVIEW, auto=True)
 		scriptCount=scriptHandler.getLastScriptRepeatCount()
 		if scriptCount==0:
-			speech.speakTextInfo(info,reason=controlTypes.REASON_CARET,unit=textInfos.UNIT_WORD)
+			speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET, unit=textInfos.UNIT_WORD)
 		else:
 			speech.spellTextInfo(info,useCharacterDescriptions=scriptCount>1)
 
@@ -1383,7 +1383,7 @@ def script_review_nextWord(self,gesture):
 		else:
 			api.setReviewPosition(info)
 		info.expand(textInfos.UNIT_WORD)
-		speech.speakTextInfo(info,reason=controlTypes.REASON_CARET,unit=textInfos.UNIT_WORD)
+		speech.speakTextInfo(info, reason=controlTypes.OutputReason.CARET, unit=textInfos.UNIT_WORD)
 
 	@script(
 		description=_(
@@ -1400,7 +1400,7 @@ def script_review_startOfLine(self,gesture):
 		info.collapse()
 		api.setReviewPosition(info)
 		info.expand(textInfos.UNIT_CHARACTER)
-		speech.speakTextInfo(info,unit=textInfos.UNIT_CHARACTER,reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		description=_(
@@ -1422,11 +1422,11 @@ def script_review_previousCharacter(self,gesture):
 			ui.reviewMessage(_("Left"))
 			reviewInfo=api.getReviewPosition().copy()
 			reviewInfo.expand(textInfos.UNIT_CHARACTER)
-			speech.speakTextInfo(reviewInfo,unit=textInfos.UNIT_CHARACTER,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(reviewInfo, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 		else:
 			api.setReviewPosition(charInfo)
 			charInfo.expand(textInfos.UNIT_CHARACTER)
-			speech.speakTextInfo(charInfo,unit=textInfos.UNIT_CHARACTER,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(charInfo, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		description=_(
@@ -1445,7 +1445,7 @@ def script_review_currentCharacter(self,gesture):
 		braille.handler.setTether(braille.handler.TETHER_REVIEW, auto=True)
 		scriptCount=scriptHandler.getLastScriptRepeatCount()
 		if scriptCount==0:
-			speech.speakTextInfo(info,unit=textInfos.UNIT_CHARACTER,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(info, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 		elif scriptCount==1:
 			speech.spellTextInfo(info,useCharacterDescriptions=True)
 		else:
@@ -1458,7 +1458,7 @@ def script_review_currentCharacter(self,gesture):
 				speech.speakSpelling(hex(c))
 			else:
 				log.debugWarning("Couldn't calculate ordinal for character %r" % info.text)
-				speech.speakTextInfo(info,unit=textInfos.UNIT_CHARACTER,reason=controlTypes.REASON_CARET)
+				speech.speakTextInfo(info, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		description=_(
@@ -1480,11 +1480,11 @@ def script_review_nextCharacter(self,gesture):
 			ui.reviewMessage(_("Right"))
 			reviewInfo=api.getReviewPosition().copy()
 			reviewInfo.expand(textInfos.UNIT_CHARACTER)
-			speech.speakTextInfo(reviewInfo,unit=textInfos.UNIT_CHARACTER,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(reviewInfo, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 		else:
 			api.setReviewPosition(charInfo)
 			charInfo.expand(textInfos.UNIT_CHARACTER)
-			speech.speakTextInfo(charInfo,unit=textInfos.UNIT_CHARACTER,reason=controlTypes.REASON_CARET)
+			speech.speakTextInfo(charInfo, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		description=_(
@@ -1502,7 +1502,7 @@ def script_review_endOfLine(self,gesture):
 		info.move(textInfos.UNIT_CHARACTER,-1)
 		api.setReviewPosition(info)
 		info.expand(textInfos.UNIT_CHARACTER)
-		speech.speakTextInfo(info,unit=textInfos.UNIT_CHARACTER,reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(info, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 
 	def _getCurrentLanguageForTextInfo(self, info):
 		curLanguage = None
@@ -1860,7 +1860,7 @@ def script_reportCurrentFocus(self,gesture):
 		focusObject=api.getFocusObject()
 		if isinstance(focusObject,NVDAObject):
 			if scriptHandler.getLastScriptRepeatCount()==0:
-				speech.speakObject(focusObject, reason=controlTypes.REASON_QUERY)
+				speech.speakObject(focusObject, reason=controlTypes.OutputReason.QUERY)
 			else:
 				speech.speakSpelling(focusObject.name)
 		else:
@@ -2632,7 +2632,7 @@ def script_review_moveToStartMarkedForCopy(self, gesture):
 		api.setReviewPosition(startMarker)
 		startMarker.collapse()
 		startMarker.expand(textInfos.UNIT_CHARACTER)
-		speech.speakTextInfo(startMarker, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.REASON_CARET)
+		speech.speakTextInfo(startMarker, unit=textInfos.UNIT_CHARACTER, reason=controlTypes.OutputReason.CARET)
 
 	@script(
 		description=_(
@@ -2905,7 +2905,7 @@ def script_navigatorObject_nextInFlow(self,gesture):
 				newObject=parent.simpleNext
 		if newObject:
 			api.setNavigatorObject(newObject)
-			speech.speakObject(newObject,reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(newObject, reason=controlTypes.OutputReason.FOCUS)
 		else:
 			# Translators: a message when there is no next object when navigating
 			ui.reviewMessage(_("No next"))
@@ -2926,7 +2926,7 @@ def script_navigatorObject_previousInFlow(self,gesture):
 			newObject=curObject.simpleParent
 		if newObject:
 			api.setNavigatorObject(newObject)
-			speech.speakObject(newObject,reason=controlTypes.REASON_FOCUS)
+			speech.speakObject(newObject, reason=controlTypes.OutputReason.FOCUS)
 		else:
 			# Translators: a message when there is no previous object when navigating
 			ui.reviewMessage(_("No previous"))
@@ -3176,11 +3176,11 @@ def script_toggleScreenCurtain(self, gesture):
 			speech.cancelSpeech()
 			speech.speakObject(
 				api.getForegroundObject(),
-				reason=controlTypes.REASON_FOCUS
+				reason=controlTypes.OutputReason.FOCUS
 			)
 			speech.speakObject(
 				api.getFocusObject(),
-				reason=controlTypes.REASON_FOCUS
+				reason=controlTypes.OutputReason.FOCUS
 			)
 			return
 
diff --git a/source/inputCore.py b/source/inputCore.py
index e35d44db062..948b00d5bba 100644
--- a/source/inputCore.py
+++ b/source/inputCore.py
@@ -550,7 +550,11 @@ def _handleInputHelp(self, gesture, onlyLog=False):
 		import braille
 		braille.handler.message("\t\t".join(textList))
 		# Punctuation must be spoken for the gesture name (the first chunk) so that punctuation keys are spoken.
-		speech.speakText(textList[0], reason=controlTypes.REASON_MESSAGE, symbolLevel=characterProcessing.SYMLVL_ALL)
+		speech.speakText(
+			textList[0],
+			reason=controlTypes.OutputReason.MESSAGE,
+			symbolLevel=characterProcessing.SYMLVL_ALL
+		)
 		for text in textList[1:]:
 			speech.speakMessage(text)
 
diff --git a/source/sayAllHandler.py b/source/sayAllHandler.py
index bf9784d9e81..ddda6c2e233 100644
--- a/source/sayAllHandler.py
+++ b/source/sayAllHandler.py
@@ -70,7 +70,7 @@ def next(self):
 			return
 		# Call this method again when we start speaking this object.
 		callbackCommand = speech.CallbackCommand(self.next, name="say-all:next")
-		speech.speakObject(obj, reason=controlTypes.REASON_SAYALL, _prefixSpeechCommand=callbackCommand)
+		speech.speakObject(obj, reason=controlTypes.OutputReason.SAYALL, _prefixSpeechCommand=callbackCommand)
 
 	def stop(self):
 		self.walker = None
@@ -175,7 +175,7 @@ def _onLineReached(obj=self.reader.obj, state=state):
 		speechGen = speech.getTextInfoSpeech(
 			self.reader,
 			unit=textInfos.UNIT_READINGCHUNK,
-			reason=controlTypes.REASON_SAYALL,
+			reason=controlTypes.OutputReason.SAYALL,
 			useCache=state
 		)
 		seq = list(speech._flattenNestedSequences(speechGen))
diff --git a/source/screenExplorer.py b/source/screenExplorer.py
index 53e3b81319b..d62d15bfbcc 100644
--- a/source/screenExplorer.py
+++ b/source/screenExplorer.py
@@ -58,4 +58,4 @@ def moveTo(self,x,y,new=False,unit=textInfos.UNIT_LINE):
 				self._pos=pos
 				if not speechCanceled:
 					speech.cancelSpeech()
-				speech.speakTextInfo(pos,reason=controlTypes.REASON_CARET)
+				speech.speakTextInfo(pos, reason=controlTypes.OutputReason.CARET)
diff --git a/source/speech/__init__.py b/source/speech/__init__.py
index b8348cad53c..2aa25601263 100755
--- a/source/speech/__init__.py
+++ b/source/speech/__init__.py
@@ -326,7 +326,7 @@ def getCharDescListFromText(text,locale):
 
 def speakObjectProperties(  # noqa: C901
 		obj,
-		reason: OutputReason = controlTypes.REASON_QUERY,
+		reason: OutputReason = OutputReason.QUERY,
 		_prefixSpeechCommand: Optional[SpeechCommand] = None,
 		priority: Optional[Spri] = None,
 		**allowedProperties
@@ -346,7 +346,7 @@ def speakObjectProperties(  # noqa: C901
 # and move logic out into smaller helper functions.
 def getObjectPropertiesSpeech(  # noqa: C901
 		obj,
-		reason: OutputReason = controlTypes.REASON_QUERY,
+		reason: OutputReason = OutputReason.QUERY,
 		_prefixSpeechCommand: Optional[SpeechCommand] = None,
 		**allowedProperties
 ) -> SpeechSequence:
@@ -395,10 +395,10 @@ def getObjectPropertiesSpeech(  # noqa: C901
 	cachedPropertyValues.update(newPropertyValues)
 	obj._speakObjectPropertiesCache=cachedPropertyValues
 	#If we should only cache we can stop here
-	if reason==controlTypes.REASON_ONLYCACHE:
+	if reason == OutputReason.ONLYCACHE:
 		return []
 	#If only speaking change, then filter out all values that havn't changed
-	if reason==controlTypes.REASON_CHANGE:
+	if reason == OutputReason.CHANGE:
 		for name in set(newPropertyValues)&set(oldCachedPropertyValues):
 			if newPropertyValues[name]==oldCachedPropertyValues[name]:
 				del newPropertyValues[name]
@@ -423,7 +423,7 @@ def getObjectPropertiesSpeech(  # noqa: C901
 	# This is because that one item will be the focused object, and saying selected is redundant.
 	# Rather, 'unselected' will be spoken for an unselected object if 1 or more items are selected. 
 	states=newPropertyValues.get('states')
-	if states is not None and reason==controlTypes.REASON_FOCUS:
+	if states is not None and reason == OutputReason.FOCUS:
 		if (
 			controlTypes.STATE_SELECTABLE in states 
 			and controlTypes.STATE_FOCUSABLE in states
@@ -468,7 +468,7 @@ def _getPlaceholderSpeechIfTextEmpty(
 
 def speakObject(
 		obj,
-		reason: OutputReason = controlTypes.REASON_QUERY,
+		reason: OutputReason = OutputReason.QUERY,
 		_prefixSpeechCommand: Optional[SpeechCommand] = None,
 		priority: Optional[Spri] = None
 ):
@@ -488,7 +488,7 @@ def speakObject(
 # and move logic out into smaller helper functions.
 def getObjectSpeech(  # noqa: C901
 		obj,
-		reason: OutputReason = controlTypes.REASON_QUERY,
+		reason: OutputReason = OutputReason.QUERY,
 		_prefixSpeechCommand: Optional[SpeechCommand] = None,
 ):
 	from NVDAObjects import NVDAObjectTextInfo
@@ -497,18 +497,23 @@ def getObjectSpeech(  # noqa: C901
 	import browseMode
 	shouldReportTextContent=not (
 		# focusEntered should never present text content
-		(reason==controlTypes.REASON_FOCUSENTERED) or
-		# The rootNVDAObject of a browseMode document in browse mode (not passThrough) should never present text content
-		(isinstance(obj.treeInterceptor,browseMode.BrowseModeDocumentTreeInterceptor) and not obj.treeInterceptor.passThrough and obj==obj.treeInterceptor.rootNVDAObject) or
+		(reason == OutputReason.FOCUSENTERED)
+		# The rootNVDAObject of a browseMode document in browse mode (not passThrough)
+		# should never present text content
+		or (
+			isinstance(obj.treeInterceptor, browseMode.BrowseModeDocumentTreeInterceptor)
+			and not obj.treeInterceptor.passThrough
+			and obj == obj.treeInterceptor.rootNVDAObject
+		)
 		# objects that do not report as having navigableText should not report their text content either
-		not obj._hasNavigableText
+		or not obj._hasNavigableText
 	)
 
 	allowProperties = _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent)
 
-	if reason == controlTypes.REASON_FOCUSENTERED:
+	if reason == OutputReason.FOCUSENTERED:
 		# Aside from excluding some properties, focus entered should be spoken like focus.
-		reason = controlTypes.REASON_FOCUS
+		reason = OutputReason.FOCUS
 
 	sequence = getObjectPropertiesSpeech(
 		obj,
@@ -516,7 +521,7 @@ def getObjectSpeech(  # noqa: C901
 		_prefixSpeechCommand=_prefixSpeechCommand,
 		**allowProperties
 	)
-	if reason == controlTypes.REASON_ONLYCACHE:
+	if reason == OutputReason.ONLYCACHE:
 		return sequence
 	if shouldReportTextContent:
 		try:
@@ -531,7 +536,7 @@ def getObjectSpeech(  # noqa: C901
 				speechGen = getTextInfoSpeech(
 					info,
 					unit=textInfos.UNIT_LINE,
-					reason=controlTypes.REASON_CARET
+					reason=OutputReason.CARET
 				)
 				sequence.extend(_flattenNestedSequences(speechGen))
 		except:  # noqa E722 legacy bare except. Unknown what exceptions may be raised.
@@ -543,7 +548,7 @@ def getObjectSpeech(  # noqa: C901
 				speechGen = getTextInfoSpeech(
 					newInfo,
 					unit=textInfos.UNIT_PARAGRAPH,
-					reason=controlTypes.REASON_CARET,
+					reason=OutputReason.CARET,
 				)
 				sequence.extend(_flattenNestedSequences(speechGen))
 	elif role == controlTypes.ROLE_MATH:
@@ -583,7 +588,7 @@ def _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent):
 		"columnSpan": True,
 		"current": True
 	}
-	if reason == controlTypes.REASON_FOCUSENTERED:
+	if reason == OutputReason.FOCUSENTERED:
 		allowProperties["value"] = False
 		allowProperties["keyboardShortcut"] = False
 		allowProperties["positionInfo_level"] = False
@@ -595,7 +600,7 @@ def _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent):
 		allowProperties["positionInfo_level"] = False
 		allowProperties["positionInfo_indexInGroup"] = False
 		allowProperties["positionInfo_similarItemsInGroup"] = False
-	if reason != controlTypes.REASON_QUERY:
+	if reason != OutputReason.QUERY:
 		allowProperties["rowCount"] = False
 		allowProperties["columnCount"] = False
 	formatConf = config.conf["documentFormatting"]
@@ -625,7 +630,7 @@ def _objectSpeech_calculateAllowedProps(reason, shouldReportTextContent):
 
 def speakText(
 		text: str,
-		reason: OutputReason = controlTypes.REASON_MESSAGE,
+		reason: OutputReason = OutputReason.MESSAGE,
 		symbolLevel: Optional[int] = None,
 		priority: Optional[Spri] = None
 ):
@@ -1058,7 +1063,7 @@ def speakTextInfo(
 		useCache: Union[bool, SpeakTextInfoState] = True,
 		formatConfig: Dict[str, bool] = None,
 		unit: Optional[str] = None,
-		reason: OutputReason = controlTypes.REASON_QUERY,
+		reason: OutputReason = OutputReason.QUERY,
 		_prefixSpeechCommand: Optional[SpeechCommand] = None,
 		onlyInitialFields: bool = False,
 		suppressBlanks: bool = False,
@@ -1075,7 +1080,7 @@ def speakTextInfo(
 		suppressBlanks
 	)
 
-	if reason == controlTypes.REASON_SAYALL:
+	if reason == OutputReason.SAYALL:
 		log.error(
 			"Deprecation warning: In 2021.1 speakTextInfo will no longer  send speech through "
 			"speakWithoutPauses if reason is sayAll, as sayAllhandler does this manually now."
@@ -1097,12 +1102,12 @@ def getTextInfoSpeech(  # noqa: C901
 		useCache: Union[bool, SpeakTextInfoState] = True,
 		formatConfig: Dict[str, bool] = None,
 		unit: Optional[str] = None,
-		reason: OutputReason = controlTypes.REASON_QUERY,
+		reason: OutputReason = OutputReason.QUERY,
 		_prefixSpeechCommand: Optional[SpeechCommand] = None,
 		onlyInitialFields: bool = False,
 		suppressBlanks: bool = False
 ) -> Generator[SpeechSequence, None, bool]:
-	onlyCache=reason==controlTypes.REASON_ONLYCACHE
+	onlyCache = reason == OutputReason.ONLYCACHE
 	if isinstance(useCache,SpeakTextInfoState):
 		speakTextInfoState=useCache
 	elif useCache:
@@ -1118,7 +1123,7 @@ def getTextInfoSpeech(  # noqa: C901
 		formatConfig['extraDetail']=True
 	reportIndentation=unit==textInfos.UNIT_LINE and ( formatConfig["reportLineIndentation"] or formatConfig["reportLineIndentationWithTones"])
 	# For performance reasons, when navigating by paragraph or table cell, spelling errors will not be announced.
-	if unit in (textInfos.UNIT_PARAGRAPH,textInfos.UNIT_CELL) and reason is controlTypes.REASON_CARET:
+	if unit in (textInfos.UNIT_PARAGRAPH, textInfos.UNIT_CELL) and reason == OutputReason.CARET:
 		formatConfig['reportSpellingErrors']=False
 
 	#Fetch the last controlFieldStack, or make a blank one
@@ -1182,7 +1187,7 @@ def getTextInfoSpeech(  # noqa: C901
 	speechSequence: SpeechSequence = []
 	# #2591: Only if the reason is not focus, Speak the exit of any controlFields not in the new stack.
 	# We don't do this for focus because hearing "out of list", etc. isn't useful when tabbing or using quick navigation and makes navigation less efficient.
-	if reason!=controlTypes.REASON_FOCUS:
+	if reason != OutputReason.FOCUS:
 		endingBlock=False
 		for count in reversed(range(commonFieldCount,len(controlFieldStackCache))):
 			fieldSequence = info.getControlFieldSpeech(
@@ -1195,7 +1200,7 @@ def getTextInfoSpeech(  # noqa: C901
 			)
 			if fieldSequence:
 				speechSequence.extend(fieldSequence)
-			if not endingBlock and reason==controlTypes.REASON_SAYALL:
+			if not endingBlock and reason == OutputReason.SAYALL:
 				endingBlock=bool(int(controlFieldStackCache[count].get('isBlock',0)))
 		if endingBlock:
 			speechSequence.append(EndUtteranceCommand())
@@ -1440,7 +1445,7 @@ def isControlEndFieldCommand(x):
 
 	# If there is nothing that should cause the TextInfo to be considered
 	# non-blank, blank should be reported, unless we are doing a say all.
-	if not suppressBlanks and reason != controlTypes.REASON_SAYALL and shouldConsiderTextInfoBlank:
+	if not suppressBlanks and reason != OutputReason.SAYALL and shouldConsiderTextInfoBlank:
 		# Translators: This is spoken when the line is considered blank.
 		speechSequence.append(_("blank"))
 
@@ -1451,7 +1456,7 @@ def isControlEndFieldCommand(x):
 		if not isinstance(useCache,SpeakTextInfoState):
 			speakTextInfoState.updateObj()
 
-	if reason == controlTypes.REASON_ONLYCACHE or not speechSequence:
+	if reason == OutputReason.ONLYCACHE or not speechSequence:
 		return False
 
 	yield speechSequence
@@ -1462,7 +1467,7 @@ def isControlEndFieldCommand(x):
 # Note: when working on getPropertiesSpeech, look for opportunities to simplify
 # and move logic out into smaller helper functions.
 def getPropertiesSpeech(  # noqa: C901
-		reason: OutputReason = controlTypes.REASON_QUERY,
+		reason: OutputReason = OutputReason.QUERY,
 		**propertyValues
 ) -> SpeechSequence:
 	global oldTreeLevel, oldTableID, oldRowNumber, oldRowSpan, oldColumnNumber, oldColumnSpan
@@ -1493,9 +1498,9 @@ def getPropertiesSpeech(  # noqa: C901
 		and (
 			roleText
 			or reason not in (
-				controlTypes.REASON_SAYALL,
-				controlTypes.REASON_CARET,
-				controlTypes.REASON_FOCUS
+				OutputReason.SAYALL,
+				OutputReason.CARET,
+				OutputReason.FOCUS
 			)
 			or not (
 				name
@@ -1509,8 +1514,8 @@ def getPropertiesSpeech(  # noqa: C901
 		and (
 			role != controlTypes.ROLE_MATH
 			or reason not in (
-				controlTypes.REASON_CARET,
-				controlTypes.REASON_SAYALL
+				OutputReason.CARET,
+				OutputReason.SAYALL
 			)
 	)):
 		textList.append(roleText if roleText else controlTypes.roleLabels[role])
@@ -1669,7 +1674,7 @@ def getControlFieldSpeech(  # noqa: C901
 	childControlCount=int(attrs.get('_childcontrolcount',"0"))
 	role = attrs.get('role', controlTypes.ROLE_UNKNOWN)
 	if (
-		reason == controlTypes.REASON_FOCUS
+		reason == OutputReason.FOCUS
 		or attrs.get('alwaysReportName', False)
 	):
 		name = attrs.get('name', "")
@@ -1680,7 +1685,7 @@ def getControlFieldSpeech(  # noqa: C901
 	ariaCurrent=attrs.get('current', None)
 	placeholderValue=attrs.get('placeholder', None)
 	value=attrs.get('value',"")
-	if reason==controlTypes.REASON_FOCUS or attrs.get('alwaysReportDescription',False):
+	if reason == OutputReason.FOCUS or attrs.get('alwaysReportDescription', False):
 		description=attrs.get('description',"")
 	else:
 		description=""
@@ -1741,7 +1746,7 @@ def getControlFieldSpeech(  # noqa: C901
 	# Determine the order of speech.
 	# speakContentFirst: Speak the content before the control field info.
 	speakContentFirst = (
-		reason == controlTypes.REASON_FOCUS
+		reason == OutputReason.FOCUS
 		and presCat != attrs.PRESCAT_CONTAINER
 		and role not in (
 			controlTypes.ROLE_EDITABLETEXT,
@@ -1791,7 +1796,7 @@ def getControlFieldSpeech(  # noqa: C901
 		return tableSeq
 	elif (
 		nameSequence
-		and reason == controlTypes.REASON_FOCUS
+		and reason == OutputReason.FOCUS
 		and fieldType == "start_addedToControlFieldStack"
 		and role in (controlTypes.ROLE_GROUPING, controlTypes.ROLE_PROPERTYPAGE)
 	):
@@ -2016,7 +2021,14 @@ def getFormatFieldSpeech(  # noqa: C901
 		oldHeadingLevel=attrsCache.get("heading-level") if attrsCache is not None else None
 		# headings should be spoken not only if they change, but also when beginning to speak lines or paragraphs
 		# Ensuring a similar experience to if a heading was a controlField
-		if headingLevel and (initialFormat and (reason==controlTypes.REASON_FOCUS or unit in (textInfos.UNIT_LINE,textInfos.UNIT_PARAGRAPH)) or headingLevel!=oldHeadingLevel):
+		if(
+			headingLevel
+			and (
+				initialFormat
+				and (reason == OutputReason.FOCUS or unit in (textInfos.UNIT_LINE, textInfos.UNIT_PARAGRAPH))
+			)
+			or headingLevel != oldHeadingLevel
+		):
 			# Translators: Speaks the heading level (example output: heading level 2).
 			text=_("heading level %d")%headingLevel
 			textList.append(text)
diff --git a/source/textInfos/__init__.py b/source/textInfos/__init__.py
index 7fc875cd6ba..7bedfa93823 100755
--- a/source/textInfos/__init__.py
+++ b/source/textInfos/__init__.py
@@ -51,7 +51,7 @@ def getPresentationCategory(
 			self,
 			ancestors,
 			formatConfig,
-			reason=controlTypes.REASON_CARET,
+			reason=OutputReason.CARET,
 			extraDetail=False
 	):
 		role = self.get("role", controlTypes.ROLE_UNKNOWN)
@@ -77,7 +77,7 @@ def getPresentationCategory(
 
 		name = self.get("name")
 		landmark = self.get("landmark")
-		if reason in (controlTypes.REASON_CARET, controlTypes.REASON_SAYALL, controlTypes.REASON_FOCUS) and (
+		if reason in (OutputReason.CARET, OutputReason.SAYALL, OutputReason.FOCUS) and (
 			(role == controlTypes.ROLE_LINK and not formatConfig["reportLinks"])
 			or (role == controlTypes.ROLE_GRAPHIC and not formatConfig["reportGraphics"])
 			or (role == controlTypes.ROLE_HEADING and not formatConfig["reportHeadings"])
diff --git a/tests/unit/test_controlTypes.py b/tests/unit/test_controlTypes.py
index d8b478767a3..a1abd0f8583 100644
--- a/tests/unit/test_controlTypes.py
+++ b/tests/unit/test_controlTypes.py
@@ -42,7 +42,7 @@ def test_positiveStates(self):
 			controlTypes.processPositiveStates(
 				self.obj.role,
 				self.obj.states,
-				controlTypes.REASON_FOCUS,
+				controlTypes.OutputReason.FOCUS,
 				self.obj.states
 			),
 			{controlTypes.STATE_INVALID_ENTRY, controlTypes.STATE_REQUIRED}
@@ -53,7 +53,7 @@ def test_negativeStates(self):
 			controlTypes.processNegativeStates(
 				self.obj.role,
 				self.obj.states,
-				controlTypes.REASON_FOCUS,
+				controlTypes.OutputReason.FOCUS,
 				None
 			),
 			{controlTypes.STATE_CHECKED}
@@ -75,7 +75,7 @@ def test_positiveMergedStatesOutput(self):
 			controlTypes.processAndLabelStates(
 				obj.role,
 				obj.states,
-				controlTypes.REASON_FOCUS,
+				controlTypes.OutputReason.FOCUS,
 				obj.states,
 				None
 			),
@@ -95,7 +95,7 @@ def test_negativeMergedStatesOutput(self):
 			controlTypes.processAndLabelStates(
 				obj.role,
 				obj.states,
-				controlTypes.REASON_FOCUS,
+				controlTypes.OutputReason.FOCUS,
 				obj.states,
 				None
 			),
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
index a3495278a02..5eafac90abb 100644
--- a/user_docs/en/changes.t2t
+++ b/user_docs/en/changes.t2t
@@ -35,6 +35,8 @@ What's New in NVDA
  - canStartOnSecureScreens - use config.isInstalledCopy instead.
  - hasUiAccess and execElevated - use them from the systemUtils module.
  - getConfigDirs - use globalVars.appArgs.configPath instead
+- Module level REASON_* constants are removed from controlTypes - please use controlTypes.OutputReason instead. (#11969)
+- REASON_QUICKNAV has been removed from browseMode - use controlTypes.OutputReason.QUICKNAV instead. (#11969)
 
 
 = 2020.4 =