diff --git a/fxjs/cfxjse_engine.cpp b/fxjs/cfxjse_engine.cpp
index bfea7a4..38db6a5 100644
--- a/fxjs/cfxjse_engine.cpp
+++ b/fxjs/cfxjse_engine.cpp
@@ -399,8 +399,8 @@
       const XFA_SCRIPTATTRIBUTEINFO* lpAttrInfo = XFA_GetScriptAttributeByName(
           pPropOrChild->GetElementType(), L"{default}");
       if (lpAttrInfo) {
-        pPropOrChild->JSObject()->Script_Som_DefaultValue(
-            pReturnValue, true, XFA_Attribute::Unknown);
+        pPropOrChild->JSObject()->ScriptSomDefaultValue(pReturnValue, true,
+                                                        XFA_Attribute::Unknown);
         return;
       }
     }
diff --git a/fxjs/cfxjse_formcalc_context.cpp b/fxjs/cfxjse_formcalc_context.cpp
index bcfbdf3..f966a87 100644
--- a/fxjs/cfxjse_formcalc_context.cpp
+++ b/fxjs/cfxjse_formcalc_context.cpp
@@ -5706,8 +5706,8 @@
     pDefaultValue->SetNull();
     return;
   }
-  pNode->JSObject()->Script_Som_DefaultValue(pDefaultValue, false,
-                                             XFA_Attribute::Unknown);
+  pNode->JSObject()->ScriptSomDefaultValue(pDefaultValue, false,
+                                           XFA_Attribute::Unknown);
 }
 
 // static
@@ -5717,8 +5717,8 @@
   if (!pNode)
     return false;
 
-  pNode->JSObject()->Script_Som_DefaultValue(hNewValue, true,
-                                             XFA_Attribute::Unknown);
+  pNode->JSObject()->ScriptSomDefaultValue(hNewValue, true,
+                                           XFA_Attribute::Unknown);
   return true;
 }
 
