--- a/widget/TextEventDispatcher.cpp
+++ b/widget/TextEventDispatcher.cpp
@@ -590,17 +590,17 @@ TextEventDispatcher::PendingComposition:
   Clear();
 }
 
 void
 TextEventDispatcher::PendingComposition::Clear()
 {
   mString.Truncate();
   mClauses = nullptr;
-  mCaret.mRangeType = TextRangeType::NS_TEXTRANGE_UNDEFINED;
+  mCaret.mRangeType = TextRangeType::eUninitialized;
 }
 
 void
 TextEventDispatcher::PendingComposition::EnsureClauseArray()
 {
   if (mClauses) {
     return;
   }

--- a/widget/TextRange.h
+++ b/widget/TextRange.h
@@ -125,17 +125,17 @@ struct TextRangeStyle
 };
 
 /******************************************************************************
  * mozilla::TextRange
  ******************************************************************************/
 
 enum class TextRangeType : RawTextRangeType
 {
-  NS_TEXTRANGE_UNDEFINED = 0x00,
+  eUninitialized = 0x00,
   NS_TEXTRANGE_CARETPOSITION = 0x01,
   NS_TEXTRANGE_RAWINPUT =
     nsITextInputProcessor::ATTR_RAW_CLAUSE,
   NS_TEXTRANGE_SELECTEDRAWTEXT =
     nsITextInputProcessor::ATTR_SELECTED_RAW_CLAUSE,
   NS_TEXTRANGE_CONVERTEDTEXT =
     nsITextInputProcessor::ATTR_CONVERTED_CLAUSE,
   NS_TEXTRANGE_SELECTEDCONVERTEDTEXT =
@@ -147,17 +147,17 @@ RawTextRangeType ToRawTextRangeType(Text
 TextRangeType ToTextRangeType(RawTextRangeType aRawTextRangeType);
 const char* ToChar(TextRangeType aTextRangeType);
 
 struct TextRange
 {
   TextRange()
     : mStartOffset(0)
     , mEndOffset(0)
-    , mRangeType(TextRangeType::NS_TEXTRANGE_UNDEFINED)
+    , mRangeType(TextRangeType::eUninitialized)
   {
   }
 
   uint32_t mStartOffset;
   // XXX Storing end offset makes the initializing code very complicated.
   //     We should replace it with mLength.
   uint32_t mEndOffset;
 

--- a/widget/WidgetEventImpl.cpp
+++ b/widget/WidgetEventImpl.cpp
@@ -56,17 +56,17 @@ ToChar(EventClassID aEventClassID)
       return "illegal event class ID";
   }
 }
 
 bool
 IsValidRawTextRangeValue(RawTextRangeType aRawTextRangeType)
 {
   switch (static_cast<TextRangeType>(aRawTextRangeType)) {
-    case TextRangeType::NS_TEXTRANGE_UNDEFINED:
+    case TextRangeType::eUninitialized:
     case TextRangeType::NS_TEXTRANGE_CARETPOSITION:
     case TextRangeType::NS_TEXTRANGE_RAWINPUT:
     case TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT:
     case TextRangeType::NS_TEXTRANGE_CONVERTEDTEXT:
     case TextRangeType::NS_TEXTRANGE_SELECTEDCONVERTEDTEXT:
       return true;
     default:
       return false;
@@ -85,18 +85,18 @@ ToTextRangeType(RawTextRangeType aRawTex
   MOZ_ASSERT(IsValidRawTextRangeValue(aRawTextRangeType));
   return static_cast<TextRangeType>(aRawTextRangeType);
 }
 
 const char*
 ToChar(TextRangeType aTextRangeType)
 {
   switch (aTextRangeType) {
-    case TextRangeType::NS_TEXTRANGE_UNDEFINED:
-      return "NS_TEXTRANGE_UNDEFINED";
+    case TextRangeType::eUninitialized:
+      return "TextRangeType::eUninitialized";
     case TextRangeType::NS_TEXTRANGE_CARETPOSITION:
       return "NS_TEXTRANGE_CARETPOSITION";
     case TextRangeType::NS_TEXTRANGE_RAWINPUT:
       return "NS_TEXTRANGE_RAWINPUT";
     case TextRangeType::NS_TEXTRANGE_SELECTEDRAWTEXT:
       return "NS_TEXTRANGE_SELECTEDRAWTEXT";
     case TextRangeType::NS_TEXTRANGE_CONVERTEDTEXT:
       return "NS_TEXTRANGE_CONVERTEDTEXT";