diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index c0c5c1feab8..3cc946fe16e 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -2698,7 +2698,7 @@ HTMLContentSink::LoadStyleSheet(nsIURL* aURL,
     nsICSSStyleSheet* sheet = nsnull;
     // XXX note: we are ignoring rv until the error code stuff in the
     // input routines is converted to use nsresult's
-    parser->SetCaseSensative(PR_FALSE);
+    parser->SetCaseSensitive(PR_FALSE);
     parser->Parse(aUIN, aURL, sheet);
     if (nsnull != sheet) {
       sheet->SetTitle(aTitle);
diff --git a/mozilla/content/html/style/public/nsICSSParser.h b/mozilla/content/html/style/public/nsICSSParser.h
index 350013f2853..f608a9ff937 100644
--- a/mozilla/content/html/style/public/nsICSSParser.h
+++ b/mozilla/content/html/style/public/nsICSSParser.h
@@ -42,8 +42,8 @@ public:
   // implement the nsICSSStyleSheet interface
   NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet) = 0;
 
-  // Set whether or not tags & classes are case sensative or uppercased
-  NS_IMETHOD SetCaseSensative(PRBool aCaseSensative) = 0;
+  // Set whether or not tags & classes are case sensitive or uppercased
+  NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive) = 0;
 
   NS_IMETHOD Parse(nsIUnicharInputStream* aInput,
                    nsIURL*                aInputURL,
diff --git a/mozilla/content/html/style/src/nsCSSParser.cpp b/mozilla/content/html/style/src/nsCSSParser.cpp
index 63156ee06ad..9550e152d32 100644
--- a/mozilla/content/html/style/src/nsCSSParser.cpp
+++ b/mozilla/content/html/style/src/nsCSSParser.cpp
@@ -113,7 +113,7 @@ public:
 
   NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet);
 
-  NS_IMETHOD SetCaseSensative(PRBool aCaseSensative);
+  NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive);
 
   NS_IMETHOD Parse(nsIUnicharInputStream* aInput,
                    nsIURL*                aInputURL,
@@ -232,7 +232,7 @@ protected:
   PRBool mInHead;
 
   PRBool  mNavQuirkMode;
-  PRBool  mCaseSensative;
+  PRBool  mCaseSensitive;
 };
 
 NS_HTML nsresult
@@ -255,7 +255,7 @@ CSSParserImpl::CSSParserImpl()
   mSheet = nsnull;
   mHavePushBack = PR_FALSE;
   mNavQuirkMode = PR_TRUE;
-  mCaseSensative = PR_FALSE;
+  mCaseSensitive = PR_FALSE;
 }
 
 CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
@@ -266,7 +266,7 @@ CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
   mSheet = aSheet; NS_ADDREF(aSheet);
   mHavePushBack = PR_FALSE;
   mNavQuirkMode = PR_TRUE;
-  mCaseSensative = PR_FALSE;
+  mCaseSensitive = PR_FALSE;
 }
 
 NS_IMPL_ISUPPORTS(CSSParserImpl,kICSSParserIID)
@@ -303,9 +303,9 @@ CSSParserImpl::SetStyleSheet(nsICSSStyleSheet* aSheet)
 }
 
 NS_IMETHODIMP
-CSSParserImpl::SetCaseSensative(PRBool aCaseSensative)
+CSSParserImpl::SetCaseSensitive(PRBool aCaseSensitive)
 {
-  mCaseSensative = aCaseSensative;
+  mCaseSensitive = aCaseSensitive;
   return NS_OK;
 }
 
