diff --git a/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp b/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp
index ae69759a2ba..781f995673f 100644
--- a/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp
+++ b/mozilla/content/html/style/src/nsROCSSPrimitiveValue.cpp
@@ -174,7 +174,7 @@ nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText)
 
 
 NS_IMETHODIMP
-nsROCSSPrimitiveValue::GetValueType(PRUint16* aValueType)
+nsROCSSPrimitiveValue::GetCssValueType(PRUint16* aValueType)
 {
   NS_ENSURE_ARG_POINTER(aValueType);
   *aValueType = nsIDOMCSSValue::CSS_PRIMITIVE_VALUE;
diff --git a/mozilla/dom/public/css/nsIDOMCSSValue.h b/mozilla/dom/public/css/nsIDOMCSSValue.h
index 81a085053c6..75d2e59958e 100644
--- a/mozilla/dom/public/css/nsIDOMCSSValue.h
+++ b/mozilla/dom/public/css/nsIDOMCSSValue.h
@@ -46,21 +46,21 @@ public:
   NS_IMETHOD    GetCssText(nsAWritableString& aCssText)=0;
   NS_IMETHOD    SetCssText(const nsAReadableString& aCssText)=0;
 
-  NS_IMETHOD    GetValueType(PRUint16* aValueType)=0;
+  NS_IMETHOD    GetCssValueType(PRUint16* aCssValueType)=0;
 };
 
 
 #define NS_DECL_IDOMCSSVALUE   \
   NS_IMETHOD    GetCssText(nsAWritableString& aCssText);  \
   NS_IMETHOD    SetCssText(const nsAReadableString& aCssText);  \
-  NS_IMETHOD    GetValueType(PRUint16* aValueType);  \
+  NS_IMETHOD    GetCssValueType(PRUint16* aCssValueType);  \
 
 
 
 #define NS_FORWARD_IDOMCSSVALUE(_to)  \
   NS_IMETHOD    GetCssText(nsAWritableString& aCssText) { return _to GetCssText(aCssText); } \
   NS_IMETHOD    SetCssText(const nsAReadableString& aCssText) { return _to SetCssText(aCssText); } \
-  NS_IMETHOD    GetValueType(PRUint16* aValueType) { return _to GetValueType(aValueType); } \
+  NS_IMETHOD    GetCssValueType(PRUint16* aCssValueType) { return _to GetCssValueType(aCssValueType); } \
 
 
 extern "C" NS_DOM nsresult NS_InitCSSValueClass(nsIScriptContext *aContext, void **aPrototype);
diff --git a/mozilla/dom/public/idl/css/CSSValue.idl b/mozilla/dom/public/idl/css/CSSValue.idl
index 7e97466a832..83fc97d6dd7 100644
--- a/mozilla/dom/public/idl/css/CSSValue.idl
+++ b/mozilla/dom/public/idl/css/CSSValue.idl
@@ -10,6 +10,6 @@ interface CSSValue {
            attribute DOMString        cssText;
                                         // raises(DOMException) on setting
 
-  readonly attribute unsigned short   valueType;
+  readonly attribute unsigned short   cssValueType;
 };
 