diff --git a/fxjs/xfa/cjx_arc.cpp b/fxjs/xfa/cjx_arc.cpp
index 92b626d..6e00dd1 100644
--- a/fxjs/xfa/cjx_arc.cpp
+++ b/fxjs/xfa/cjx_arc.cpp
@@ -15,35 +15,35 @@
 void CJX_Arc::circular(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Arc::hand(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Arc::startAngle(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Arc::sweepAngle(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Arc::use(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Arc::usehref(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_area.cpp b/fxjs/xfa/cjx_area.cpp
index ee62194..d538c54 100644
--- a/fxjs/xfa/cjx_area.cpp
+++ b/fxjs/xfa/cjx_area.cpp
@@ -15,35 +15,35 @@
 void CJX_Area::colSpan(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Area::relevant(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Area::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Area::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Area::x(CFXJSE_Value* pValue,
                  bool bSetting,
                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Area::y(CFXJSE_Value* pValue,
                  bool bSetting,
                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_assist.cpp b/fxjs/xfa/cjx_assist.cpp
index fcd7f37..3cb341a 100644
--- a/fxjs/xfa/cjx_assist.cpp
+++ b/fxjs/xfa/cjx_assist.cpp
@@ -15,17 +15,17 @@
 void CJX_Assist::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Assist::role(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Assist::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_barcode.cpp b/fxjs/xfa/cjx_barcode.cpp
index 7520cc3..91ca764 100644
--- a/fxjs/xfa/cjx_barcode.cpp
+++ b/fxjs/xfa/cjx_barcode.cpp
@@ -15,119 +15,119 @@
 void CJX_Barcode::charEncoding(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::checksum(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::dataColumnCount(CFXJSE_Value* pValue,
                                   bool bSetting,
                                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::dataLength(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::dataPrep(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::dataRowCount(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::endChar(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::errorCorrectionLevel(CFXJSE_Value* pValue,
                                        bool bSetting,
                                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::moduleHeight(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::moduleWidth(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::printCheckDigit(CFXJSE_Value* pValue,
                                   bool bSetting,
                                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::rowColumnRatio(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::startChar(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::textLocation(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::truncate(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::type(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::upsMode(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Barcode::wideNarrowRatio(CFXJSE_Value* pValue,
                                   bool bSetting,
                                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_bind.cpp b/fxjs/xfa/cjx_bind.cpp
index a73312d..b3a3dd9 100644
--- a/fxjs/xfa/cjx_bind.cpp
+++ b/fxjs/xfa/cjx_bind.cpp
@@ -15,35 +15,35 @@
 void CJX_Bind::contentType(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Bind::match(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Bind::ref(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Bind::transferEncoding(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Bind::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Bind::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_binditems.cpp b/fxjs/xfa/cjx_binditems.cpp
index dd1f30d..116b94c 100644
--- a/fxjs/xfa/cjx_binditems.cpp
+++ b/fxjs/xfa/cjx_binditems.cpp
@@ -15,17 +15,17 @@
 void CJX_BindItems::connection(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BindItems::labelRef(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BindItems::valueRef(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_bookend.cpp b/fxjs/xfa/cjx_bookend.cpp
index 2399e26..ac88e3a 100644
--- a/fxjs/xfa/cjx_bookend.cpp
+++ b/fxjs/xfa/cjx_bookend.cpp
@@ -15,23 +15,23 @@
 void CJX_Bookend::leader(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Bookend::trailer(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Bookend::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Bookend::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_boolean.cpp b/fxjs/xfa/cjx_boolean.cpp
index 1830894..288b61e 100644
--- a/fxjs/xfa/cjx_boolean.cpp
+++ b/fxjs/xfa/cjx_boolean.cpp
@@ -16,7 +16,7 @@
 void CJX_Boolean::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Boolean::defaultValue(CFXJSE_Value* pValue,
@@ -44,7 +44,7 @@
 void CJX_Boolean::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Boolean::value(CFXJSE_Value* pValue,
diff --git a/fxjs/xfa/cjx_border.cpp b/fxjs/xfa/cjx_border.cpp
index 92355a8..37ed812 100644
--- a/fxjs/xfa/cjx_border.cpp
+++ b/fxjs/xfa/cjx_border.cpp
@@ -15,35 +15,35 @@
 void CJX_Border::breakValue(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Border::hand(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Border::presence(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Border::relevant(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Border::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Border::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_break.cpp b/fxjs/xfa/cjx_break.cpp
index d04a05f..8c17eac 100644
--- a/fxjs/xfa/cjx_break.cpp
+++ b/fxjs/xfa/cjx_break.cpp
@@ -15,71 +15,71 @@
 void CJX_Break::after(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::afterTarget(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::before(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::beforeTarget(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::bookendLeader(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::bookendTrailer(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::overflowLeader(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::overflowTarget(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::overflowTrailer(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::startNew(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Break::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_breakafter.cpp b/fxjs/xfa/cjx_breakafter.cpp
index 76a5a3b..ce59edb 100644
--- a/fxjs/xfa/cjx_breakafter.cpp
+++ b/fxjs/xfa/cjx_breakafter.cpp
@@ -15,41 +15,41 @@
 void CJX_BreakAfter::use(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakAfter::startNew(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakAfter::trailer(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakAfter::targetType(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakAfter::usehref(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakAfter::target(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakAfter::leader(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_breakbefore.cpp b/fxjs/xfa/cjx_breakbefore.cpp
index 83fa01e..7585ecc 100644
--- a/fxjs/xfa/cjx_breakbefore.cpp
+++ b/fxjs/xfa/cjx_breakbefore.cpp
@@ -15,41 +15,41 @@
 void CJX_BreakBefore::use(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakBefore::startNew(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakBefore::trailer(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakBefore::targetType(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakBefore::usehref(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakBefore::target(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_BreakBefore::leader(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_button.cpp b/fxjs/xfa/cjx_button.cpp
index b5bd6eb..aea53dd 100644
--- a/fxjs/xfa/cjx_button.cpp
+++ b/fxjs/xfa/cjx_button.cpp
@@ -15,17 +15,17 @@
 void CJX_Button::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Button::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Button::highlight(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_calculate.cpp b/fxjs/xfa/cjx_calculate.cpp
index e5db4df..6027839 100644
--- a/fxjs/xfa/cjx_calculate.cpp
+++ b/fxjs/xfa/cjx_calculate.cpp
@@ -15,17 +15,17 @@
 void CJX_Calculate::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Calculate::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Calculate::override(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_caption.cpp b/fxjs/xfa/cjx_caption.cpp
index 5c7f6a8..5251a50 100644
--- a/fxjs/xfa/cjx_caption.cpp
+++ b/fxjs/xfa/cjx_caption.cpp
@@ -15,29 +15,29 @@
 void CJX_Caption::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Caption::reserve(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Caption::presence(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Caption::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Caption::placement(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_certificate.cpp b/fxjs/xfa/cjx_certificate.cpp
index 1d10565..ac3074f 100644
--- a/fxjs/xfa/cjx_certificate.cpp
+++ b/fxjs/xfa/cjx_certificate.cpp
@@ -15,11 +15,11 @@
 void CJX_Certificate::use(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Certificate::usehref(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_certificates.cpp b/fxjs/xfa/cjx_certificates.cpp
index 6828630..d26bb41 100644
--- a/fxjs/xfa/cjx_certificates.cpp
+++ b/fxjs/xfa/cjx_certificates.cpp
@@ -15,29 +15,29 @@
 void CJX_Certificates::url(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Certificates::use(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Certificates::credentialServerPolicy(CFXJSE_Value* pValue,
                                               bool bSetting,
                                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Certificates::usehref(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Certificates::urlPolicy(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_checkbutton.cpp b/fxjs/xfa/cjx_checkbutton.cpp
index 8c5b1e6..8db7cb2 100644
--- a/fxjs/xfa/cjx_checkbutton.cpp
+++ b/fxjs/xfa/cjx_checkbutton.cpp
@@ -15,35 +15,35 @@
 void CJX_CheckButton::use(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_CheckButton::allowNeutral(CFXJSE_Value* pValue,
                                    bool bSetting,
                                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_CheckButton::mark(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_CheckButton::shape(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_CheckButton::size(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_CheckButton::usehref(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_choicelist.cpp b/fxjs/xfa/cjx_choicelist.cpp
index 3c85a03..4a10330 100644
--- a/fxjs/xfa/cjx_choicelist.cpp
+++ b/fxjs/xfa/cjx_choicelist.cpp
@@ -15,29 +15,29 @@
 void CJX_ChoiceList::use(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ChoiceList::open(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ChoiceList::commitOn(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ChoiceList::textEntry(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ChoiceList::usehref(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_color.cpp b/fxjs/xfa/cjx_color.cpp
index fe7da05..02bc961 100644
--- a/fxjs/xfa/cjx_color.cpp
+++ b/fxjs/xfa/cjx_color.cpp
@@ -15,23 +15,23 @@
 void CJX_Color::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Color::cSpace(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Color::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Color::value(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_comb.cpp b/fxjs/xfa/cjx_comb.cpp
index 77144af..ed9e8ab 100644
--- a/fxjs/xfa/cjx_comb.cpp
+++ b/fxjs/xfa/cjx_comb.cpp
@@ -15,17 +15,17 @@
 void CJX_Comb::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Comb::numberOfCells(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_Integer(pValue, bSetting, eAttribute);
+  ScriptAttributeInteger(pValue, bSetting, eAttribute);
 }
 
 void CJX_Comb::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_command.cpp b/fxjs/xfa/cjx_command.cpp
index 30e654b..1e99a72 100644
--- a/fxjs/xfa/cjx_command.cpp
+++ b/fxjs/xfa/cjx_command.cpp
@@ -15,17 +15,17 @@
 void CJX_Command::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Command::timeout(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Command::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_connect.cpp b/fxjs/xfa/cjx_connect.cpp
index d58420d..553fdd1 100644
--- a/fxjs/xfa/cjx_connect.cpp
+++ b/fxjs/xfa/cjx_connect.cpp
@@ -15,41 +15,41 @@
 void CJX_Connect::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Connect::timeout(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Connect::connection(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Connect::usage(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Connect::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Connect::delayedOpen(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Connect::ref(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_connectstring.cpp b/fxjs/xfa/cjx_connectstring.cpp
index 75c6359..8edd66a 100644
--- a/fxjs/xfa/cjx_connectstring.cpp
+++ b/fxjs/xfa/cjx_connectstring.cpp
@@ -16,11 +16,11 @@
 void CJX_ConnectString::use(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ConnectString::usehref(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_contentarea.cpp b/fxjs/xfa/cjx_contentarea.cpp
index d1e74e7..3d081b1 100644
--- a/fxjs/xfa/cjx_contentarea.cpp
+++ b/fxjs/xfa/cjx_contentarea.cpp
@@ -16,29 +16,29 @@
 void CJX_ContentArea::x(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ContentArea::y(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ContentArea::use(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ContentArea::relevant(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ContentArea::usehref(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_corner.cpp b/fxjs/xfa/cjx_corner.cpp
index 2ed1922..e381153 100644
--- a/fxjs/xfa/cjx_corner.cpp
+++ b/fxjs/xfa/cjx_corner.cpp
@@ -15,47 +15,47 @@
 void CJX_Corner::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Corner::stroke(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Corner::presence(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Corner::inverted(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Corner::thickness(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Corner::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Corner::join(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Corner::radius(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_datavalue.cpp b/fxjs/xfa/cjx_datavalue.cpp
index b90ed45..e46ab89 100644
--- a/fxjs/xfa/cjx_datavalue.cpp
+++ b/fxjs/xfa/cjx_datavalue.cpp
@@ -15,19 +15,19 @@
 void CJX_DataValue::contentType(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DataValue::contains(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DataValue::defaultValue(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_DataValue::value(CFXJSE_Value* pValue,
@@ -39,5 +39,5 @@
 void CJX_DataValue::isNull(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_BOOL(pValue, bSetting, eAttribute);
+  ScriptAttributeBool(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_date.cpp b/fxjs/xfa/cjx_date.cpp
index ade95a9..1ee8b60 100644
--- a/fxjs/xfa/cjx_date.cpp
+++ b/fxjs/xfa/cjx_date.cpp
@@ -15,19 +15,19 @@
 void CJX_Date::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Date::defaultValue(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Date::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Date::value(CFXJSE_Value* pValue,
diff --git a/fxjs/xfa/cjx_datetime.cpp b/fxjs/xfa/cjx_datetime.cpp
index 35ffd05..0d0434a 100644
--- a/fxjs/xfa/cjx_datetime.cpp
+++ b/fxjs/xfa/cjx_datetime.cpp
@@ -15,23 +15,23 @@
 void CJX_DateTime::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DateTime::defaultValue(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_DateTime::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DateTime::value(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_datetimeedit.cpp b/fxjs/xfa/cjx_datetimeedit.cpp
index 284dbf0..90e246a 100644
--- a/fxjs/xfa/cjx_datetimeedit.cpp
+++ b/fxjs/xfa/cjx_datetimeedit.cpp
@@ -15,17 +15,17 @@
 void CJX_DateTimeEdit::use(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DateTimeEdit::usehref(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DateTimeEdit::hScrollPolicy(CFXJSE_Value* pValue,
                                      bool bSetting,
                                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_decimal.cpp b/fxjs/xfa/cjx_decimal.cpp
index 66763ba..e93ccbf 100644
--- a/fxjs/xfa/cjx_decimal.cpp
+++ b/fxjs/xfa/cjx_decimal.cpp
@@ -15,35 +15,35 @@
 void CJX_Decimal::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Decimal::fracDigits(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Decimal::defaultValue(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Decimal::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Decimal::value(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Decimal::leadDigits(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_defaultui.cpp b/fxjs/xfa/cjx_defaultui.cpp
index 63995cd..057f24d 100644
--- a/fxjs/xfa/cjx_defaultui.cpp
+++ b/fxjs/xfa/cjx_defaultui.cpp
@@ -15,11 +15,11 @@
 void CJX_DefaultUi::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DefaultUi::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_delete.cpp b/fxjs/xfa/cjx_delete.cpp
index 35fe991..fec6d78 100644
--- a/fxjs/xfa/cjx_delete.cpp
+++ b/fxjs/xfa/cjx_delete.cpp
@@ -15,11 +15,11 @@
 void CJX_Delete::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Delete::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_desc.cpp b/fxjs/xfa/cjx_desc.cpp
index 84659b1..b38bc28 100644
--- a/fxjs/xfa/cjx_desc.cpp
+++ b/fxjs/xfa/cjx_desc.cpp
@@ -32,11 +32,11 @@
 void CJX_Desc::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Desc::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_digestmethod.cpp b/fxjs/xfa/cjx_digestmethod.cpp
index b85fc00..6de767d 100644
--- a/fxjs/xfa/cjx_digestmethod.cpp
+++ b/fxjs/xfa/cjx_digestmethod.cpp
@@ -15,11 +15,11 @@
 void CJX_DigestMethod::use(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DigestMethod::usehref(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_digestmethods.cpp b/fxjs/xfa/cjx_digestmethods.cpp
index ae7cbcd..a63f453 100644
--- a/fxjs/xfa/cjx_digestmethods.cpp
+++ b/fxjs/xfa/cjx_digestmethods.cpp
@@ -16,17 +16,17 @@
 void CJX_DigestMethods::use(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DigestMethods::type(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_DigestMethods::usehref(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_draw.cpp b/fxjs/xfa/cjx_draw.cpp
index 8408d85..9df7014 100644
--- a/fxjs/xfa/cjx_draw.cpp
+++ b/fxjs/xfa/cjx_draw.cpp
@@ -16,85 +16,85 @@
 void CJX_Draw::h(CFXJSE_Value* pValue,
                  bool bSetting,
                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::w(CFXJSE_Value* pValue,
                  bool bSetting,
                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::x(CFXJSE_Value* pValue,
                  bool bSetting,
                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::y(CFXJSE_Value* pValue,
                  bool bSetting,
                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::hAlign(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::rotate(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::presence(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::vAlign(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::maxH(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::maxW(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::minH(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::minW(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::relevant(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::rawValue(CFXJSE_Value* pValue,
@@ -130,23 +130,23 @@
 void CJX_Draw::colSpan(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::locale(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Draw::anchorType(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_edge.cpp b/fxjs/xfa/cjx_edge.cpp
index ea1fa35..63fe2c2 100644
--- a/fxjs/xfa/cjx_edge.cpp
+++ b/fxjs/xfa/cjx_edge.cpp
@@ -15,35 +15,35 @@
 void CJX_Edge::cap(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Edge::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Edge::stroke(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Edge::presence(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Edge::thickness(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Edge::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_encoding.cpp b/fxjs/xfa/cjx_encoding.cpp
index debfe40..a83ab9a 100644
--- a/fxjs/xfa/cjx_encoding.cpp
+++ b/fxjs/xfa/cjx_encoding.cpp
@@ -15,11 +15,11 @@
 void CJX_Encoding::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Encoding::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_encodings.cpp b/fxjs/xfa/cjx_encodings.cpp
index 667929f..b3004a5 100644
--- a/fxjs/xfa/cjx_encodings.cpp
+++ b/fxjs/xfa/cjx_encodings.cpp
@@ -15,17 +15,17 @@
 void CJX_Encodings::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Encodings::type(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Encodings::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_encrypt.cpp b/fxjs/xfa/cjx_encrypt.cpp
index dbed1f2..566a54b 100644
--- a/fxjs/xfa/cjx_encrypt.cpp
+++ b/fxjs/xfa/cjx_encrypt.cpp
@@ -15,7 +15,7 @@
 void CJX_Encrypt::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Encrypt::format(CFXJSE_Value* pValue,
@@ -25,5 +25,5 @@
 void CJX_Encrypt::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_event.cpp b/fxjs/xfa/cjx_event.cpp
index 8cb2bce..9ac493e 100644
--- a/fxjs/xfa/cjx_event.cpp
+++ b/fxjs/xfa/cjx_event.cpp
@@ -15,23 +15,23 @@
 void CJX_Event::ref(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Event::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Event::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Event::activity(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_exclgroup.cpp b/fxjs/xfa/cjx_exclgroup.cpp
index a076e68..a97b076 100644
--- a/fxjs/xfa/cjx_exclgroup.cpp
+++ b/fxjs/xfa/cjx_exclgroup.cpp
@@ -146,149 +146,149 @@
 void CJX_ExclGroup::access(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::accessKey(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::anchorType(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::borderColor(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Som_BorderColor(pValue, bSetting, eAttribute);
+  ScriptSomBorderColor(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::borderWidth(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Som_BorderWidth(pValue, bSetting, eAttribute);
+  ScriptSomBorderWidth(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::colSpan(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::fillColor(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Som_FillColor(pValue, bSetting, eAttribute);
+  ScriptSomFillColor(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::h(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::hAlign(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::layout(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::mandatory(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Som_Mandatory(pValue, bSetting, eAttribute);
+  ScriptSomMandatory(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::mandatoryMessage(CFXJSE_Value* pValue,
                                      bool bSetting,
                                      XFA_Attribute eAttribute) {
-  Script_Som_MandatoryMessage(pValue, bSetting, eAttribute);
+  ScriptSomMandatoryMessage(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::maxH(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::maxW(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::minH(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::minW(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::presence(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::relevant(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::validationMessage(CFXJSE_Value* pValue,
                                       bool bSetting,
                                       XFA_Attribute eAttribute) {
-  Script_Som_ValidationMessage(pValue, bSetting, eAttribute);
+  ScriptSomValidationMessage(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::vAlign(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::w(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::x(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExclGroup::y(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_exdata.cpp b/fxjs/xfa/cjx_exdata.cpp
index 6ce72c4..66085a2 100644
--- a/fxjs/xfa/cjx_exdata.cpp
+++ b/fxjs/xfa/cjx_exdata.cpp
@@ -15,41 +15,41 @@
 void CJX_ExData::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExData::contentType(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExData::transferEncoding(CFXJSE_Value* pValue,
                                   bool bSetting,
                                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExData::defaultValue(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExData::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExData::maxLength(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExData::href(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_execute.cpp b/fxjs/xfa/cjx_execute.cpp
index 5fc4a77..4b843b3 100644
--- a/fxjs/xfa/cjx_execute.cpp
+++ b/fxjs/xfa/cjx_execute.cpp
@@ -15,29 +15,29 @@
 void CJX_Execute::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Execute::connection(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Execute::runAt(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Execute::executeType(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Execute::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_exobject.cpp b/fxjs/xfa/cjx_exobject.cpp
index 2252d53..47a7688 100644
--- a/fxjs/xfa/cjx_exobject.cpp
+++ b/fxjs/xfa/cjx_exobject.cpp
@@ -15,35 +15,35 @@
 void CJX_ExObject::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExObject::codeType(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExObject::archive(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExObject::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExObject::codeBase(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ExObject::classId(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_extras.cpp b/fxjs/xfa/cjx_extras.cpp
index 73ea8ea..227d909 100644
--- a/fxjs/xfa/cjx_extras.cpp
+++ b/fxjs/xfa/cjx_extras.cpp
@@ -15,7 +15,7 @@
 void CJX_Extras::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Extras::type(CFXJSE_Value* pValue,
@@ -25,5 +25,5 @@
 void CJX_Extras::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_field.cpp b/fxjs/xfa/cjx_field.cpp
index a80bc44..e697319 100644
--- a/fxjs/xfa/cjx_field.cpp
+++ b/fxjs/xfa/cjx_field.cpp
@@ -311,7 +311,7 @@
 void CJX_Field::formatMessage(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Som_Message(pValue, bSetting, XFA_SOM_FormatMessage);
+  ScriptSomMessage(pValue, bSetting, XFA_SOM_FormatMessage);
 }
 
 void CJX_Field::formattedValue(CFXJSE_Value* pValue,
@@ -363,109 +363,109 @@
 void CJX_Field::access(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::accessKey(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::anchorType(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::borderColor(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Som_BorderColor(pValue, bSetting, eAttribute);
+  ScriptSomBorderColor(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::borderWidth(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Som_BorderWidth(pValue, bSetting, eAttribute);
+  ScriptSomBorderWidth(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::colSpan(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::fillColor(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Som_FillColor(pValue, bSetting, eAttribute);
+  ScriptSomFillColor(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::fontColor(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Som_FontColor(pValue, bSetting, eAttribute);
+  ScriptSomFontColor(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::h(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::hAlign(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::locale(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::mandatory(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Som_Mandatory(pValue, bSetting, eAttribute);
+  ScriptSomMandatory(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::mandatoryMessage(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Som_MandatoryMessage(pValue, bSetting, eAttribute);
+  ScriptSomMandatoryMessage(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::maxH(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::maxW(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::minH(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::minW(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::presence(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::rawValue(CFXJSE_Value* pValue,
@@ -477,53 +477,53 @@
 void CJX_Field::relevant(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::rotate(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::validationMessage(CFXJSE_Value* pValue,
                                   bool bSetting,
                                   XFA_Attribute eAttribute) {
-  Script_Som_ValidationMessage(pValue, bSetting, eAttribute);
+  ScriptSomValidationMessage(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::vAlign(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::w(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::x(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Field::y(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_fill.cpp b/fxjs/xfa/cjx_fill.cpp
index 1c6aa95..1850b15 100644
--- a/fxjs/xfa/cjx_fill.cpp
+++ b/fxjs/xfa/cjx_fill.cpp
@@ -15,17 +15,17 @@
 void CJX_Fill::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Fill::presence(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Fill::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_filter.cpp b/fxjs/xfa/cjx_filter.cpp
index e43dfa8..1ed925d 100644
--- a/fxjs/xfa/cjx_filter.cpp
+++ b/fxjs/xfa/cjx_filter.cpp
@@ -15,17 +15,17 @@
 void CJX_Filter::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Filter::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Filter::addRevocationInfo(CFXJSE_Value* pValue,
                                    bool bSetting,
                                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_float.cpp b/fxjs/xfa/cjx_float.cpp
index 0480812..0d7f4c6 100644
--- a/fxjs/xfa/cjx_float.cpp
+++ b/fxjs/xfa/cjx_float.cpp
@@ -15,19 +15,19 @@
 void CJX_Float::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Float::defaultValue(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Float::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Float::value(CFXJSE_Value* pValue,
diff --git a/fxjs/xfa/cjx_font.cpp b/fxjs/xfa/cjx_font.cpp
index d0c6237..ccfc14d 100644
--- a/fxjs/xfa/cjx_font.cpp
+++ b/fxjs/xfa/cjx_font.cpp
@@ -15,101 +15,101 @@
 void CJX_Font::lineThrough(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::typeface(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::fontHorizontalScale(CFXJSE_Value* pValue,
                                    bool bSetting,
                                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::kerningMode(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::underline(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::baselineShift(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::overlinePeriod(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::letterSpacing(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::lineThroughPeriod(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::fontVerticalScale(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::size(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::posture(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::weight(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::underlinePeriod(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Font::overline(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_format.cpp b/fxjs/xfa/cjx_format.cpp
index 9786502..7b58018 100644
--- a/fxjs/xfa/cjx_format.cpp
+++ b/fxjs/xfa/cjx_format.cpp
@@ -15,11 +15,11 @@
 void CJX_Format::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Format::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_handler.cpp b/fxjs/xfa/cjx_handler.cpp
index 3e09a75..f49e219 100644
--- a/fxjs/xfa/cjx_handler.cpp
+++ b/fxjs/xfa/cjx_handler.cpp
@@ -15,13 +15,13 @@
 void CJX_Handler::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Handler::type(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Handler::version(CFXJSE_Value* pValue,
@@ -31,5 +31,5 @@
 void CJX_Handler::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_image.cpp b/fxjs/xfa/cjx_image.cpp
index 0ea2131..51558f1 100644
--- a/fxjs/xfa/cjx_image.cpp
+++ b/fxjs/xfa/cjx_image.cpp
@@ -15,47 +15,47 @@
 void CJX_Image::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Image::contentType(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Image::transferEncoding(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Image::defaultValue(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue_Read(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue_Read(pValue, bSetting, eAttribute);
 }
 
 void CJX_Image::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Image::aspect(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Image::value(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue_Read(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue_Read(pValue, bSetting, eAttribute);
 }
 
 void CJX_Image::href(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_imageedit.cpp b/fxjs/xfa/cjx_imageedit.cpp
index a325eca..cd8854f 100644
--- a/fxjs/xfa/cjx_imageedit.cpp
+++ b/fxjs/xfa/cjx_imageedit.cpp
@@ -15,17 +15,17 @@
 void CJX_ImageEdit::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ImageEdit::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ImageEdit::data(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_insert.cpp b/fxjs/xfa/cjx_insert.cpp
index cf2ae32..a9a0b3c 100644
--- a/fxjs/xfa/cjx_insert.cpp
+++ b/fxjs/xfa/cjx_insert.cpp
@@ -15,11 +15,11 @@
 void CJX_Insert::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Insert::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_integer.cpp b/fxjs/xfa/cjx_integer.cpp
index f1840dd..4b8e173 100644
--- a/fxjs/xfa/cjx_integer.cpp
+++ b/fxjs/xfa/cjx_integer.cpp
@@ -15,19 +15,19 @@
 void CJX_Integer::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Integer::defaultValue(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Integer::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Integer::value(CFXJSE_Value* pValue,
diff --git a/fxjs/xfa/cjx_issuers.cpp b/fxjs/xfa/cjx_issuers.cpp
index 5cd381d..4fe7078 100644
--- a/fxjs/xfa/cjx_issuers.cpp
+++ b/fxjs/xfa/cjx_issuers.cpp
@@ -15,17 +15,17 @@
 void CJX_Issuers::type(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Issuers::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Issuers::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_items.cpp b/fxjs/xfa/cjx_items.cpp
index e4afdd0..375b30f 100644
--- a/fxjs/xfa/cjx_items.cpp
+++ b/fxjs/xfa/cjx_items.cpp
@@ -15,29 +15,29 @@
 void CJX_Items::ref(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Items::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Items::presence(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Items::save(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Items::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_keep.cpp b/fxjs/xfa/cjx_keep.cpp
index 25238e3..758c863 100644
--- a/fxjs/xfa/cjx_keep.cpp
+++ b/fxjs/xfa/cjx_keep.cpp
@@ -15,29 +15,29 @@
 void CJX_Keep::next(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Keep::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Keep::previous(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Keep::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Keep::intact(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_keyusage.cpp b/fxjs/xfa/cjx_keyusage.cpp
index 99947e9..908a8da 100644
--- a/fxjs/xfa/cjx_keyusage.cpp
+++ b/fxjs/xfa/cjx_keyusage.cpp
@@ -15,71 +15,71 @@
 void CJX_KeyUsage::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::nonRepudiation(CFXJSE_Value* pValue,
                                   bool bSetting,
                                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::encipherOnly(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::type(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::digitalSignature(CFXJSE_Value* pValue,
                                     bool bSetting,
                                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::crlSign(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::keyAgreement(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::keyEncipherment(CFXJSE_Value* pValue,
                                    bool bSetting,
                                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::dataEncipherment(CFXJSE_Value* pValue,
                                     bool bSetting,
                                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::keyCertSign(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_KeyUsage::decipherOnly(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_line.cpp b/fxjs/xfa/cjx_line.cpp
index 4856939..268506e 100644
--- a/fxjs/xfa/cjx_line.cpp
+++ b/fxjs/xfa/cjx_line.cpp
@@ -15,23 +15,23 @@
 void CJX_Line::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Line::slope(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Line::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Line::hand(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_linear.cpp b/fxjs/xfa/cjx_linear.cpp
index 1c22699..0d6d286 100644
--- a/fxjs/xfa/cjx_linear.cpp
+++ b/fxjs/xfa/cjx_linear.cpp
@@ -15,17 +15,17 @@
 void CJX_Linear::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Linear::type(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Linear::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_manifest.cpp b/fxjs/xfa/cjx_manifest.cpp
index 458ae01..d8c95cb 100644
--- a/fxjs/xfa/cjx_manifest.cpp
+++ b/fxjs/xfa/cjx_manifest.cpp
@@ -35,23 +35,23 @@
 void CJX_Manifest::defaultValue(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Manifest::action(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Manifest::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Manifest::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_map.cpp b/fxjs/xfa/cjx_map.cpp
index 7a1fa14..ab6dadf 100644
--- a/fxjs/xfa/cjx_map.cpp
+++ b/fxjs/xfa/cjx_map.cpp
@@ -15,23 +15,23 @@
 void CJX_Map::use(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Map::bind(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Map::usehref(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Map::from(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_margin.cpp b/fxjs/xfa/cjx_margin.cpp
index 62a180b..6c99f5d 100644
--- a/fxjs/xfa/cjx_margin.cpp
+++ b/fxjs/xfa/cjx_margin.cpp
@@ -15,35 +15,35 @@
 void CJX_Margin::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Margin::leftInset(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Margin::bottomInset(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Margin::topInset(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Margin::rightInset(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Margin::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_mdp.cpp b/fxjs/xfa/cjx_mdp.cpp
index 59730f6..ce29293 100644
--- a/fxjs/xfa/cjx_mdp.cpp
+++ b/fxjs/xfa/cjx_mdp.cpp
@@ -15,23 +15,23 @@
 void CJX_Mdp::use(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Mdp::signatureType(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Mdp::usehref(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Mdp::permissions(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_medium.cpp b/fxjs/xfa/cjx_medium.cpp
index e8986d9..41ccfb2 100644
--- a/fxjs/xfa/cjx_medium.cpp
+++ b/fxjs/xfa/cjx_medium.cpp
@@ -15,41 +15,41 @@
 void CJX_Medium::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Medium::orientation(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Medium::imagingBBox(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Medium::shortValue(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Medium::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Medium::stock(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Medium::longValue(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_message.cpp b/fxjs/xfa/cjx_message.cpp
index c9f3f6a..13ae53b 100644
--- a/fxjs/xfa/cjx_message.cpp
+++ b/fxjs/xfa/cjx_message.cpp
@@ -15,11 +15,11 @@
 void CJX_Message::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Message::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_node.cpp b/fxjs/xfa/cjx_node.cpp
index a030269..49e8b96 100644
--- a/fxjs/xfa/cjx_node.cpp
+++ b/fxjs/xfa/cjx_node.cpp
@@ -439,7 +439,7 @@
 void CJX_Node::id(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Node::ns(CFXJSE_Value* pValue,
diff --git a/fxjs/xfa/cjx_numericedit.cpp b/fxjs/xfa/cjx_numericedit.cpp
index c76cc66..2f5af95 100644
--- a/fxjs/xfa/cjx_numericedit.cpp
+++ b/fxjs/xfa/cjx_numericedit.cpp
@@ -15,17 +15,17 @@
 void CJX_NumericEdit::use(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_NumericEdit::usehref(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_NumericEdit::hScrollPolicy(CFXJSE_Value* pValue,
                                     bool bSetting,
                                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_object.cpp b/fxjs/xfa/cjx_object.cpp
index cd95fd1..3aba1a4 100644
--- a/fxjs/xfa/cjx_object.cpp
+++ b/fxjs/xfa/cjx_object.cpp
@@ -1145,9 +1145,9 @@
   return std::move(calc_data_);
 }
 
-void CJX_Object::Script_Attribute_String(CFXJSE_Value* pValue,
-                                         bool bSetting,
-                                         XFA_Attribute eAttribute) {
+void CJX_Object::ScriptAttributeString(CFXJSE_Value* pValue,
+                                       bool bSetting,
+                                       XFA_Attribute eAttribute) {
   if (!bSetting) {
     pValue->SetString(GetAttribute(eAttribute).ToUTF8().AsStringView());
     return;
@@ -1212,9 +1212,9 @@
   pProtoForm = nullptr;
 }
 
-void CJX_Object::Script_Attribute_BOOL(CFXJSE_Value* pValue,
-                                       bool bSetting,
-                                       XFA_Attribute eAttribute) {
+void CJX_Object::ScriptAttributeBool(CFXJSE_Value* pValue,
+                                     bool bSetting,
+                                     XFA_Attribute eAttribute) {
   if (bSetting) {
     SetBoolean(eAttribute, pValue->ToBoolean(), true);
     return;
@@ -1222,9 +1222,9 @@
   pValue->SetString(GetBoolean(eAttribute) ? "1" : "0");
 }
 
-void CJX_Object::Script_Attribute_Integer(CFXJSE_Value* pValue,
-                                          bool bSetting,
-                                          XFA_Attribute eAttribute) {
+void CJX_Object::ScriptAttributeInteger(CFXJSE_Value* pValue,
+                                        bool bSetting,
+                                        XFA_Attribute eAttribute) {
   if (bSetting) {
     SetInteger(eAttribute, pValue->ToInteger(), true);
     return;
@@ -1232,9 +1232,9 @@
   pValue->SetInteger(GetInteger(eAttribute));
 }
 
-void CJX_Object::Script_Som_FontColor(CFXJSE_Value* pValue,
-                                      bool bSetting,
-                                      XFA_Attribute eAttribute) {
+void CJX_Object::ScriptSomFontColor(CFXJSE_Value* pValue,
+                                    bool bSetting,
+                                    XFA_Attribute eAttribute) {
   CXFA_Font* font = ToNode(object_.Get())->GetOrCreateFontIfPossible();
   if (!font)
     return;
@@ -1257,9 +1257,9 @@
   pValue->SetString(ByteString::Format("%d,%d,%d", r, g, b).AsStringView());
 }
 
-void CJX_Object::Script_Som_FillColor(CFXJSE_Value* pValue,
-                                      bool bSetting,
-                                      XFA_Attribute eAttribute) {
+void CJX_Object::ScriptSomFillColor(CFXJSE_Value* pValue,
+                                    bool bSetting,
+                                    XFA_Attribute eAttribute) {
   CXFA_Border* border = ToNode(object_.Get())->GetOrCreateBorderIfPossible();
   CXFA_Fill* borderfill = border->GetOrCreateFillIfPossible();
   if (!borderfill)
@@ -1285,9 +1285,9 @@
       WideString::Format(L"%d,%d,%d", r, g, b).ToUTF8().AsStringView());
 }
 
-void CJX_Object::Script_Som_BorderColor(CFXJSE_Value* pValue,
-                                        bool bSetting,
-                                        XFA_Attribute eAttribute) {
+void CJX_Object::ScriptSomBorderColor(CFXJSE_Value* pValue,
+                                      bool bSetting,
+                                      XFA_Attribute eAttribute) {
   CXFA_Border* border = ToNode(object_.Get())->GetOrCreateBorderIfPossible();
   int32_t iSize = border->CountEdges();
   if (bSetting) {
@@ -1316,9 +1316,9 @@
       WideString::Format(L"%d,%d,%d", r, g, b).ToUTF8().AsStringView());
 }
 
-void CJX_Object::Script_Som_BorderWidth(CFXJSE_Value* pValue,
-                                        bool bSetting,
-                                        XFA_Attribute eAttribute) {
+void CJX_Object::ScriptSomBorderWidth(CFXJSE_Value* pValue,
+                                      bool bSetting,
+                                      XFA_Attribute eAttribute) {
   CXFA_Border* border = ToNode(object_.Get())->GetOrCreateBorderIfPossible();
   if (bSetting) {
     CXFA_Edge* edge = border->GetEdgeIfExists(0);
@@ -1336,9 +1336,9 @@
   }
 }
 
-void CJX_Object::Script_Som_Message(CFXJSE_Value* pValue,
-                                    bool bSetting,
-                                    XFA_SOM_MESSAGETYPE iMessageType) {
+void CJX_Object::ScriptSomMessage(CFXJSE_Value* pValue,
+                                  bool bSetting,
+                                  XFA_SOM_MESSAGETYPE iMessageType) {
   bool bNew = false;
   CXFA_Validate* validate = ToNode(object_.Get())->GetValidateIfExists();
   if (!validate) {
@@ -1396,21 +1396,21 @@
   pValue->SetString(wsMessage.ToUTF8().AsStringView());
 }
 
-void CJX_Object::Script_Som_ValidationMessage(CFXJSE_Value* pValue,
-                                              bool bSetting,
-                                              XFA_Attribute eAttribute) {
-  Script_Som_Message(pValue, bSetting, XFA_SOM_ValidationMessage);
+void CJX_Object::ScriptSomValidationMessage(CFXJSE_Value* pValue,
+                                            bool bSetting,
+                                            XFA_Attribute eAttribute) {
+  ScriptSomMessage(pValue, bSetting, XFA_SOM_ValidationMessage);
 }
 
-void CJX_Object::Script_Som_MandatoryMessage(CFXJSE_Value* pValue,
-                                             bool bSetting,
-                                             XFA_Attribute eAttribute) {
-  Script_Som_Message(pValue, bSetting, XFA_SOM_MandatoryMessage);
+void CJX_Object::ScriptSomMandatoryMessage(CFXJSE_Value* pValue,
+                                           bool bSetting,
+                                           XFA_Attribute eAttribute) {
+  ScriptSomMessage(pValue, bSetting, XFA_SOM_MandatoryMessage);
 }
 
-void CJX_Object::Script_Field_Length(CFXJSE_Value* pValue,
-                                     bool bSetting,
-                                     XFA_Attribute eAttribute) {
+void CJX_Object::ScriptFieldLength(CFXJSE_Value* pValue,
+                                   bool bSetting,
+                                   XFA_Attribute eAttribute) {
   if (bSetting) {
     ThrowInvalidPropertyException();
     return;
@@ -1424,9 +1424,9 @@
   pValue->SetInteger(node->CountChoiceListItems(true));
 }
 
-void CJX_Object::Script_Som_DefaultValue(CFXJSE_Value* pValue,
-                                         bool bSetting,
-                                         XFA_Attribute /* unused */) {
+void CJX_Object::ScriptSomDefaultValue(CFXJSE_Value* pValue,
+                                       bool bSetting,
+                                       XFA_Attribute /* unused */) {
   XFA_Element eType = ToNode(GetXFAObject())->GetElementType();
 
   // TODO(dsinclair): This should look through the properties on the node to see
@@ -1497,9 +1497,9 @@
   }
 }
 
-void CJX_Object::Script_Som_DefaultValue_Read(CFXJSE_Value* pValue,
-                                              bool bSetting,
-                                              XFA_Attribute eAttribute) {
+void CJX_Object::ScriptSomDefaultValue_Read(CFXJSE_Value* pValue,
+                                            bool bSetting,
+                                            XFA_Attribute eAttribute) {
   if (bSetting) {
     ThrowInvalidPropertyException();
     return;
@@ -1513,9 +1513,9 @@
   pValue->SetString(content.ToUTF8().AsStringView());
 }
 
-void CJX_Object::Script_Som_DataNode(CFXJSE_Value* pValue,
-                                     bool bSetting,
-                                     XFA_Attribute eAttribute) {
+void CJX_Object::ScriptSomDataNode(CFXJSE_Value* pValue,
+                                   bool bSetting,
+                                   XFA_Attribute eAttribute) {
   if (bSetting) {
     ThrowInvalidPropertyException();
     return;
@@ -1531,9 +1531,9 @@
       GetDocument()->GetScriptContext()->GetJSValueFromMap(pDataNode));
 }
 
-void CJX_Object::Script_Som_Mandatory(CFXJSE_Value* pValue,
-                                      bool bSetting,
-                                      XFA_Attribute eAttribute) {
+void CJX_Object::ScriptSomMandatory(CFXJSE_Value* pValue,
+                                    bool bSetting,
+                                    XFA_Attribute eAttribute) {
   CXFA_Validate* validate =
       ToNode(object_.Get())->GetOrCreateValidateIfPossible();
   if (!validate)
@@ -1547,9 +1547,9 @@
   pValue->SetString(CXFA_Node::AttributeEnumToName(validate->GetNullTest()));
 }
 
-void CJX_Object::Script_Som_InstanceIndex(CFXJSE_Value* pValue,
-                                          bool bSetting,
-                                          XFA_Attribute eAttribute) {
+void CJX_Object::ScriptSomInstanceIndex(CFXJSE_Value* pValue,
+                                        bool bSetting,
+                                        XFA_Attribute eAttribute) {
   if (!bSetting) {
     pValue->SetInteger(Subform_and_SubformSet_InstanceIndex());
     return;
@@ -1586,9 +1586,9 @@
   }
 }
 
-void CJX_Object::Script_Subform_InstanceManager(CFXJSE_Value* pValue,
-                                                bool bSetting,
-                                                XFA_AttributeEnum eAttribute) {
+void CJX_Object::ScriptSubformInstanceManager(CFXJSE_Value* pValue,
+                                              bool bSetting,
+                                              XFA_AttributeEnum eAttribute) {
   if (bSetting) {
     ThrowInvalidPropertyException();
     return;
@@ -1617,13 +1617,13 @@
       GetDocument()->GetScriptContext()->GetJSValueFromMap(pInstanceMgr));
 }
 
-void CJX_Object::Script_SubmitFormat_Mode(CFXJSE_Value* pValue,
-                                          bool bSetting,
-                                          XFA_Attribute eAttribute) {}
+void CJX_Object::ScriptSubmitFormatMode(CFXJSE_Value* pValue,
+                                        bool bSetting,
+                                        XFA_Attribute eAttribute) {}
 
-void CJX_Object::Script_Form_Checksum(CFXJSE_Value* pValue,
-                                      bool bSetting,
-                                      XFA_Attribute eAttribute) {
+void CJX_Object::ScriptFormChecksumS(CFXJSE_Value* pValue,
+                                     bool bSetting,
+                                     XFA_Attribute eAttribute) {
   if (bSetting) {
     SetAttribute(XFA_Attribute::Checksum, pValue->ToWideString().AsStringView(),
                  false);
@@ -1634,9 +1634,9 @@
   pValue->SetString(checksum ? checksum->ToUTF8().AsStringView() : "");
 }
 
-void CJX_Object::Script_ExclGroup_ErrorText(CFXJSE_Value* pValue,
-                                            bool bSetting,
-                                            XFA_Attribute eAttribute) {
+void CJX_Object::ScriptExclGroupErrorText(CFXJSE_Value* pValue,
+                                          bool bSetting,
+                                          XFA_Attribute eAttribute) {
   if (bSetting)
     ThrowInvalidPropertyException();
 }
diff --git a/fxjs/xfa/cjx_object.h b/fxjs/xfa/cjx_object.h
index 288c6b3..90e5ec4 100644
--- a/fxjs/xfa/cjx_object.h
+++ b/fxjs/xfa/cjx_object.h
@@ -113,67 +113,67 @@
                          bool bNotify,
                          bool bScriptModify);
 
-  void Script_Attribute_String(CFXJSE_Value* pValue,
-                               bool bSetting,
-                               XFA_Attribute eAttribute);
-  void Script_Attribute_BOOL(CFXJSE_Value* pValue,
+  void ScriptAttributeString(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute);
-  void Script_Attribute_Integer(CFXJSE_Value* pValue,
-                                bool bSetting,
-                                XFA_Attribute eAttribute);
+  void ScriptAttributeBool(CFXJSE_Value* pValue,
+                           bool bSetting,
+                           XFA_Attribute eAttribute);
+  void ScriptAttributeInteger(CFXJSE_Value* pValue,
+                              bool bSetting,
+                              XFA_Attribute eAttribute);
 
-  void Script_Som_FontColor(CFXJSE_Value* pValue,
-                            bool bSetting,
-                            XFA_Attribute eAttribute);
-  void Script_Som_FillColor(CFXJSE_Value* pValue,
-                            bool bSetting,
-                            XFA_Attribute eAttribute);
-  void Script_Som_BorderColor(CFXJSE_Value* pValue,
-                              bool bSetting,
-                              XFA_Attribute eAttribute);
-  void Script_Som_BorderWidth(CFXJSE_Value* pValue,
-                              bool bSetting,
-                              XFA_Attribute eAttribute);
-  void Script_Som_ValidationMessage(CFXJSE_Value* pValue,
-                                    bool bSetting,
-                                    XFA_Attribute eAttribute);
-  void Script_Som_MandatoryMessage(CFXJSE_Value* pValue,
-                                   bool bSetting,
-                                   XFA_Attribute eAttribute);
-  void Script_Field_Length(CFXJSE_Value* pValue,
-                           bool bSetting,
-                           XFA_Attribute eAttribute);
-  void Script_Som_DefaultValue(CFXJSE_Value* pValue,
-                               bool bSetting,
-                               XFA_Attribute eAttribute);
-  void Script_Som_DefaultValue_Read(CFXJSE_Value* pValue,
-                                    bool bSetting,
-                                    XFA_Attribute eAttribute);
-  void Script_Som_DataNode(CFXJSE_Value* pValue,
-                           bool bSetting,
-                           XFA_Attribute eAttribute);
-  void Script_Som_Mandatory(CFXJSE_Value* pValue,
-                            bool bSetting,
-                            XFA_Attribute eAttribute);
-  void Script_Som_InstanceIndex(CFXJSE_Value* pValue,
-                                bool bSetting,
-                                XFA_Attribute eAttribute);
-  void Script_Som_Message(CFXJSE_Value* pValue,
+  void ScriptSomFontColor(CFXJSE_Value* pValue,
                           bool bSetting,
-                          XFA_SOM_MESSAGETYPE iMessageType);
-  void Script_Subform_InstanceManager(CFXJSE_Value* pValue,
-                                      bool bSetting,
-                                      XFA_AttributeEnum eAttribute);
-  void Script_SubmitFormat_Mode(CFXJSE_Value* pValue,
-                                bool bSetting,
-                                XFA_Attribute eAttribute);
-  void Script_Form_Checksum(CFXJSE_Value* pValue,
+                          XFA_Attribute eAttribute);
+  void ScriptSomFillColor(CFXJSE_Value* pValue,
+                          bool bSetting,
+                          XFA_Attribute eAttribute);
+  void ScriptSomBorderColor(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute);
-  void Script_ExclGroup_ErrorText(CFXJSE_Value* pValue,
+  void ScriptSomBorderWidth(CFXJSE_Value* pValue,
+                            bool bSetting,
+                            XFA_Attribute eAttribute);
+  void ScriptSomValidationMessage(CFXJSE_Value* pValue,
                                   bool bSetting,
                                   XFA_Attribute eAttribute);
+  void ScriptSomMandatoryMessage(CFXJSE_Value* pValue,
+                                 bool bSetting,
+                                 XFA_Attribute eAttribute);
+  void ScriptFieldLength(CFXJSE_Value* pValue,
+                         bool bSetting,
+                         XFA_Attribute eAttribute);
+  void ScriptSomDefaultValue(CFXJSE_Value* pValue,
+                             bool bSetting,
+                             XFA_Attribute eAttribute);
+  void ScriptSomDefaultValue_Read(CFXJSE_Value* pValue,
+                                  bool bSetting,
+                                  XFA_Attribute eAttribute);
+  void ScriptSomDataNode(CFXJSE_Value* pValue,
+                         bool bSetting,
+                         XFA_Attribute eAttribute);
+  void ScriptSomMandatory(CFXJSE_Value* pValue,
+                          bool bSetting,
+                          XFA_Attribute eAttribute);
+  void ScriptSomInstanceIndex(CFXJSE_Value* pValue,
+                              bool bSetting,
+                              XFA_Attribute eAttribute);
+  void ScriptSomMessage(CFXJSE_Value* pValue,
+                        bool bSetting,
+                        XFA_SOM_MESSAGETYPE iMessageType);
+  void ScriptSubformInstanceManager(CFXJSE_Value* pValue,
+                                    bool bSetting,
+                                    XFA_AttributeEnum eAttribute);
+  void ScriptSubmitFormatMode(CFXJSE_Value* pValue,
+                              bool bSetting,
+                              XFA_Attribute eAttribute);
+  void ScriptFormChecksumS(CFXJSE_Value* pValue,
+                           bool bSetting,
+                           XFA_Attribute eAttribute);
+  void ScriptExclGroupErrorText(CFXJSE_Value* pValue,
+                                bool bSetting,
+                                XFA_Attribute eAttribute);
 
   Optional<WideString> TryNamespace();
 
diff --git a/fxjs/xfa/cjx_occur.cpp b/fxjs/xfa/cjx_occur.cpp
index f57cd96..2bce74b 100644
--- a/fxjs/xfa/cjx_occur.cpp
+++ b/fxjs/xfa/cjx_occur.cpp
@@ -40,17 +40,17 @@
 void CJX_Occur::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Occur::initial(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Occur::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_oid.cpp b/fxjs/xfa/cjx_oid.cpp
index 1320f8d..e6c3a01 100644
--- a/fxjs/xfa/cjx_oid.cpp
+++ b/fxjs/xfa/cjx_oid.cpp
@@ -15,11 +15,11 @@
 void CJX_Oid::use(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Oid::usehref(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_oids.cpp b/fxjs/xfa/cjx_oids.cpp
index a006974..aa4e041 100644
--- a/fxjs/xfa/cjx_oids.cpp
+++ b/fxjs/xfa/cjx_oids.cpp
@@ -15,17 +15,17 @@
 void CJX_Oids::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Oids::type(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Oids::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_operation.cpp b/fxjs/xfa/cjx_operation.cpp
index bb412bd..fd499e3 100644
--- a/fxjs/xfa/cjx_operation.cpp
+++ b/fxjs/xfa/cjx_operation.cpp
@@ -15,23 +15,23 @@
 void CJX_Operation::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Operation::output(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Operation::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Operation::input(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_overflow.cpp b/fxjs/xfa/cjx_overflow.cpp
index b6572d4..68d2890 100644
--- a/fxjs/xfa/cjx_overflow.cpp
+++ b/fxjs/xfa/cjx_overflow.cpp
@@ -15,29 +15,29 @@
 void CJX_Overflow::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Overflow::trailer(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Overflow::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Overflow::target(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Overflow::leader(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_pagearea.cpp b/fxjs/xfa/cjx_pagearea.cpp
index 4085d38..cbc5b49 100644
--- a/fxjs/xfa/cjx_pagearea.cpp
+++ b/fxjs/xfa/cjx_pagearea.cpp
@@ -15,47 +15,47 @@
 void CJX_PageArea::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageArea::pagePosition(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageArea::oddOrEven(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageArea::relevant(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageArea::initialNumber(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageArea::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageArea::numbered(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageArea::blankOrNotBlank(CFXJSE_Value* pValue,
                                    bool bSetting,
                                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_pageset.cpp b/fxjs/xfa/cjx_pageset.cpp
index cfab790..b8ad4b0 100644
--- a/fxjs/xfa/cjx_pageset.cpp
+++ b/fxjs/xfa/cjx_pageset.cpp
@@ -15,23 +15,23 @@
 void CJX_PageSet::relation(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageSet::relevant(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageSet::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PageSet::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_para.cpp b/fxjs/xfa/cjx_para.cpp
index 3a12e47..6e6369c 100644
--- a/fxjs/xfa/cjx_para.cpp
+++ b/fxjs/xfa/cjx_para.cpp
@@ -15,83 +15,83 @@
 void CJX_Para::hAlign(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::textIndent(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::marginRight(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::marginLeft(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::radixOffset(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::preserve(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::spaceBelow(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::vAlign(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::tabDefault(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::tabStops(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::lineHeight(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Para::spaceAbove(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_password.cpp b/fxjs/xfa/cjx_password.cpp
index a44354b..cd57789 100644
--- a/fxjs/xfa/cjx_password.cpp
+++ b/fxjs/xfa/cjx_password.cpp
@@ -15,11 +15,11 @@
 void CJX_Password::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Password::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_passwordedit.cpp b/fxjs/xfa/cjx_passwordedit.cpp
index 8b1c591..22b81fe 100644
--- a/fxjs/xfa/cjx_passwordedit.cpp
+++ b/fxjs/xfa/cjx_passwordedit.cpp
@@ -15,23 +15,23 @@
 void CJX_PasswordEdit::use(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PasswordEdit::passwordChar(CFXJSE_Value* pValue,
                                     bool bSetting,
                                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PasswordEdit::usehref(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_PasswordEdit::hScrollPolicy(CFXJSE_Value* pValue,
                                      bool bSetting,
                                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_pattern.cpp b/fxjs/xfa/cjx_pattern.cpp
index 5acaa84..7360a15 100644
--- a/fxjs/xfa/cjx_pattern.cpp
+++ b/fxjs/xfa/cjx_pattern.cpp
@@ -15,17 +15,17 @@
 void CJX_Pattern::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Pattern::type(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Pattern::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_picture.cpp b/fxjs/xfa/cjx_picture.cpp
index 81f5ec4..a00a645 100644
--- a/fxjs/xfa/cjx_picture.cpp
+++ b/fxjs/xfa/cjx_picture.cpp
@@ -15,23 +15,23 @@
 void CJX_Picture::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Picture::defaultValue(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Picture::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Picture::value(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_query.cpp b/fxjs/xfa/cjx_query.cpp
index f6f255f..a3e37a9 100644
--- a/fxjs/xfa/cjx_query.cpp
+++ b/fxjs/xfa/cjx_query.cpp
@@ -15,17 +15,17 @@
 void CJX_Query::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Query::commandType(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Query::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_radial.cpp b/fxjs/xfa/cjx_radial.cpp
index bd8b1a2..bb7c214 100644
--- a/fxjs/xfa/cjx_radial.cpp
+++ b/fxjs/xfa/cjx_radial.cpp
@@ -15,17 +15,17 @@
 void CJX_Radial::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Radial::type(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Radial::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_reason.cpp b/fxjs/xfa/cjx_reason.cpp
index c9bb6c3..c1f3549 100644
--- a/fxjs/xfa/cjx_reason.cpp
+++ b/fxjs/xfa/cjx_reason.cpp
@@ -15,11 +15,11 @@
 void CJX_Reason::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Reason::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_reasons.cpp b/fxjs/xfa/cjx_reasons.cpp
index 11a9868..53c8a0d 100644
--- a/fxjs/xfa/cjx_reasons.cpp
+++ b/fxjs/xfa/cjx_reasons.cpp
@@ -15,17 +15,17 @@
 void CJX_Reasons::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Reasons::type(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Reasons::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_recordset.cpp b/fxjs/xfa/cjx_recordset.cpp
index c4fe21f..d303864 100644
--- a/fxjs/xfa/cjx_recordset.cpp
+++ b/fxjs/xfa/cjx_recordset.cpp
@@ -17,47 +17,47 @@
 void CJX_RecordSet::max(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_RecordSet::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_RecordSet::eofAction(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_RecordSet::cursorType(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_RecordSet::lockType(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_RecordSet::bofAction(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_RecordSet::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_RecordSet::cursorLocation(CFXJSE_Value* pValue,
                                    bool bSetting,
                                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_rectangle.cpp b/fxjs/xfa/cjx_rectangle.cpp
index 155a29f..81d6448 100644
--- a/fxjs/xfa/cjx_rectangle.cpp
+++ b/fxjs/xfa/cjx_rectangle.cpp
@@ -15,17 +15,17 @@
 void CJX_Rectangle::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Rectangle::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Rectangle::hand(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_ref.cpp b/fxjs/xfa/cjx_ref.cpp
index 5930815..b806434 100644
--- a/fxjs/xfa/cjx_ref.cpp
+++ b/fxjs/xfa/cjx_ref.cpp
@@ -15,11 +15,11 @@
 void CJX_Ref::use(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Ref::usehref(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_rootelement.cpp b/fxjs/xfa/cjx_rootelement.cpp
index 31fbb00..90412e5 100644
--- a/fxjs/xfa/cjx_rootelement.cpp
+++ b/fxjs/xfa/cjx_rootelement.cpp
@@ -15,11 +15,11 @@
 void CJX_RootElement::use(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_RootElement::usehref(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_script.cpp b/fxjs/xfa/cjx_script.cpp
index 4016c13..91229c8 100644
--- a/fxjs/xfa/cjx_script.cpp
+++ b/fxjs/xfa/cjx_script.cpp
@@ -16,19 +16,19 @@
 void CJX_Script::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Script::contentType(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Script::runAt(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Script::stateless(CFXJSE_Value* pValue,
@@ -44,19 +44,19 @@
 void CJX_Script::defaultValue(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Script::binding(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Script::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Script::value(CFXJSE_Value* pValue,
diff --git a/fxjs/xfa/cjx_select.cpp b/fxjs/xfa/cjx_select.cpp
index d1cb259..47f05c5 100644
--- a/fxjs/xfa/cjx_select.cpp
+++ b/fxjs/xfa/cjx_select.cpp
@@ -15,11 +15,11 @@
 void CJX_Select::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Select::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_setproperty.cpp b/fxjs/xfa/cjx_setproperty.cpp
index 871fc4d..a17e791 100644
--- a/fxjs/xfa/cjx_setproperty.cpp
+++ b/fxjs/xfa/cjx_setproperty.cpp
@@ -15,11 +15,11 @@
 void CJX_SetProperty::connection(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SetProperty::target(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_signature.cpp b/fxjs/xfa/cjx_signature.cpp
index 912d9d8..c489e9a 100644
--- a/fxjs/xfa/cjx_signature.cpp
+++ b/fxjs/xfa/cjx_signature.cpp
@@ -15,11 +15,11 @@
 void CJX_Signature::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Signature::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_signatureproperties.cpp b/fxjs/xfa/cjx_signatureproperties.cpp
index 6f2e7a7..85fe7e2 100644
--- a/fxjs/xfa/cjx_signatureproperties.cpp
+++ b/fxjs/xfa/cjx_signatureproperties.cpp
@@ -16,11 +16,11 @@
 void CJX_SignatureProperties::use(CFXJSE_Value* pValue,
                                   bool bSetting,
                                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SignatureProperties::usehref(CFXJSE_Value* pValue,
                                       bool bSetting,
                                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_signdata.cpp b/fxjs/xfa/cjx_signdata.cpp
index eca7430..789ca06 100644
--- a/fxjs/xfa/cjx_signdata.cpp
+++ b/fxjs/xfa/cjx_signdata.cpp
@@ -15,29 +15,29 @@
 void CJX_SignData::ref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SignData::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SignData::operation(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SignData::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SignData::target(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_signing.cpp b/fxjs/xfa/cjx_signing.cpp
index 378f725..ff5e339 100644
--- a/fxjs/xfa/cjx_signing.cpp
+++ b/fxjs/xfa/cjx_signing.cpp
@@ -15,17 +15,17 @@
 void CJX_Signing::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Signing::type(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Signing::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_soapaction.cpp b/fxjs/xfa/cjx_soapaction.cpp
index 854d2d7..27e2d4c 100644
--- a/fxjs/xfa/cjx_soapaction.cpp
+++ b/fxjs/xfa/cjx_soapaction.cpp
@@ -15,11 +15,11 @@
 void CJX_SoapAction::use(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SoapAction::usehref(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_soapaddress.cpp b/fxjs/xfa/cjx_soapaddress.cpp
index be7e84c..ac93388 100644
--- a/fxjs/xfa/cjx_soapaddress.cpp
+++ b/fxjs/xfa/cjx_soapaddress.cpp
@@ -15,11 +15,11 @@
 void CJX_SoapAddress::use(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SoapAddress::usehref(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_solid.cpp b/fxjs/xfa/cjx_solid.cpp
index e692153..90345a0 100644
--- a/fxjs/xfa/cjx_solid.cpp
+++ b/fxjs/xfa/cjx_solid.cpp
@@ -15,11 +15,11 @@
 void CJX_Solid::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Solid::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_source.cpp b/fxjs/xfa/cjx_source.cpp
index 6a71095..7c25b1c 100644
--- a/fxjs/xfa/cjx_source.cpp
+++ b/fxjs/xfa/cjx_source.cpp
@@ -186,11 +186,11 @@
 void CJX_Source::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Source::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_sourceset.cpp b/fxjs/xfa/cjx_sourceset.cpp
index 5bfabde..93507ab 100644
--- a/fxjs/xfa/cjx_sourceset.cpp
+++ b/fxjs/xfa/cjx_sourceset.cpp
@@ -15,11 +15,11 @@
 void CJX_SourceSet::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SourceSet::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_speak.cpp b/fxjs/xfa/cjx_speak.cpp
index 161b245..09870e3 100644
--- a/fxjs/xfa/cjx_speak.cpp
+++ b/fxjs/xfa/cjx_speak.cpp
@@ -15,23 +15,23 @@
 void CJX_Speak::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Speak::priority(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Speak::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Speak::disable(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_stipple.cpp b/fxjs/xfa/cjx_stipple.cpp
index ae520c9..158f30f 100644
--- a/fxjs/xfa/cjx_stipple.cpp
+++ b/fxjs/xfa/cjx_stipple.cpp
@@ -15,17 +15,17 @@
 void CJX_Stipple::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Stipple::rate(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Stipple::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_subform.cpp b/fxjs/xfa/cjx_subform.cpp
index 9487bc1..adf4290 100644
--- a/fxjs/xfa/cjx_subform.cpp
+++ b/fxjs/xfa/cjx_subform.cpp
@@ -96,137 +96,137 @@
 void CJX_Subform::instanceIndex(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute eAttribute) {
-  Script_Som_InstanceIndex(pValue, bSetting, eAttribute);
+  ScriptSomInstanceIndex(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::allowMacro(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::anchorType(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::colSpan(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::columnWidths(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::h(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::hAlign(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::layout(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::maxH(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::maxW(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::minH(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::minW(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::presence(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::relevant(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::restoreState(CFXJSE_Value* pValue,
                                bool bSetting,
                                XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::scope(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::validationMessage(CFXJSE_Value* pValue,
                                     bool bSetting,
                                     XFA_Attribute eAttribute) {
-  Script_Som_ValidationMessage(pValue, bSetting, eAttribute);
+  ScriptSomValidationMessage(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::vAlign(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::w(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::x(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Subform::y(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_subformset.cpp b/fxjs/xfa/cjx_subformset.cpp
index cd36abb..c001a1b 100644
--- a/fxjs/xfa/cjx_subformset.cpp
+++ b/fxjs/xfa/cjx_subformset.cpp
@@ -15,29 +15,29 @@
 void CJX_SubformSet::use(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SubformSet::relation(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SubformSet::relevant(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SubformSet::usehref(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_SubformSet::instanceIndex(CFXJSE_Value* pValue,
                                    bool bSetting,
                                    XFA_Attribute eAttribute) {
-  Script_Som_InstanceIndex(pValue, bSetting, eAttribute);
+  ScriptSomInstanceIndex(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_subjectdn.cpp b/fxjs/xfa/cjx_subjectdn.cpp
index 0a5b4ab..0fb7594 100644
--- a/fxjs/xfa/cjx_subjectdn.cpp
+++ b/fxjs/xfa/cjx_subjectdn.cpp
@@ -15,5 +15,5 @@
 void CJX_SubjectDN::delimiter(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_subjectdns.cpp b/fxjs/xfa/cjx_subjectdns.cpp
index e7d9db5..6b996cc 100644
--- a/fxjs/xfa/cjx_subjectdns.cpp
+++ b/fxjs/xfa/cjx_subjectdns.cpp
@@ -15,5 +15,5 @@
 void CJX_SubjectDNs::type(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_submit.cpp b/fxjs/xfa/cjx_submit.cpp
index 292e432..5afe360 100644
--- a/fxjs/xfa/cjx_submit.cpp
+++ b/fxjs/xfa/cjx_submit.cpp
@@ -15,41 +15,41 @@
 void CJX_Submit::format(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Submit::embedPDF(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Submit::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Submit::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Submit::target(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Submit::textEncoding(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Submit::xdpContent(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_text.cpp b/fxjs/xfa/cjx_text.cpp
index eda2ff8..6b9bebb 100644
--- a/fxjs/xfa/cjx_text.cpp
+++ b/fxjs/xfa/cjx_text.cpp
@@ -15,29 +15,29 @@
 void CJX_Text::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Text::maxChars(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Text::defaultValue(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Text::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Text::value(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_textedit.cpp b/fxjs/xfa/cjx_textedit.cpp
index e1a6faa..3df5312 100644
--- a/fxjs/xfa/cjx_textedit.cpp
+++ b/fxjs/xfa/cjx_textedit.cpp
@@ -15,35 +15,35 @@
 void CJX_TextEdit::vScrollPolicy(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_TextEdit::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_TextEdit::allowRichText(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_TextEdit::multiLine(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_TextEdit::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_TextEdit::hScrollPolicy(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_textnode.cpp b/fxjs/xfa/cjx_textnode.cpp
index 133510c..fc3f592 100644
--- a/fxjs/xfa/cjx_textnode.cpp
+++ b/fxjs/xfa/cjx_textnode.cpp
@@ -16,11 +16,11 @@
 void CJX_TextNode::defaultValue(CFXJSE_Value* pValue,
                                 bool bSetting,
                                 XFA_Attribute attr) {
-  Script_Som_DefaultValue(pValue, bSetting, attr);
+  ScriptSomDefaultValue(pValue, bSetting, attr);
 }
 
 void CJX_TextNode::value(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute attr) {
-  Script_Som_DefaultValue(pValue, bSetting, attr);
+  ScriptSomDefaultValue(pValue, bSetting, attr);
 }
diff --git a/fxjs/xfa/cjx_time.cpp b/fxjs/xfa/cjx_time.cpp
index 74855fd..957f839 100644
--- a/fxjs/xfa/cjx_time.cpp
+++ b/fxjs/xfa/cjx_time.cpp
@@ -15,23 +15,23 @@
 void CJX_Time::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Time::defaultValue(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
 
 void CJX_Time::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Time::value(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Som_DefaultValue(pValue, bSetting, eAttribute);
+  ScriptSomDefaultValue(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_timestamp.cpp b/fxjs/xfa/cjx_timestamp.cpp
index 011d696..5733631 100644
--- a/fxjs/xfa/cjx_timestamp.cpp
+++ b/fxjs/xfa/cjx_timestamp.cpp
@@ -15,23 +15,23 @@
 void CJX_TimeStamp::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_TimeStamp::type(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_TimeStamp::server(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_TimeStamp::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_tooltip.cpp b/fxjs/xfa/cjx_tooltip.cpp
index 5d6e242..b3bfe9f 100644
--- a/fxjs/xfa/cjx_tooltip.cpp
+++ b/fxjs/xfa/cjx_tooltip.cpp
@@ -15,11 +15,11 @@
 void CJX_ToolTip::use(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_ToolTip::usehref(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_traversal.cpp b/fxjs/xfa/cjx_traversal.cpp
index ffdcd35..040a9ae 100644
--- a/fxjs/xfa/cjx_traversal.cpp
+++ b/fxjs/xfa/cjx_traversal.cpp
@@ -15,11 +15,11 @@
 void CJX_Traversal::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Traversal::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_traverse.cpp b/fxjs/xfa/cjx_traverse.cpp
index f0d5345..0b5cfe7 100644
--- a/fxjs/xfa/cjx_traverse.cpp
+++ b/fxjs/xfa/cjx_traverse.cpp
@@ -15,23 +15,23 @@
 void CJX_Traverse::ref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Traverse::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Traverse::operation(CFXJSE_Value* pValue,
                              bool bSetting,
                              XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Traverse::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_tree.cpp b/fxjs/xfa/cjx_tree.cpp
index c42355f..ed10d6a 100644
--- a/fxjs/xfa/cjx_tree.cpp
+++ b/fxjs/xfa/cjx_tree.cpp
@@ -133,7 +133,7 @@
 void CJX_Tree::name(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Tree::nodes(CFXJSE_Value* pValue,
diff --git a/fxjs/xfa/cjx_ui.cpp b/fxjs/xfa/cjx_ui.cpp
index 90db789..baec8ad 100644
--- a/fxjs/xfa/cjx_ui.cpp
+++ b/fxjs/xfa/cjx_ui.cpp
@@ -15,11 +15,11 @@
 void CJX_Ui::use(CFXJSE_Value* pValue,
                  bool bSetting,
                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Ui::usehref(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_update.cpp b/fxjs/xfa/cjx_update.cpp
index e5d1ef2..7ab8b7c 100644
--- a/fxjs/xfa/cjx_update.cpp
+++ b/fxjs/xfa/cjx_update.cpp
@@ -15,11 +15,11 @@
 void CJX_Update::use(CFXJSE_Value* pValue,
                      bool bSetting,
                      XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Update::usehref(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_uri.cpp b/fxjs/xfa/cjx_uri.cpp
index 6ffbb68..cba86ee 100644
--- a/fxjs/xfa/cjx_uri.cpp
+++ b/fxjs/xfa/cjx_uri.cpp
@@ -15,11 +15,11 @@
 void CJX_Uri::use(CFXJSE_Value* pValue,
                   bool bSetting,
                   XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Uri::usehref(CFXJSE_Value* pValue,
                       bool bSetting,
                       XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_user.cpp b/fxjs/xfa/cjx_user.cpp
index a42f927..5e3186a 100644
--- a/fxjs/xfa/cjx_user.cpp
+++ b/fxjs/xfa/cjx_user.cpp
@@ -15,11 +15,11 @@
 void CJX_User::use(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_User::usehref(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_validate.cpp b/fxjs/xfa/cjx_validate.cpp
index 16c264e..400996c 100644
--- a/fxjs/xfa/cjx_validate.cpp
+++ b/fxjs/xfa/cjx_validate.cpp
@@ -15,29 +15,29 @@
 void CJX_Validate::use(CFXJSE_Value* pValue,
                        bool bSetting,
                        XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Validate::scriptTest(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Validate::nullTest(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Validate::usehref(CFXJSE_Value* pValue,
                            bool bSetting,
                            XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Validate::formatTest(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_value.cpp b/fxjs/xfa/cjx_value.cpp
index 8fe3b23..5fdd96c 100644
--- a/fxjs/xfa/cjx_value.cpp
+++ b/fxjs/xfa/cjx_value.cpp
@@ -15,23 +15,23 @@
 void CJX_Value::use(CFXJSE_Value* pValue,
                     bool bSetting,
                     XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Value::relevant(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Value::usehref(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Value::override(CFXJSE_Value* pValue,
                          bool bSetting,
                          XFA_Attribute eAttribute) {
-  Script_Attribute_BOOL(pValue, bSetting, eAttribute);
+  ScriptAttributeBool(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_variables.cpp b/fxjs/xfa/cjx_variables.cpp
index 0904c9f..6f3f631 100644
--- a/fxjs/xfa/cjx_variables.cpp
+++ b/fxjs/xfa/cjx_variables.cpp
@@ -15,11 +15,11 @@
 void CJX_Variables::use(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Variables::usehref(CFXJSE_Value* pValue,
                             bool bSetting,
                             XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_wsdladdress.cpp b/fxjs/xfa/cjx_wsdladdress.cpp
index fc6a77c..25f8b18 100644
--- a/fxjs/xfa/cjx_wsdladdress.cpp
+++ b/fxjs/xfa/cjx_wsdladdress.cpp
@@ -15,11 +15,11 @@
 void CJX_WsdlAddress::use(CFXJSE_Value* pValue,
                           bool bSetting,
                           XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_WsdlAddress::usehref(CFXJSE_Value* pValue,
                               bool bSetting,
                               XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_wsdlconnection.cpp b/fxjs/xfa/cjx_wsdlconnection.cpp
index 07e786e..9b63dc3 100644
--- a/fxjs/xfa/cjx_wsdlconnection.cpp
+++ b/fxjs/xfa/cjx_wsdlconnection.cpp
@@ -35,11 +35,11 @@
 void CJX_WsdlConnection::dataDescription(CFXJSE_Value* pValue,
                                          bool bSetting,
                                          XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_WsdlConnection::execute(CFXJSE_Value* pValue,
                                  bool bSetting,
                                  XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_xfa.cpp b/fxjs/xfa/cjx_xfa.cpp
index bc0d7f1..d67c1b9 100644
--- a/fxjs/xfa/cjx_xfa.cpp
+++ b/fxjs/xfa/cjx_xfa.cpp
@@ -29,11 +29,11 @@
 void CJX_Xfa::timeStamp(CFXJSE_Value* pValue,
                         bool bSetting,
                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
 
 void CJX_Xfa::uuid(CFXJSE_Value* pValue,
                    bool bSetting,
                    XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_xmlconnection.cpp b/fxjs/xfa/cjx_xmlconnection.cpp
index 6622aab..5620560 100644
--- a/fxjs/xfa/cjx_xmlconnection.cpp
+++ b/fxjs/xfa/cjx_xmlconnection.cpp
@@ -16,5 +16,5 @@
 void CJX_XmlConnection::dataDescription(CFXJSE_Value* pValue,
                                         bool bSetting,
                                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/fxjs/xfa/cjx_xsdconnection.cpp b/fxjs/xfa/cjx_xsdconnection.cpp
index aa7d42a..6e16f63 100644
--- a/fxjs/xfa/cjx_xsdconnection.cpp
+++ b/fxjs/xfa/cjx_xsdconnection.cpp
@@ -16,5 +16,5 @@
 void CJX_XsdConnection::dataDescription(CFXJSE_Value* pValue,
                                         bool bSetting,
                                         XFA_Attribute eAttribute) {
-  Script_Attribute_String(pValue, bSetting, eAttribute);
+  ScriptAttributeString(pValue, bSetting, eAttribute);
 }
diff --git a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
index d80f7ba..fdfc59a 100644
--- a/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
+++ b/xfa/fxfa/parser/xfa_basic_data_element_script.cpp
@@ -480,24 +480,24 @@
     /* ps */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* to */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -558,22 +558,22 @@
     /* subsetBelow */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -607,19 +607,19 @@
     /* adobeExtensionLevel */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* typeface */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
 
@@ -688,48 +688,48 @@
     /* fontInfo */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* numberPattern */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
 
     /* dynamicRender */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xd6e27f1d,
           "value",
-          &CJX_Object::Script_Som_DefaultValue_Read,
+          &CJX_Object::ScriptSomDefaultValue_Read,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* printScaling */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -782,12 +782,12 @@
     /* amd */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -830,24 +830,24 @@
     /* jog */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* log */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -869,7 +869,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xcd7f7b54,
@@ -879,7 +879,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -957,34 +957,34 @@
     /* pcl */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* pdf */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1013,56 +1013,56 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* xdc */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* xdp */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1086,51 +1086,51 @@
     /* xsl */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* zpl */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* cache */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1231,12 +1231,12 @@
     /* exclude */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1270,36 +1270,36 @@
     /* level */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* labelPrinter */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* calendarSymbols */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
 
@@ -1378,24 +1378,24 @@
     /* part */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* pdfa */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1419,24 +1419,24 @@
     /* present */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* pagination */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1477,12 +1477,12 @@
     /* whitespace */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1605,36 +1605,36 @@
     /* timePattern */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
 
     /* batchOutput */
     {ATTR(0x28dee6e9,
           "format",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Format,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* enforce */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1643,24 +1643,24 @@
     /* addSilentPrint */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* rename */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1724,12 +1724,12 @@
     /* debug */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1755,24 +1755,24 @@
     /* modifyAnnots */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* startNode */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -1857,7 +1857,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0x1059ec18,
           "level",
-          &CJX_Object::Script_Attribute_Integer,
+          &CJX_Object::ScriptAttributeInteger,
           XFA_Attribute::Level,
           XFA_ScriptType::Basic)},
     {ATTR(0x8e1c2921,
@@ -1877,54 +1877,54 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* hyphenation */
     {ATTR(0x21aed,
           "id",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Id,
           XFA_ScriptType::Basic)},
     {ATTR(0xc0811ed,
           "use",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Use,
           XFA_ScriptType::Basic)},
     {ATTR(0x2f105f72,
           "wordCharacterCount",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::WordCharacterCount,
           XFA_ScriptType::Basic)},
     {ATTR(0x3d123c26,
           "hyphenate",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Hyphenate,
           XFA_ScriptType::Basic)},
     {ATTR(0x66539c48,
           "excludeInitialCap",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::ExcludeInitialCap,
           XFA_ScriptType::Basic)},
     {ATTR(0x6a95c976,
           "pushCharacterCount",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::PushCharacterCount,
           XFA_ScriptType::Basic)},
     {ATTR(0x982bd892,
           "remainCharacterCount",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::RemainCharacterCount,
           XFA_ScriptType::Basic)},
     {ATTR(0xbc254332,
           "usehref",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Usehref,
           XFA_ScriptType::Basic)},
     {ATTR(0xe5c96d6a,
           "excludeAllCaps",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::ExcludeAllCaps,
           XFA_ScriptType::Basic)},
 
@@ -1980,24 +1980,24 @@
     /* type */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* overprint */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -2031,17 +2031,17 @@
     /* encryptionMethods */
     {ATTR(0xc0811ed,
           "use",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Use,
           XFA_ScriptType::Basic)},
     {ATTR(0x2f16a382,
           "type",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Type,
           XFA_ScriptType::Basic)},
     {ATTR(0xbc254332,
           "usehref",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Usehref,
           XFA_ScriptType::Basic)},
 
@@ -2060,36 +2060,36 @@
     /* printerName */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* startPage */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* pageOffset */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -2152,36 +2152,36 @@
     /* ifEmpty */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* suppressBanner */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* outputBin */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -2202,7 +2202,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0x1abbd7e0,
           "dataNode",
-          &CJX_Object::Script_Som_DataNode,
+          &CJX_Object::ScriptSomDataNode,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Object)},
     {ATTR(0x25839852,
@@ -2302,7 +2302,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xa60dd202,
           "length",
-          &CJX_Object::Script_Field_Length,
+          &CJX_Object::ScriptFieldLength,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0xac06e2b0,
@@ -2354,65 +2354,65 @@
     /* agent */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* outputXSL */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* adjustData */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* autoSave */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* contentArea */
     {ATTR(0x68,
           "h",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::H,
           XFA_ScriptType::Basic)},
     {ATTR(0x77,
           "w",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::W,
           XFA_ScriptType::Basic)},
     {ATTR(0x78,
@@ -2557,12 +2557,12 @@
     /* encryptionLevel */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -2618,34 +2618,34 @@
     /* attributes */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* versionControl */
     {ATTR(0x7b29630a,
           "sourceBelow",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::SourceBelow,
           XFA_ScriptType::Basic)},
     {ATTR(0x8fc36c0a,
           "outputBelow",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::OutputBelow,
           XFA_ScriptType::Basic)},
     {ATTR(0xe996b2fe,
           "sourceAbove",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::SourceAbove,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -2684,12 +2684,12 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xf23332f,
           "errorText",
-          &CJX_Object::Script_ExclGroup_ErrorText,
+          &CJX_Object::ScriptExclGroupErrorText,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0x1abbd7e0,
           "dataNode",
-          &CJX_Object::Script_Som_DataNode,
+          &CJX_Object::ScriptSomDataNode,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Object)},
     {ATTR(0x25839852,
@@ -2818,17 +2818,17 @@
     /* compress */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xeda9017a,
           "scope",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Scope,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -2874,12 +2874,12 @@
     /* contentCopy */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -2903,12 +2903,12 @@
     /* config */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -2957,31 +2957,31 @@
     /* #xHTML */
     {ATTR(0xd6e27f1d,
           "value",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Value,
           XFA_ScriptType::Basic)},
 
     /* numberOfCopies */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* behaviorOverride */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3012,24 +3012,24 @@
     /* viewerPreferences */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* scriptModel */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3092,7 +3092,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0x1abbd7e0,
           "dataNode",
-          &CJX_Object::Script_Som_DataNode,
+          &CJX_Object::ScriptSomDataNode,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Object)},
     {ATTR(0x1ee2d24d,
@@ -3102,13 +3102,13 @@
           XFA_ScriptType::Basic)},
     {ATTR(0x25839852,
           "access",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
 
           XFA_Attribute::Access,
           XFA_ScriptType::Basic)},
     {ATTR(0x3b1ddd06,
           "fillColor",
-          &CJX_Object::Script_Som_FillColor,
+          &CJX_Object::ScriptSomFillColor,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0x570ce835,
@@ -3118,7 +3118,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0x5a3b375d,
           "borderColor",
-          &CJX_Object::Script_Som_BorderColor,
+          &CJX_Object::ScriptSomBorderColor,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0x7a7cc341,
@@ -3158,13 +3158,13 @@
           XFA_ScriptType::Basic)},
     {ATTR(0x9cc17d75,
           "mergeMode",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
 
           XFA_Attribute::MergeMode,
           XFA_ScriptType::Basic)},
     {ATTR(0x9f3e9510,
           "instanceManager",
-          &CJX_Object::Script_Subform_InstanceManager,
+          &CJX_Object::ScriptSubformInstanceManager,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Object)},
     {ATTR(0xac06e2b0,
@@ -3204,7 +3204,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xf65e34be,
           "borderWidth",
-          &CJX_Object::Script_Som_BorderWidth,
+          &CJX_Object::ScriptSomBorderWidth,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
 
@@ -3223,24 +3223,24 @@
     /* window */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* localeSet */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3326,48 +3326,48 @@
     /* presence */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* record */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* embed */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* version */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3391,46 +3391,46 @@
     /* copies */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* staple */
     {ATTR(0x7d9fd7c5,
           "mode",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Mode,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* submitFormat */
     {ATTR(0x7d9fd7c5,
           "mode",
-          &CJX_Object::Script_SubmitFormat_Mode,
+          &CJX_Object::ScriptSubmitFormatMode,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3469,24 +3469,24 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* output */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3495,12 +3495,12 @@
     /* excludeNS */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3539,7 +3539,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xd6e27f1d,
@@ -3549,7 +3549,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3568,29 +3568,29 @@
     /* silentPrint */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* webClient */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3604,12 +3604,12 @@
     /* producer */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3658,12 +3658,12 @@
     /* msgId */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3785,7 +3785,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xe64b1129,
@@ -3795,7 +3795,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3877,51 +3877,51 @@
     /* equate */
     {ATTR(0x25363,
           "to",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::To,
           XFA_ScriptType::Basic)},
     {ATTR(0x66642f8f,
           "force",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Force,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xcd7f7b54,
           "from",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::From,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* formFieldFilling */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* pageRange */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -3952,41 +3952,41 @@
     /* mode */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* layout */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* #xml */
     {ATTR(0xd6e27f1d,
           "value",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Value,
           XFA_ScriptType::Basic)},
 
@@ -4039,36 +4039,36 @@
     /* template */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* acrobat */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* validationMessaging */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4149,7 +4149,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xd6e27f1d,
@@ -4159,41 +4159,41 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* addViewerPreferences */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* alwaysEmbed */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4239,24 +4239,24 @@
     /* encryptionMethod */
     {ATTR(0xc0811ed,
           "use",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Use,
           XFA_ScriptType::Basic)},
     {ATTR(0xbc254332,
           "usehref",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Usehref,
           XFA_ScriptType::Basic)},
 
     /* change */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4305,17 +4305,17 @@
     /* submitUrl */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xd6e27f1d,
           "value",
-          &CJX_Object::Script_Som_DefaultValue,
+          &CJX_Object::ScriptSomDefaultValue,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4351,12 +4351,12 @@
     /* aDBE_JSConsole */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4390,34 +4390,34 @@
     /* relevant */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* flipLabel */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4454,7 +4454,7 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xd6e27f1d,
           "value",
-          &CJX_Object::Script_Som_DefaultValue,
+          &CJX_Object::ScriptSomDefaultValue,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0xdb55fec5,
@@ -4466,7 +4466,7 @@
     /* dayNames */
     {ATTR(0x29418bb7,
           "abbr",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Abbr,
           XFA_ScriptType::Basic)},
 
@@ -4485,17 +4485,17 @@
     /* defaultTypeface */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf531b059,
           "writingScript",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::WritingScript,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4568,7 +4568,7 @@
     /* currencySymbol */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
 
@@ -4618,27 +4618,27 @@
     /* equateRange */
     {ATTR(0x25363,
           "to",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::To,
           XFA_ScriptType::Basic)},
     {ATTR(0xa0933954,
           "unicodeRange",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::UnicodeRange,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xcd7f7b54,
           "from",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::From,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4714,29 +4714,29 @@
     /* templateCache */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xd52482e0,
           "maxEntries",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::MaxEntries,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* compressObjectStream */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4770,12 +4770,12 @@
     /* accessibleContent */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4784,12 +4784,12 @@
     /* includeXDPContent */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4803,12 +4803,12 @@
     /* validateApprovalSignatures */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4842,43 +4842,43 @@
     /* packets */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* datePattern */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
 
     /* duplexOption */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* base */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4917,12 +4917,12 @@
     /* compression */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -4958,94 +4958,94 @@
     /* effectiveOutputPolicy */
     {ATTR(0x21aed,
           "id",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Id,
           XFA_ScriptType::Basic)},
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
     {ATTR(0xc0811ed,
           "use",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Use,
           XFA_ScriptType::Basic)},
     {ATTR(0xbc254332,
           "usehref",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Usehref,
           XFA_ScriptType::Basic)},
 
     /* aDBE_JSDebugger */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* acrobat7 */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* interactive */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* locale */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* currentPage */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* data */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5101,12 +5101,12 @@
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5199,12 +5199,12 @@
     /* encryption */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5213,12 +5213,12 @@
     /* messaging */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5249,31 +5249,31 @@
     /* common */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* #text */
     {ATTR(0xd6e27f1d,
           "value",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Value,
           XFA_ScriptType::Basic)},
 
     /* paginationOverride */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5309,34 +5309,34 @@
     /* threshold */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* appearanceFilter */
     {ATTR(0x21aed,
           "id",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Id,
           XFA_ScriptType::Basic)},
     {ATTR(0xc0811ed,
           "use",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Use,
           XFA_ScriptType::Basic)},
     {ATTR(0x2f16a382,
           "type",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Type,
           XFA_ScriptType::Basic)},
     {ATTR(0xbc254332,
           "usehref",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Usehref,
           XFA_ScriptType::Basic)},
 
@@ -5447,19 +5447,19 @@
     /* form */
     {ATTR(0xaf754613,
           "checksum",
-          &CJX_Object::Script_Form_Checksum,
+          &CJX_Object::ScriptFormChecksumS,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
 
     /* mediumInfo */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5490,24 +5490,24 @@
     /* runScripts */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* trace */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5536,12 +5536,12 @@
     /* renderPolicy */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5550,12 +5550,12 @@
     /* destination */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5638,34 +5638,34 @@
     /* openAction */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* neverEmbed */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5706,12 +5706,12 @@
     /* print */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5739,12 +5739,12 @@
     /* creator */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5788,12 +5788,12 @@
     /* permissions */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5839,24 +5839,24 @@
     /* range */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* linearized */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5882,22 +5882,22 @@
     /* plaintextMetadata */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5906,46 +5906,46 @@
     /* printHighQuality */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* driver */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* incrementalLoad */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -5959,24 +5959,24 @@
     /* compressLogicalStructure */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* incrementalMerge */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -6014,95 +6014,95 @@
     /* effectiveInputPolicy */
     {ATTR(0x21aed,
           "id",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Id,
           XFA_ScriptType::Basic)},
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
     {ATTR(0xc0811ed,
           "use",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Use,
           XFA_ScriptType::Basic)},
     {ATTR(0xbc254332,
           "usehref",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Usehref,
           XFA_ScriptType::Basic)},
 
     /* nameAttr */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* conformance */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* transform */
     {ATTR(0xbb8df5d,
           "ref",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Ref,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* lockDocument */
     {ATTR(0x21aed,
           "id",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Id,
           XFA_ScriptType::Basic)},
     {ATTR(0xc0811ed,
           "use",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Use,
           XFA_ScriptType::Basic)},
     {ATTR(0x2f16a382,
           "type",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Type,
           XFA_ScriptType::Basic)},
     {ATTR(0xbc254332,
           "usehref",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Usehref,
           XFA_ScriptType::Basic)},
 
@@ -6219,84 +6219,84 @@
     /* pickTrayByPDFSize */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* monthNames */
     {ATTR(0x29418bb7,
           "abbr",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Abbr,
           XFA_ScriptType::Basic)},
 
     /* severity */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* groupParent */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* documentAssembly */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
     /* numberSymbol */
     {ATTR(0x31b19c1,
           "name",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Name,
           XFA_ScriptType::Basic)},
 
     /* tagged */
     {ATTR(0xbe52dfbf,
           "desc",
-          &CJX_Object::Script_Attribute_String,
+          &CJX_Object::ScriptAttributeString,
           XFA_Attribute::Desc,
           XFA_ScriptType::Basic)},
     {ATTR(0xf6b47749,
           "lock",
-          &CJX_Object::Script_Attribute_BOOL,
+          &CJX_Object::ScriptAttributeBool,
           XFA_Attribute::Lock,
           XFA_ScriptType::Basic)},
 
@@ -6436,12 +6436,12 @@
     /* [unknown] */
     {ATTR(0xa52682bd,
           "{ATTR(default}",
-          &CJX_Object::Script_Som_DefaultValue,
+          &CJX_Object::ScriptSomDefaultValue,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
     {ATTR(0xd6e27f1d,
           "value",
-          &CJX_Object::Script_Som_DefaultValue,
+          &CJX_Object::ScriptSomDefaultValue,
           XFA_Attribute::Unknown,
           XFA_ScriptType::Basic)},
 };