@@ -1057,7 +1057,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
   else if (eCSSToken_Ident == mToken.mType) {    // element name
     PRInt32 colon = mToken.mIdent.Find(':');
     if (-1 == colon) {  // no namespace
-      if (mCaseSensative) {
+      if (mCaseSensitive) {
         aSelector.SetTag(mToken.mIdent);
       }
       else {
@@ -1069,7 +1069,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
       nsAutoString  nameSpace;
       mToken.mIdent.Left(nameSpace, colon);
       mToken.mIdent.Right(buffer, (mToken.mIdent.Length() - (colon + 1)));
-      if (! mCaseSensative) {
+      if (! mCaseSensitive) {
         buffer.ToUpperCase();
       }
       // XXX lookup namespace, set it
@@ -1103,7 +1103,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
         return PR_FALSE;
       }
       dataMask |= SEL_MASK_CLASS;
-      if (mCaseSensative) {
+      if (mCaseSensitive) {
         aSelector.AddClass(mToken.mIdent);
       }
       else {
@@ -1151,7 +1151,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
         return PR_FALSE;
       }
       nsAutoString  attr(mToken.mIdent);
-      if (! mCaseSensative) {
+      if (! mCaseSensitive) {
         attr.ToUpperCase();
       }
       if (! GetToken(aErrorCode, PR_FALSE)) { // premature EOF
@@ -1206,10 +1206,10 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
             }
             if ((eCSSToken_Symbol == mToken.mType) && (']' == mToken.mSymbol)) {
               dataMask |= SEL_MASK_ATTRIB;
-              if (! mCaseSensative) {
+              if (! mCaseSensitive) {
                 value.ToUpperCase();
               }
-              aSelector.AddAttribute(attr, func, value, mCaseSensative);
+              aSelector.AddAttribute(attr, func, value, mCaseSensitive);
             }
             else {
               UngetToken();
diff --git a/mozilla/content/html/style/src/nsCSSStyleRule.cpp b/mozilla/content/html/style/src/nsCSSStyleRule.cpp
index 10e8cbeee0f..713201eaaa3 100644
--- a/mozilla/content/html/style/src/nsCSSStyleRule.cpp
+++ b/mozilla/content/html/style/src/nsCSSStyleRule.cpp
@@ -116,7 +116,7 @@ PRBool nsAtomList::Equals(const nsAtomList* aOther) const
 nsAttrSelector::nsAttrSelector(const nsString& aAttr)
   : mAttr(nsnull),
     mFunction(NS_ATTR_FUNC_SET),
-    mCaseSensative(1),
+    mCaseSensitive(1),
     mValue(),
     mNext(nsnull)
 {
@@ -124,10 +124,10 @@ nsAttrSelector::nsAttrSelector(const nsString& aAttr)
 }
 
 nsAttrSelector::nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const nsString& aValue,
-                               PRBool aCaseSensative)
+                               PRBool aCaseSensitive)
   : mAttr(nsnull),
     mFunction(aFunction),
-    mCaseSensative(aCaseSensative),
+    mCaseSensitive(aCaseSensitive),
     mValue(aValue),
     mNext(nsnull)
 {
@@ -137,7 +137,7 @@ nsAttrSelector::nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const n
 nsAttrSelector::nsAttrSelector(const nsAttrSelector& aCopy)
   : mAttr(aCopy.mAttr),
     mFunction(aCopy.mFunction),
-    mCaseSensative(aCopy.mCaseSensative),
+    mCaseSensitive(aCopy.mCaseSensitive),
     mValue(aCopy.mValue),
     mNext(nsnull)
 {
@@ -159,7 +159,7 @@ PRBool nsAttrSelector::Equals(const nsAttrSelector* aOther) const
   if (nsnull != aOther) {
     if ((mAttr == aOther->mAttr) && 
         (mFunction == aOther->mFunction) && 
-        (mCaseSensative == aOther->mCaseSensative) &&
+        (mCaseSensitive == aOther->mCaseSensitive) &&
         mValue.Equals(aOther->mValue)) {
       if (nsnull != mNext) {
         return mNext->Equals(aOther->mNext);
@@ -346,14 +346,14 @@ void nsCSSSelector::AddAttribute(const nsString& aAttr)
 }
 
 void nsCSSSelector::AddAttribute(const nsString& aAttr, PRUint8 aFunc, const nsString& aValue,
-                                 PRBool aCaseSensative)
+                                 PRBool aCaseSensitive)
 {
   if (0 < aAttr.Length()) {
     nsAttrSelector** list = &mAttrList;
     while (nsnull != *list) {
       list = &((*list)->mNext);
     }
-    *list = new nsAttrSelector(aAttr, aFunc, aValue, aCaseSensative);
+    *list = new nsAttrSelector(aAttr, aFunc, aValue, aCaseSensitive);
   }
 }
 
diff --git a/mozilla/content/html/style/src/nsICSSStyleRule.h b/mozilla/content/html/style/src/nsICSSStyleRule.h
index 545db4bbf31..51060172dc7 100644
--- a/mozilla/content/html/style/src/nsICSSStyleRule.h
+++ b/mozilla/content/html/style/src/nsICSSStyleRule.h
@@ -49,14 +49,14 @@ struct nsAttrSelector {
 public:
   nsAttrSelector(const nsString& aAttr);
   nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const nsString& aValue,
-                 PRBool aCaseSensative);
+                 PRBool aCaseSensitive);
   nsAttrSelector(const nsAttrSelector& aCopy);
   ~nsAttrSelector(void);
   PRBool Equals(const nsAttrSelector* aOther) const;
 
   nsIAtom*        mAttr;
   PRUint8         mFunction;
-  PRPackedBool    mCaseSensative;
+  PRPackedBool    mCaseSensitive;
   nsString        mValue;
   nsAttrSelector* mNext;
 };
@@ -79,7 +79,7 @@ public:
   void AddPseudoClass(nsIAtom* aPseudoClass);
   void AddAttribute(const nsString& aAttr);
   void AddAttribute(const nsString& aAttr, PRUint8 aFunc, const nsString& aValue,
-                    PRBool aCaseSensative);
+                    PRBool aCaseSensitive);
   void SetOperator(PRUnichar aOperator);
 
   PRInt32 CalcWeight(void) const;
diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
index c0c5c1feab8..3cc946fe16e 100644
--- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
@@ -2698,7 +2698,7 @@ HTMLContentSink::LoadStyleSheet(nsIURL* aURL,
     nsICSSStyleSheet* sheet = nsnull;
     // XXX note: we are ignoring rv until the error code stuff in the
     // input routines is converted to use nsresult's
-    parser->SetCaseSensative(PR_FALSE);
+    parser->SetCaseSensitive(PR_FALSE);
     parser->Parse(aUIN, aURL, sheet);
     if (nsnull != sheet) {
       sheet->SetTitle(aTitle);
diff --git a/mozilla/layout/html/style/public/nsICSSParser.h b/mozilla/layout/html/style/public/nsICSSParser.h
index 350013f2853..f608a9ff937 100644
--- a/mozilla/layout/html/style/public/nsICSSParser.h
+++ b/mozilla/layout/html/style/public/nsICSSParser.h
@@ -42,8 +42,8 @@ public:
   // implement the nsICSSStyleSheet interface
   NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet) = 0;
 
-  // Set whether or not tags & classes are case sensative or uppercased
-  NS_IMETHOD SetCaseSensative(PRBool aCaseSensative) = 0;
+  // Set whether or not tags & classes are case sensitive or uppercased
+  NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive) = 0;
 
   NS_IMETHOD Parse(nsIUnicharInputStream* aInput,
                    nsIURL*                aInputURL,
diff --git a/mozilla/layout/html/style/src/nsCSSParser.cpp b/mozilla/layout/html/style/src/nsCSSParser.cpp
index 63156ee06ad..9550e152d32 100644
--- a/mozilla/layout/html/style/src/nsCSSParser.cpp
+++ b/mozilla/layout/html/style/src/nsCSSParser.cpp
@@ -113,7 +113,7 @@ public:
 
   NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet);
 
-  NS_IMETHOD SetCaseSensative(PRBool aCaseSensative);
+  NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive);
 
   NS_IMETHOD Parse(nsIUnicharInputStream* aInput,
                    nsIURL*                aInputURL,
@@ -232,7 +232,7 @@ protected:
   PRBool mInHead;
 
   PRBool  mNavQuirkMode;
-  PRBool  mCaseSensative;
+  PRBool  mCaseSensitive;
 };
 
 NS_HTML nsresult
@@ -255,7 +255,7 @@ CSSParserImpl::CSSParserImpl()
   mSheet = nsnull;
   mHavePushBack = PR_FALSE;
   mNavQuirkMode = PR_TRUE;
-  mCaseSensative = PR_FALSE;
+  mCaseSensitive = PR_FALSE;
 }
 
 CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
@@ -266,7 +266,7 @@ CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
   mSheet = aSheet; NS_ADDREF(aSheet);
   mHavePushBack = PR_FALSE;
   mNavQuirkMode = PR_TRUE;
-  mCaseSensative = PR_FALSE;
+  mCaseSensitive = PR_FALSE;
 }
 
 NS_IMPL_ISUPPORTS(CSSParserImpl,kICSSParserIID)
@@ -303,9 +303,9 @@ CSSParserImpl::SetStyleSheet(nsICSSStyleSheet* aSheet)
 }
 
 NS_IMETHODIMP
-CSSParserImpl::SetCaseSensative(PRBool aCaseSensative)
+CSSParserImpl::SetCaseSensitive(PRBool aCaseSensitive)
 {
-  mCaseSensative = aCaseSensative;
+  mCaseSensitive = aCaseSensitive;
   return NS_OK;
 }
 
@@ -1057,7 +1057,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
   else if (eCSSToken_Ident == mToken.mType) {    // element name
     PRInt32 colon = mToken.mIdent.Find(':');
     if (-1 == colon) {  // no namespace
-      if (mCaseSensative) {
+      if (mCaseSensitive) {
         aSelector.SetTag(mToken.mIdent);
       }
       else {
@@ -1069,7 +1069,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
       nsAutoString  nameSpace;
       mToken.mIdent.Left(nameSpace, colon);
       mToken.mIdent.Right(buffer, (mToken.mIdent.Length() - (colon + 1)));
-      if (! mCaseSensative) {
+      if (! mCaseSensitive) {
         buffer.ToUpperCase();
       }
       // XXX lookup namespace, set it
@@ -1103,7 +1103,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
         return PR_FALSE;
       }
       dataMask |= SEL_MASK_CLASS;
-      if (mCaseSensative) {
+      if (mCaseSensitive) {
         aSelector.AddClass(mToken.mIdent);
       }
       else {
@@ -1151,7 +1151,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
         return PR_FALSE;
       }
       nsAutoString  attr(mToken.mIdent);
-      if (! mCaseSensative) {
+      if (! mCaseSensitive) {
         attr.ToUpperCase();
       }
       if (! GetToken(aErrorCode, PR_FALSE)) { // premature EOF
@@ -1206,10 +1206,10 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
             }
             if ((eCSSToken_Symbol == mToken.mType) && (']' == mToken.mSymbol)) {
               dataMask |= SEL_MASK_ATTRIB;
-              if (! mCaseSensative) {
+              if (! mCaseSensitive) {
                 value.ToUpperCase();
               }
-              aSelector.AddAttribute(attr, func, value, mCaseSensative);
+              aSelector.AddAttribute(attr, func, value, mCaseSensitive);
             }
             else {
               UngetToken();
diff --git a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
index 10e8cbeee0f..713201eaaa3 100644
--- a/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
+++ b/mozilla/layout/html/style/src/nsCSSStyleRule.cpp
@@ -116,7 +116,7 @@ PRBool nsAtomList::Equals(const nsAtomList* aOther) const
 nsAttrSelector::nsAttrSelector(const nsString& aAttr)
   : mAttr(nsnull),
     mFunction(NS_ATTR_FUNC_SET),
-    mCaseSensative(1),
+    mCaseSensitive(1),
     mValue(),
     mNext(nsnull)
 {
@@ -124,10 +124,10 @@ nsAttrSelector::nsAttrSelector(const nsString& aAttr)
 }
 
 nsAttrSelector::nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const nsString& aValue,
-                               PRBool aCaseSensative)
+                               PRBool aCaseSensitive)
   : mAttr(nsnull),
     mFunction(aFunction),
-    mCaseSensative(aCaseSensative),
+    mCaseSensitive(aCaseSensitive),
     mValue(aValue),
     mNext(nsnull)
 {
@@ -137,7 +137,7 @@ nsAttrSelector::nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const n
 nsAttrSelector::nsAttrSelector(const nsAttrSelector& aCopy)
   : mAttr(aCopy.mAttr),
     mFunction(aCopy.mFunction),
-    mCaseSensative(aCopy.mCaseSensative),
+    mCaseSensitive(aCopy.mCaseSensitive),
     mValue(aCopy.mValue),
     mNext(nsnull)
 {
@@ -159,7 +159,7 @@ PRBool nsAttrSelector::Equals(const nsAttrSelector* aOther) const
   if (nsnull != aOther) {
     if ((mAttr == aOther->mAttr) && 
         (mFunction == aOther->mFunction) && 
-        (mCaseSensative == aOther->mCaseSensative) &&
+        (mCaseSensitive == aOther->mCaseSensitive) &&
         mValue.Equals(aOther->mValue)) {
       if (nsnull != mNext) {
         return mNext->Equals(aOther->mNext);
@@ -346,14 +346,14 @@ void nsCSSSelector::AddAttribute(const nsString& aAttr)
 }
 
 void nsCSSSelector::AddAttribute(const nsString& aAttr, PRUint8 aFunc, const nsString& aValue,
-                                 PRBool aCaseSensative)
+                                 PRBool aCaseSensitive)
 {
   if (0 < aAttr.Length()) {
     nsAttrSelector** list = &mAttrList;
     while (nsnull != *list) {
       list = &((*list)->mNext);
     }
-    *list = new nsAttrSelector(aAttr, aFunc, aValue, aCaseSensative);
+    *list = new nsAttrSelector(aAttr, aFunc, aValue, aCaseSensitive);
   }
 }
 
diff --git a/mozilla/layout/html/style/src/nsICSSStyleRule.h b/mozilla/layout/html/style/src/nsICSSStyleRule.h
index 545db4bbf31..51060172dc7 100644
--- a/mozilla/layout/html/style/src/nsICSSStyleRule.h
+++ b/mozilla/layout/html/style/src/nsICSSStyleRule.h
@@ -49,14 +49,14 @@ struct nsAttrSelector {
 public:
   nsAttrSelector(const nsString& aAttr);
   nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const nsString& aValue,
-                 PRBool aCaseSensative);
+                 PRBool aCaseSensitive);
   nsAttrSelector(const nsAttrSelector& aCopy);
   ~nsAttrSelector(void);
   PRBool Equals(const nsAttrSelector* aOther) const;
 
   nsIAtom*        mAttr;
   PRUint8         mFunction;
-  PRPackedBool    mCaseSensative;
+  PRPackedBool    mCaseSensitive;
   nsString        mValue;
   nsAttrSelector* mNext;
 };
@@ -79,7 +79,7 @@ public:
   void AddPseudoClass(nsIAtom* aPseudoClass);
   void AddAttribute(const nsString& aAttr);
   void AddAttribute(const nsString& aAttr, PRUint8 aFunc, const nsString& aValue,
-                    PRBool aCaseSensative);
+                    PRBool aCaseSensitive);
   void SetOperator(PRUnichar aOperator);
 
   PRInt32 CalcWeight(void) const;
diff --git a/mozilla/layout/style/nsCSSParser.cpp b/mozilla/layout/style/nsCSSParser.cpp
index 63156ee06ad..9550e152d32 100644
--- a/mozilla/layout/style/nsCSSParser.cpp
+++ b/mozilla/layout/style/nsCSSParser.cpp
@@ -113,7 +113,7 @@ public:
 
   NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet);
 
-  NS_IMETHOD SetCaseSensative(PRBool aCaseSensative);
+  NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive);
 
   NS_IMETHOD Parse(nsIUnicharInputStream* aInput,
                    nsIURL*                aInputURL,
@@ -232,7 +232,7 @@ protected:
   PRBool mInHead;
 
   PRBool  mNavQuirkMode;
-  PRBool  mCaseSensative;
+  PRBool  mCaseSensitive;
 };
 
 NS_HTML nsresult
@@ -255,7 +255,7 @@ CSSParserImpl::CSSParserImpl()
   mSheet = nsnull;
   mHavePushBack = PR_FALSE;
   mNavQuirkMode = PR_TRUE;
-  mCaseSensative = PR_FALSE;
+  mCaseSensitive = PR_FALSE;
 }
 
 CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
@@ -266,7 +266,7 @@ CSSParserImpl::CSSParserImpl(nsICSSStyleSheet* aSheet)
   mSheet = aSheet; NS_ADDREF(aSheet);
   mHavePushBack = PR_FALSE;
   mNavQuirkMode = PR_TRUE;
-  mCaseSensative = PR_FALSE;
+  mCaseSensitive = PR_FALSE;
 }
 
 NS_IMPL_ISUPPORTS(CSSParserImpl,kICSSParserIID)
@@ -303,9 +303,9 @@ CSSParserImpl::SetStyleSheet(nsICSSStyleSheet* aSheet)
 }
 
 NS_IMETHODIMP
-CSSParserImpl::SetCaseSensative(PRBool aCaseSensative)
+CSSParserImpl::SetCaseSensitive(PRBool aCaseSensitive)
 {
-  mCaseSensative = aCaseSensative;
+  mCaseSensitive = aCaseSensitive;
   return NS_OK;
 }
 
@@ -1057,7 +1057,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
   else if (eCSSToken_Ident == mToken.mType) {    // element name
     PRInt32 colon = mToken.mIdent.Find(':');
     if (-1 == colon) {  // no namespace
-      if (mCaseSensative) {
+      if (mCaseSensitive) {
         aSelector.SetTag(mToken.mIdent);
       }
       else {
@@ -1069,7 +1069,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
       nsAutoString  nameSpace;
       mToken.mIdent.Left(nameSpace, colon);
       mToken.mIdent.Right(buffer, (mToken.mIdent.Length() - (colon + 1)));
-      if (! mCaseSensative) {
+      if (! mCaseSensitive) {
         buffer.ToUpperCase();
       }
       // XXX lookup namespace, set it
@@ -1103,7 +1103,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
         return PR_FALSE;
       }
       dataMask |= SEL_MASK_CLASS;
-      if (mCaseSensative) {
+      if (mCaseSensitive) {
         aSelector.AddClass(mToken.mIdent);
       }
       else {
@@ -1151,7 +1151,7 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
         return PR_FALSE;
       }
       nsAutoString  attr(mToken.mIdent);
-      if (! mCaseSensative) {
+      if (! mCaseSensitive) {
         attr.ToUpperCase();
       }
       if (! GetToken(aErrorCode, PR_FALSE)) { // premature EOF
@@ -1206,10 +1206,10 @@ PRBool CSSParserImpl::ParseSelector(PRInt32& aErrorCode,
             }
             if ((eCSSToken_Symbol == mToken.mType) && (']' == mToken.mSymbol)) {
               dataMask |= SEL_MASK_ATTRIB;
-              if (! mCaseSensative) {
+              if (! mCaseSensitive) {
                 value.ToUpperCase();
               }
-              aSelector.AddAttribute(attr, func, value, mCaseSensative);
+              aSelector.AddAttribute(attr, func, value, mCaseSensitive);
             }
             else {
               UngetToken();
diff --git a/mozilla/layout/style/nsCSSStyleRule.cpp b/mozilla/layout/style/nsCSSStyleRule.cpp
index 10e8cbeee0f..713201eaaa3 100644
--- a/mozilla/layout/style/nsCSSStyleRule.cpp
+++ b/mozilla/layout/style/nsCSSStyleRule.cpp
@@ -116,7 +116,7 @@ PRBool nsAtomList::Equals(const nsAtomList* aOther) const
 nsAttrSelector::nsAttrSelector(const nsString& aAttr)
   : mAttr(nsnull),
     mFunction(NS_ATTR_FUNC_SET),
-    mCaseSensative(1),
+    mCaseSensitive(1),
     mValue(),
     mNext(nsnull)
 {
@@ -124,10 +124,10 @@ nsAttrSelector::nsAttrSelector(const nsString& aAttr)
 }
 
 nsAttrSelector::nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const nsString& aValue,
-                               PRBool aCaseSensative)
+                               PRBool aCaseSensitive)
   : mAttr(nsnull),
     mFunction(aFunction),
-    mCaseSensative(aCaseSensative),
+    mCaseSensitive(aCaseSensitive),
     mValue(aValue),
     mNext(nsnull)
 {
@@ -137,7 +137,7 @@ nsAttrSelector::nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const n
 nsAttrSelector::nsAttrSelector(const nsAttrSelector& aCopy)
   : mAttr(aCopy.mAttr),
     mFunction(aCopy.mFunction),
-    mCaseSensative(aCopy.mCaseSensative),
+    mCaseSensitive(aCopy.mCaseSensitive),
     mValue(aCopy.mValue),
     mNext(nsnull)
 {
@@ -159,7 +159,7 @@ PRBool nsAttrSelector::Equals(const nsAttrSelector* aOther) const
   if (nsnull != aOther) {
     if ((mAttr == aOther->mAttr) && 
         (mFunction == aOther->mFunction) && 
-        (mCaseSensative == aOther->mCaseSensative) &&
+        (mCaseSensitive == aOther->mCaseSensitive) &&
         mValue.Equals(aOther->mValue)) {
       if (nsnull != mNext) {
         return mNext->Equals(aOther->mNext);
@@ -346,14 +346,14 @@ void nsCSSSelector::AddAttribute(const nsString& aAttr)
 }
 
 void nsCSSSelector::AddAttribute(const nsString& aAttr, PRUint8 aFunc, const nsString& aValue,
-                                 PRBool aCaseSensative)
+                                 PRBool aCaseSensitive)
 {
   if (0 < aAttr.Length()) {
     nsAttrSelector** list = &mAttrList;
     while (nsnull != *list) {
       list = &((*list)->mNext);
     }
-    *list = new nsAttrSelector(aAttr, aFunc, aValue, aCaseSensative);
+    *list = new nsAttrSelector(aAttr, aFunc, aValue, aCaseSensitive);
   }
 }
 
diff --git a/mozilla/layout/style/nsICSSParser.h b/mozilla/layout/style/nsICSSParser.h
index 350013f2853..f608a9ff937 100644
--- a/mozilla/layout/style/nsICSSParser.h
+++ b/mozilla/layout/style/nsICSSParser.h
@@ -42,8 +42,8 @@ public:
   // implement the nsICSSStyleSheet interface
   NS_IMETHOD SetStyleSheet(nsICSSStyleSheet* aSheet) = 0;
 
-  // Set whether or not tags & classes are case sensative or uppercased
-  NS_IMETHOD SetCaseSensative(PRBool aCaseSensative) = 0;
+  // Set whether or not tags & classes are case sensitive or uppercased
+  NS_IMETHOD SetCaseSensitive(PRBool aCaseSensitive) = 0;
 
   NS_IMETHOD Parse(nsIUnicharInputStream* aInput,
                    nsIURL*                aInputURL,
diff --git a/mozilla/layout/style/nsICSSStyleRule.h b/mozilla/layout/style/nsICSSStyleRule.h
index 545db4bbf31..51060172dc7 100644
--- a/mozilla/layout/style/nsICSSStyleRule.h
+++ b/mozilla/layout/style/nsICSSStyleRule.h
@@ -49,14 +49,14 @@ struct nsAttrSelector {
 public:
   nsAttrSelector(const nsString& aAttr);
   nsAttrSelector(const nsString& aAttr, PRUint8 aFunction, const nsString& aValue,
-                 PRBool aCaseSensative);
+                 PRBool aCaseSensitive);
   nsAttrSelector(const nsAttrSelector& aCopy);
   ~nsAttrSelector(void);
   PRBool Equals(const nsAttrSelector* aOther) const;
 
   nsIAtom*        mAttr;
   PRUint8         mFunction;
-  PRPackedBool    mCaseSensative;
+  PRPackedBool    mCaseSensitive;
   nsString        mValue;
   nsAttrSelector* mNext;
 };
@@ -79,7 +79,7 @@ public:
   void AddPseudoClass(nsIAtom* aPseudoClass);
   void AddAttribute(const nsString& aAttr);
   void AddAttribute(const nsString& aAttr, PRUint8 aFunc, const nsString& aValue,
-                    PRBool aCaseSensative);
+                    PRBool aCaseSensitive);
   void SetOperator(PRUnichar aOperator);
 
   PRInt32 CalcWeight(void) const;
diff --git a/mozilla/rdf/src/nsRDFDocumentContentSink.cpp b/mozilla/rdf/src/nsRDFDocumentContentSink.cpp
index 010bb1a7a25..b3e888316fb 100644
--- a/mozilla/rdf/src/nsRDFDocumentContentSink.cpp
+++ b/mozilla/rdf/src/nsRDFDocumentContentSink.cpp
@@ -215,7 +215,7 @@ nsRDFDocumentContentSink::LoadStyleSheet(nsIURL* aURL,
         nsICSSStyleSheet* sheet = nsnull;
         // XXX note: we are ignoring rv until the error code stuff in the
         // input routines is converted to use nsresult's
-        parser->SetCaseSensative(PR_TRUE);
+        parser->SetCaseSensitive(PR_TRUE);
         parser->Parse(aUIN, aURL, sheet);
         if (nsnull != sheet) {
             mDocument->AddStyleSheet(sheet);