diff --git a/mozilla/dom/public/nsDOMPropEnums.h b/mozilla/dom/public/nsDOMPropEnums.h
index d4eba0c8630..176302e2d65 100644
--- a/mozilla/dom/public/nsDOMPropEnums.h
+++ b/mozilla/dom/public/nsDOMPropEnums.h
@@ -230,7 +230,7 @@ enum nsDOMProp {
     NS_DOM_PROP_CSSSTYLESHEET_INSERTRULE, 
     NS_DOM_PROP_CSSSTYLESHEET_OWNERRULE,
     NS_DOM_PROP_CSSVALUE_CSSTEXT,
-    NS_DOM_PROP_CSSVALUE_VALUETYPE,
+    NS_DOM_PROP_CSSVALUE_CSSVALUETYPE,
     NS_DOM_PROP_DOCUMENT_CREATEATTRIBUTE, 
     NS_DOM_PROP_DOCUMENT_CREATEATTRIBUTENS, 
     NS_DOM_PROP_DOCUMENT_CREATECDATASECTION, 
diff --git a/mozilla/dom/public/nsDOMPropNames.h b/mozilla/dom/public/nsDOMPropNames.h
index 6d1a45990f5..067a6dfb903 100644
--- a/mozilla/dom/public/nsDOMPropNames.h
+++ b/mozilla/dom/public/nsDOMPropNames.h
@@ -71,7 +71,6 @@
     "css2properties.backgroundimage", \
     "css2properties.backgroundposition", \
     "css2properties.backgroundrepeat", \
-    "css2properties.behavior", \
     "css2properties.border", \
     "css2properties.borderbottom", \
     "css2properties.borderbottomcolor", \
@@ -138,7 +137,8 @@
     "css2properties.maxwidth", \
     "css2properties.minheight", \
     "css2properties.minwidth", \
-    "css2properties.opacity", \
+    "css2properties.mozbinding", \
+    "css2properties.mozopacity", \
     "css2properties.orphans", \
     "css2properties.outline", \
     "css2properties.outlinecolor", \
@@ -228,7 +228,7 @@
     "cssstylesheet.insertrule", \
     "cssstylesheet.ownerrule", \
     "cssvalue.csstext", \
-    "cssvalue.valuetype", \
+    "cssvalue.cssvaluetype", \
     "document.createattribute", \
     "document.createattributens", \
     "document.createcdatasection", \
diff --git a/mozilla/dom/src/css/nsJSCSSValue.cpp b/mozilla/dom/src/css/nsJSCSSValue.cpp
index d07bfbc3a3d..148730989b8 100644
--- a/mozilla/dom/src/css/nsJSCSSValue.cpp
+++ b/mozilla/dom/src/css/nsJSCSSValue.cpp
@@ -47,7 +47,7 @@ static NS_DEFINE_IID(kICSSValueIID, NS_IDOMCSSVALUE_IID);
 //
 enum CSSValue_slots {
   CSSVALUE_CSSTEXT = -1,
-  CSSVALUE_VALUETYPE = -2
+  CSSVALUE_CSSVALUETYPE = -2
 };
 
 /***********************************************************************/
@@ -82,12 +82,12 @@ GetCSSValueProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         }
         break;
       }
-      case CSSVALUE_VALUETYPE:
+      case CSSVALUE_CSSVALUETYPE:
       {
-        rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSVALUE_VALUETYPE, PR_FALSE);
+        rv = secMan->CheckScriptAccess(cx, obj, NS_DOM_PROP_CSSVALUE_CSSVALUETYPE, PR_FALSE);
         if (NS_SUCCEEDED(rv)) {
           PRUint16 prop;
-          rv = a->GetValueType(&prop);
+          rv = a->GetCssValueType(&prop);
           if (NS_SUCCEEDED(rv)) {
             *vp = INT_TO_JSVAL(prop);
           }
@@ -209,7 +209,7 @@ JSClass CSSValueClass = {
 static JSPropertySpec CSSValueProperties[] =
 {
   {"cssText",    CSSVALUE_CSSTEXT,    JSPROP_ENUMERATE},
-  {"valueType",    CSSVALUE_VALUETYPE,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {"cssValueType",    CSSVALUE_CSSVALUETYPE,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {0}
 };
 
diff --git a/mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp b/mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp
index ae69759a2ba..781f995673f 100644
--- a/mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp
+++ b/mozilla/layout/html/style/src/nsROCSSPrimitiveValue.cpp
@@ -174,7 +174,7 @@ nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText)
 
 
 NS_IMETHODIMP
-nsROCSSPrimitiveValue::GetValueType(PRUint16* aValueType)
+nsROCSSPrimitiveValue::GetCssValueType(PRUint16* aValueType)
 {
   NS_ENSURE_ARG_POINTER(aValueType);
   *aValueType = nsIDOMCSSValue::CSS_PRIMITIVE_VALUE;
diff --git a/mozilla/layout/style/nsROCSSPrimitiveValue.cpp b/mozilla/layout/style/nsROCSSPrimitiveValue.cpp
index ae69759a2ba..781f995673f 100644
--- a/mozilla/layout/style/nsROCSSPrimitiveValue.cpp
+++ b/mozilla/layout/style/nsROCSSPrimitiveValue.cpp
@@ -174,7 +174,7 @@ nsROCSSPrimitiveValue::SetCssText(const nsAReadableString& aCssText)
 
 
 NS_IMETHODIMP
-nsROCSSPrimitiveValue::GetValueType(PRUint16* aValueType)
+nsROCSSPrimitiveValue::GetCssValueType(PRUint16* aValueType)
 {
   NS_ENSURE_ARG_POINTER(aValueType);
   *aValueType = nsIDOMCSSValue::CSS_PRIMITIVE_VALUE;