=== modified file 'rules/convert/builtin_functions.rules'
--- rules/convert/builtin_functions.rules	2022-10-05 08:32:33 +0000
+++ rules/convert/builtin_functions.rules	2022-10-10 14:57:13 +0000
@@ -187,6 +187,7 @@
 **     RFB 20210713          Added support for LIST-EVENTS (HandleOps.listEvents). Ref #5536.
 **     CA  20220930          Dynamic invocation of functions or RUN statements are now tracked via an
 **                           InvokeConfig call-site, to allow the runtime to cache the target of the call-site.
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
  -->
  
@@ -578,7 +579,7 @@
          
          <!-- DATA-SOURCE-MODIFIED function -->
          <rule>ftype == prog.kw_data_sm
-            <action>methodText = "DataSourceModifiable.isDataSourceModified"</action>
+            <action>methodText = "DataSourceModifiable.dataSourceModified"</action>
             <action>dbimport = true</action>
          </rule>
          

=== modified file 'rules/convert/datasets.rules'
--- rules/convert/datasets.rules	2020-05-03 20:30:03 +0000
+++ rules/convert/datasets.rules	2022-10-10 14:57:50 +0000
@@ -4,7 +4,7 @@
 ** Module   : datasets.rules
 ** Abstract : converts static (and dynamic) DataSets definitions
 **
-** Copyright (c) 2019-2020, Golden Code Development Corporation.
+** Copyright (c) 2019-2022, Golden Code Development Corporation.
 **
 ** _#_ _I_ __Date__ _________________________________Description_________________________________
 ** 001 OM  20190327 First commit.
@@ -20,6 +20,7 @@
 **                  APIs, as these modes are optional for function or OO method definitions.
 ** 006 CA  20200503 ParameterOption enums are qualified and not imported, as it collides 
 **                  character.valueOf with.
+** 007 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 -->
 
@@ -382,7 +383,7 @@
          </rule>
          <rule>type == prog.kw_serialzn
             <action>
-               execLib("addChainNode", copy.parent, "setSerializeName", java.method_call)
+               execLib("addChainNode", copy.parent, "serializeName", java.method_call)
             </action>
          </rule>
          <rule>type == prog.kw_xml_ntyp

=== modified file 'rules/convert/methods_attributes.rules'
--- rules/convert/methods_attributes.rules	2022-10-03 15:17:22 +0000
+++ rules/convert/methods_attributes.rules	2022-10-10 14:58:05 +0000
@@ -537,6 +537,7 @@
 **                           moveBeforeTabItem. See #6383.
 **     VVT 20221003          CommonHandle.getResourceType() method renamed to resourceType() to prevent convlicts
 **                           with namesakes in DMO. See #6694.
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
  -->
  
@@ -707,7 +708,7 @@
          <rule>list.put(prog.kw_cur_qry , execLib("cr_descr", "DataRelation"               , "getCurrentQuery"        , null                     , true       ))</rule>
          <rule>list.put(prog.kw_cvt_3d_c, execLib("cr_descr", "ImageSupport"               , "getConvert3D"           , "setConvert3D"           , true       ))</rule>
          <rule>list.put(prog.kw_data_scm, execLib("cr_descr", "Buffer"                     , "dataSourceCompleteMap"  , null                     , true       ))</rule>
-         <rule>list.put(prog.kw_data_sm , execLib("cr_descr", "DataSourceModifiable"       , "isDataSourceModified"   , "setDataSourceModified"  , true       ))</rule>
+         <rule>list.put(prog.kw_data_sm , execLib("cr_descr", "DataSourceModifiable"       , "dataSourceModified"     , "dataSourceModified"     , true       ))</rule>
          <rule>list.put(prog.kw_data_src, execLib("cr_descr", "Buffer"                     , "dataSource"             , null                     , true       ))</rule>
          <rule>list.put(prog.kw_data_sri, execLib("cr_descr", "Buffer"                     , "dataSourceRowid"        , "dataSourceRowid"        , true       ))</rule>
          <rule>list.put(prog.kw_dataset , execLib("cr_descr", "Buffer"                     , "dataSet"                , null                     , true       ))</rule>
@@ -813,7 +814,7 @@
          <rule>list.put(prog.kw_invoke  , execLib("cr_descr", "Call"                       , "invoke"                 , null                     , true       ))</rule>
          <rule>list.put(prog.kw_is_open , execLib("cr_descr", "Openable"                   , "isOpen"                 , null                     , true       ))</rule>
          <rule>list.put(prog.kw_is_p_set, execLib("cr_descr", "Call"                       , "isParameterSet"         , null                     , true       ))</rule>
-         <rule>list.put(prog.kw_is_m_ten, execLib("cr_descr", "Buffer"                     , "isMultiTenant"          , "setMultiTenant"         , true       ))</rule>
+         <rule>list.put(prog.kw_is_m_ten, execLib("cr_descr", "Buffer"                     , "multiTenant"            , "multiTenant"            , true       ))</rule>
          <rule>list.put(prog.kw_key     , execLib("cr_descr", "BufferField"                , "isKey"                  , null                     , true       ))</rule>
          <rule>list.put(prog.kw_keys    , execLib("cr_descr", "Keyable"                    , "keys"                   , null                     , true       ))</rule>
          <rule>list.put(prog.kw_lab_bgc , execLib("cr_descr", "BrowseElement"              , "getLabelBgColor"        , "setLabelBgColor"        , true       ))</rule>
@@ -914,8 +915,8 @@
          <rule>list.put(prog.kw_prim_p_p, execLib("cr_descr", "ClientPrincipal"            , "getPrimaryPassphrase"   , "setPrimaryPassphrase"   , true       ))</rule>
          <rule>list.put(prog.kw_print   , execLib("cr_descr", "HtmlBrowser"                , "print"                  , null                     , true       ))</rule>
          <rule>list.put(prog.kw_proctype, execLib("cr_descr", "Call"                       , "getProcedureType"       , "setProcedureType"       , true       ))</rule>
-         <rule>list.put(prog.kw_qual_uid, execLib("cr_descr", "ClientPrincipal"            , "getQualifiedUid"        , "setQualifiedUid"       , true       ))</rule>
-         <rule>list.put(prog.kw_query   , execLib("cr_descr", "QueryAssociable"            , "getQueryAsHandle"       , "setQueryAsHandle"       , true       ))</rule>
+         <rule>list.put(prog.kw_qual_uid, execLib("cr_descr", "ClientPrincipal"            , "getQualifiedUid"        , "setQualifiedUid"        , true       ))</rule>
+         <rule>list.put(prog.kw_query   , execLib("cr_descr", "QueryAssociable"            , "queryAsHandle"          , "queryAsHandle"          , true       ))</rule>
          <rule>list.put(prog.kw_radio_b , execLib("cr_descr", "RadioSet"                   , "getRadioButtons"        , "setRadioButtons"        , true       ))</rule>
          <rule>list.put(prog.kw_raw_tran, execLib("cr_descr", "Buffer"                     , "rawTransfer"            , null                     , true       ))</rule>
          <rule>list.put(prog.kw_read_fil, execLib("cr_descr", "Editor"                     , "readFile"               , null                     , true       ))</rule>
@@ -969,7 +970,7 @@
          <rule>list.put(prog.kw_selected, execLib("cr_descr", "Widget"                     , "isSelected"             , "setSelected"            , true       ))</rule>
          <rule>list.put(prog.kw_sep_fgc , execLib("cr_descr", "Browse"                     , "getSeparatorFgColor"    , "setSeparatorFgColor"    , true       ))</rule>
          <rule>list.put(prog.kw_serialzh, execLib("cr_descr", "SerializeHiddenable"        , "getSerializeHidden"     , "setSerializeHidden"     , true       ))</rule>
-         <rule>list.put(prog.kw_serialzn, execLib("cr_descr", "NamedSerializable"          , "getSerializeName"       , "setSerializeName"       , true       ))</rule>
+         <rule>list.put(prog.kw_serialzn, execLib("cr_descr", "NamedSerializable"          , "serializeName"          , "serializeName"          , true       ))</rule>
          <rule>list.put(prog.kw_serialzr, execLib("cr_descr", "Buffer"                     , "serializeRow"           , null                     , true       ))</rule>
          <rule>list.put(prog.kw_server  , execLib("cr_descr", "Remotable"                  , "getServerHandle"        , "setServerHandle"        , true       ))</rule>
          <rule>list.put(prog.kw_sessn_id, execLib("cr_descr", "ClientPrincipal"            , "getSessionId"           , "setSessionId"           , true       ))</rule>
@@ -1071,8 +1072,8 @@
          <rule>list.put(prog.kw_calvalue, execLib("cr_descr", "Calendar"                   , "getCalendarValue"       , "setCalendarValue"       , true       ))</rule>
          <rule>list.put(prog.kw_cease   , execLib("cr_descr", "FWDTimer"                   , "cease"                  , null                     , true       ))</rule>
          <rule>list.put(prog.kw_check_bo, execLib("cr_descr", "TreeFace"                   , "isCheckBoxes"           , "setCheckBoxes"          , true       ))</rule>
-         <rule>list.put(prog.kw_clea_tab, execLib("cr_descr", "Signature"                  , "clearTablet"              , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_clea_win, execLib("cr_descr", "Signature"                  , "clearSignatureWindow"     , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_clea_tab, execLib("cr_descr", "Signature"                  , "clearTablet"            , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_clea_win, execLib("cr_descr", "Signature"                  , "clearSignatureWindow"   , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_clr_all , execLib("cr_descr", "TreeFace"                   , "clearAll"               , null                     , true       ))</rule>
          <rule>list.put(prog.kw_clr_attl, execLib("cr_descr", "EmailSender"                , "clearAttachmentsList"   , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_clr_bccl, execLib("cr_descr", "EmailSender"                , "clearBccAddressList"    , ""                       , true       ))</rule>
@@ -1157,12 +1158,12 @@
          <rule>list.put(prog.kw_is_c_vis, execLib("cr_descr", "TreeList"                   , "isColumnVisible"        , null                     , true       ))</rule>
          <rule>list.put(prog.kw_is_msel , execLib("cr_descr", "TreeFace"                   , "isMultiSelect"          , null                     , true       ))</rule>
          <rule>list.put(prog.kw_is_n_exp, execLib("cr_descr", "TreeFace"                   , "isNodeExpanded"         , null                     , true       ))</rule>
-         <rule>list.put(prog.kw_kpad_hot, execLib("cr_descr", "Signature"                  , "keypadAddHotSpot"         , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_kpad_cle, execLib("cr_descr", "Signature"                  , "keypadClearHotSpotList"   , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_kpad_qry, execLib("cr_descr", "Signature"                  , "keypadQueryHotSpot"       , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_lcd_refr, execLib("cr_descr", "Signature"                  , "lcdRefresh"               , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_lcd_swin, execLib("cr_descr", "Signature"                  , "lcdSetWindow"             , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_lcd_wstr, execLib("cr_descr", "Signature"                  , "lcdWriteString"           , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_kpad_hot, execLib("cr_descr", "Signature"                  , "keypadAddHotSpot"       , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_kpad_cle, execLib("cr_descr", "Signature"                  , "keypadClearHotSpotList" , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_kpad_qry, execLib("cr_descr", "Signature"                  , "keypadQueryHotSpot"     , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_lcd_refr, execLib("cr_descr", "Signature"                  , "lcdRefresh"             , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_lcd_swin, execLib("cr_descr", "Signature"                  , "lcdSetWindow"           , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_lcd_wstr, execLib("cr_descr", "Signature"                  , "lcdWriteString"         , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_msicon,   execLib("cr_descr", "WidgetExtension"            , "getMouseIcon"           , "setMouseIcon"        , true       ))</rule>
          <rule>list.put(prog.kw_mspntnum, execLib("cr_descr", "WidgetExtension"            , "getMousePointerNum"     , "setMousePointerNum"     , true       ))</rule>
          <rule>list.put(prog.kw_m_d_i_p,  execLib("cr_descr", "TreeList"                   , "moveDownInParent"       , null                     , true       ))</rule>
@@ -1179,7 +1180,7 @@
          <rule>list.put(prog.kw_node_key, execLib("cr_descr", "TreeNodeFace"               , "getNodeKey"             , null                     , true       ))</rule>
          <rule>list.put(prog.kw_node_par, execLib("cr_descr", "TreeNodeFace"               , "getNodeParent"          , null                     , true       ))</rule>
          <rule>list.put(prog.kw_node_txt, execLib("cr_descr", "TreeNodeFace"               , "getNodeText"            , "setNodeText"            , true       ))</rule>
-         <rule>list.put(prog.kw_num_pnts, execLib("cr_descr", "Signature"                  , "numberOfTabletPoints"     , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_num_pnts, execLib("cr_descr", "Signature"                  , "numberOfTabletPoints"   , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_ocx_mbtn, execLib("cr_descr", "OcxMouse"                   , "getMouseButton"         , null                     , true       ))</rule>
          <rule>list.put(prog.kw_ocx_msht, execLib("cr_descr", "OcxMouse"                   , "getMouseShift"          , null                     , true       ))</rule>
          <rule>list.put(prog.kw_ocx_msx,  execLib("cr_descr", "OcxMouse"                   , "getMouseX"              , null                     , true       ))</rule>
@@ -1241,12 +1242,12 @@
          <rule>list.put(prog.kw_set_cptm, execLib("cr_descr", "Signature"                  , "setLCDCaptureMode"        , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_set_f_d , execLib("cr_descr", "TabSet"                     , "setFontDetails"         , null                     , true       ))</rule>
          <rule>list.put(prog.kw_foc_asel, execLib("cr_descr", "SelectableText"             , "focusAndSelect"         , null                     , true       ))</rule>
-         <rule>list.put(prog.kw_set_imgf, execLib("cr_descr", "Signature"                  , "setImageFileFormat"       , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_set_imgh, execLib("cr_descr", "Signature"                  , "setImageXSize"            , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_set_imgw, execLib("cr_descr", "Signature"                  , "setImageYSize"            , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_set_jmod, execLib("cr_descr", "Signature"                  , "setJustifyMode"           , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_set_jstx, execLib("cr_descr", "Signature"                  , "setJustifyX"              , ""                       , true       ))</rule>
-         <rule>list.put(prog.kw_set_jsty, execLib("cr_descr", "Signature"                  , "setJustifyY"              , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_set_imgf, execLib("cr_descr", "Signature"                  , "setImageFileFormat"     , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_set_imgh, execLib("cr_descr", "Signature"                  , "setImageXSize"          , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_set_imgw, execLib("cr_descr", "Signature"                  , "setImageYSize"          , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_set_jmod, execLib("cr_descr", "Signature"                  , "setJustifyMode"         , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_set_jstx, execLib("cr_descr", "Signature"                  , "setJustifyX"            , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_set_jsty, execLib("cr_descr", "Signature"                  , "setJustifyY"            , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_set_msel, execLib("cr_descr", "TreeFace"                   , "setMultiSelect"         , null                     , true       ))</rule>
          <rule>list.put(prog.kw_set_n_bg, execLib("cr_descr", "TreeFace"                   , "setNodeBgColor"         , null                     , true       ))</rule>
          <rule>list.put(prog.kw_set_n_fg, execLib("cr_descr", "TreeFace"                   , "setNodeFgColor"         , null                     , true       ))</rule>
@@ -1258,7 +1259,7 @@
          <rule>list.put(prog.kw_set_swin, execLib("cr_descr", "Signature"                  , "setSignatureWindow"       , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_set_tbme, execLib("cr_descr", "Signature"                  , "setTranslateBitmapEnable" , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_set_tn_i, execLib("cr_descr", "TreeFace"                   , "setTreeNodeIcons"       , null                     , true       ))</rule>
-         <rule>list.put(prog.kw_set_tsta, execLib("cr_descr", "Signature"                  , "setTabletState"           , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_set_tsta, execLib("cr_descr", "Signature"                  , "setTabletState"         , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_show_but, execLib("cr_descr", "TreeFace"                   , "isShowButtons"          , "setShowButtons"         , true       ))</rule>
          <rule>list.put(prog.kw_show_hdr, execLib("cr_descr", "TreeList"                   , "isShowHeader"           , "setShowHeader"          , true       ))</rule>
          <rule>list.put(prog.kw_shr_d_f,  execLib("cr_descr", "TreeList"                   , "getShortDateFormat"     , "setShortDateFormat"     , true       ))</rule>
@@ -1280,7 +1281,7 @@
          <rule>list.put(prog.kw_tab_show, execLib("cr_descr", "TabSet"                     , "show"                   , null                     , true       ))</rule>
          <rule>list.put(prog.kw_tabs,     execLib("cr_descr", "TabSet"                     , "getTabs"                , "setTabs"                , true       ))</rule>
          <rule>list.put(prog.kw_tab_idx , execLib("cr_descr", "TabSet"                     , "getTabIndex"            , "setTabIndex"            , true       ))</rule>
-         <rule>list.put(prog.kw_tab_mod,  execLib("cr_descr", "Signature"                  , "tabletModelNumber"        , ""                       , true       ))</rule>
+         <rule>list.put(prog.kw_tab_mod,  execLib("cr_descr", "Signature"                  , "tabletModelNumber"      , ""                       , true       ))</rule>
          <rule>list.put(prog.kw_tab_ml  , execLib("cr_descr", "TabSet"                     , "isMultiLine"            , "setMultiLine"           , true       ))</rule>
          <rule>list.put(prog.kw_textedit, execLib("cr_descr", "TreeFace"                   , "isTextEdit"             , "setTextEdit"            , true       ))</rule>
          <rule>list.put(prog.kw_tho_sep,  execLib("cr_descr", "TreeList"                   , "getThousandSeparator"   , "setThousandSeparator"   , true       ))</rule>
@@ -2847,9 +2848,9 @@
 
                <rule>ftype == prog.kw_adm_data
                   <action>hwrap = "ADMData"</action>
-                  <action>methodText = "getADMData"</action>
+                  <action>methodText = "admData"</action>
                   <rule>isAssign
-                     <action>methodText = "setADMData"</action>
+                     <action>methodText = "admData"</action>
                   </rule>
                </rule>
 
@@ -3134,7 +3135,7 @@
                        in the case of FRAMES, the attribute is documented as R/W -->
                   <action>hwrap = "IterableResource"</action>
                   <rule>isAssign
-                     <action on="true">methodText = "setCurrentIteration"</action>
+                     <action on="true">methodText = "currentIteration"</action>
                      <action on="false">methodText = "currentIteration"</action>
                   </rule>
                </rule>
@@ -3178,7 +3179,7 @@
 
                <rule>ftype == prog.kw_dbname
                   <action>hwrap = "DatabaseInfo"</action>
-                  <action>methodText = "getDbName"</action>
+                  <action>methodText = "dbName"</action>
                </rule>
 
                <rule>ftype == prog.kw_dcolor
@@ -4827,7 +4828,7 @@
                </rule>
 
                <rule>ftype == prog.kw_table
-                  <action>methodText = "getTable"</action>
+                  <action>methodText = "table"</action>
                </rule>
 
                <rule>ftype == prog.kw_3d
@@ -4844,7 +4845,7 @@
 
                <rule>ftype == prog.kw_table
                   <action>hwrap = "DatabaseInfo"</action>
-                  <action>methodText = "getTable"</action>
+                  <action>methodText = "table"</action>
                </rule>
 
                <rule>ftype == prog.kw_title
@@ -4887,7 +4888,7 @@
                <!-- Attribute for DOM XML -->
                <rule>ftype == prog.kw_uniq_id
                   <action>hwrap = "UniqueID"</action>
-                  <action>methodText = "getUniqueID"</action>
+                  <action>methodText = "uniqueID"</action>
                   <action>xmlimport = true</action>
                </rule>
 

=== modified file 'src/com/goldencode/p2j/convert/BufferList.java' (properties changed: +x to -x)
--- src/com/goldencode/p2j/convert/BufferList.java	2019-05-13 14:26:39 +0000
+++ src/com/goldencode/p2j/convert/BufferList.java	2022-10-10 14:58:32 +0000
@@ -2,7 +2,7 @@
 ** Module   : BufferList.java
 ** Abstract : stores the list of all buffers by the same name in a source file
 **
-** Copyright (c) 2005-2019, Golden Code Development Corporation.
+** Copyright (c) 2005-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- --JPRM-- ----------------Description-----------------
 ** 001 GES 20050922   @22788 First version which provides a helper class to store the list of all
@@ -16,6 +16,7 @@
 ** 007 OM  20161007          Code maintenance (generified, typo fix, javadoc).
 ** 008 CA  20190128          Track buffer's static state (if OO).
 ** 009 CA  20190513          Fixed buffer usage from super-classes, in OO.
+** 010 VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
 /*
 ** This program is free software: you can redistribute it and/or modify
@@ -275,7 +276,7 @@
     *
     * @return   The logical database for this buffer.
     */
-   public String getDbName()
+   public String dbName()
    {
       return dbName;
    }

=== modified file 'src/com/goldencode/p2j/persist/AbstractTempTable.java'
--- src/com/goldencode/p2j/persist/AbstractTempTable.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/AbstractTempTable.java	2022-10-10 15:15:02 +0000
@@ -46,6 +46,7 @@
 **     CA  20220214 The slave buffers are cleaned up only when the associated temp-table gets deleted.
 **     OM  20220422 Allow Xml/JsonImport to load records into buffer without exposing package private methods.
 **     CA  20221006 UNIQUE-ID is kept as a Java type instead of BDT.  Refs #6827
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -246,7 +247,7 @@
     * @return   The integer number of the children.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       if (uniqueId == null)
       {
@@ -591,7 +592,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(this.admData);
    }
@@ -603,7 +604,7 @@
      *           The new value.
      */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData.assign(value);
    }
@@ -615,7 +616,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData.assign(value);
    }
@@ -2043,7 +2044,7 @@
    @Override
    public character getXmlNodeName()
    {
-      return xmlNodeName == null || xmlNodeName.trim().isEmpty() ? getSerializeName() 
+      return xmlNodeName == null || xmlNodeName.trim().isEmpty() ? serializeName() 
                                                                  : new character(xmlNodeName);
    }
    
@@ -2240,7 +2241,7 @@
     * @return  {@code true} when the data has been modified.
     */
    @Override
-   public logical isDataSourceModified()
+   public logical dataSourceModified()
    {
       return new logical(dataSourceModified);
    }
@@ -2252,7 +2253,7 @@
     *          {@code true} when the data is marked as modified and {@code false} otherwise.
     */
    @Override
-   public void setDataSourceModified(logical mod)
+   public void dataSourceModified(logical mod)
    {
       if (mod == null || mod.isUnknown())
       {
@@ -2260,7 +2261,7 @@
          return;
       }
       
-      setDataSourceModified(mod.getValue());
+      dataSourceModified(mod.getValue());
    }
    
    /**
@@ -2270,7 +2271,7 @@
     *          {@code true} when the data is marked as modified and {@code false} otherwise.
     */
    @Override
-   public void setDataSourceModified(boolean mod)
+   public void dataSourceModified(boolean mod)
    {
       this.dataSourceModified = mod;
    }
@@ -2281,7 +2282,7 @@
     * @return  the current value of the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public character getSerializeName()
+   public character serializeName()
    {
       return new character(serializeName == null || serializeName.trim().isEmpty() ? name.getValue()
                                                                                    : serializeName);
@@ -2294,9 +2295,9 @@
     *          the new value for the {@code SERIALIZE-NAME} attribute. 
     */
    @Override
-   public void setSerializeName(Text sName)
+   public void serializeName(Text sName)
    {
-      setSerializeName(sName == null || sName.isUnknown() ? null : sName.getValue());
+      serializeName(sName == null || sName.isUnknown() ? null : sName.getValue());
    }
    
    /**
@@ -2306,7 +2307,7 @@
     *          the new value for the {@code SERIALIZE-NAME} attribute. 
     */
    @Override
-   public void setSerializeName(String sName)
+   public void serializeName(String sName)
    {
       serializeName = sName;
    }

=== modified file 'src/com/goldencode/p2j/persist/Buffer.java'
--- src/com/goldencode/p2j/persist/Buffer.java	2021-12-13 16:58:36 +0000
+++ src/com/goldencode/p2j/persist/Buffer.java	2022-10-10 15:15:20 +0000
@@ -2,7 +2,7 @@
 ** Module   : Buffer.java
 ** Abstract : interface which must be extended by any business DMO interface
 **
-** Copyright (c) 2013-2021, Golden Code Development Corporation.
+** Copyright (c) 2013-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------------Description---------------------------------------
 ** 001 ECF 20130118 Created initial version.
@@ -92,6 +92,7 @@
 **     OM  20201205 Added AUTO-DELETE attribute definition.
 **     OM  20201218 Fixed implementation for error and rejected attributes/hidden fields.
 **     OM  20211020 Added _DATASOURCE_ROWID property.
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -2778,25 +2779,25 @@
     * @return   See above.
     */
    @LegacyAttribute(name = "IS-MULTI-TENANT")
-   public logical isMultiTenant();
-   
-   /**
-    * Setter for the IS-MULTI-TENANT attribute.
-    * 
-    * @param    l
-    *           The flag value.
-    */
-   @LegacyAttribute(name = "IS-MULTI-TENANT", setter = true)
-   public void setMultiTenant(logical l);
-   
-   /**
-    * Setter for the IS-MULTI-TENANT attribute.
-    * 
-    * @param    l
-    *           The flag value.
-    */
-   @LegacyAttribute(name = "IS-MULTI-TENANT", setter = true)
-   public void setMultiTenant(boolean l);
+   public logical multiTenant();
+   
+   /**
+    * Setter for the IS-MULTI-TENANT attribute.
+    * 
+    * @param    l
+    *           The flag value.
+    */
+   @LegacyAttribute(name = "IS-MULTI-TENANT", setter = true)
+   public void multiTenant(logical l);
+   
+   /**
+    * Setter for the IS-MULTI-TENANT attribute.
+    * 
+    * @param    l
+    *           The flag value.
+    */
+   @LegacyAttribute(name = "IS-MULTI-TENANT", setter = true)
+   public void multiTenant(boolean l);
    
    /**
     * Definition of the SERIALIZE-ROW method. Writes current row from this buffer into the specified data 

=== modified file 'src/com/goldencode/p2j/persist/BufferFieldImpl.java'
--- src/com/goldencode/p2j/persist/BufferFieldImpl.java	2022-10-06 19:31:52 +0000
+++ src/com/goldencode/p2j/persist/BufferFieldImpl.java	2022-10-10 15:15:33 +0000
@@ -65,6 +65,7 @@
 **                  created.
 **     CA  20221006 Fixed a NPE related to instantiating-procedure in 'changeValue' (surrogate instances being
 **                  created).
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -907,7 +908,7 @@
     * @return    Current value of the DBNAME attribute.
     */
    @Override
-   public character getDbName()
+   public character dbName()
    {
       return new character(fieldRef.getParentBuffer().getDatabase().getName());
    }
@@ -918,7 +919,7 @@
     * @return    Current value of the TABLE attribute.
     */
    @Override
-   public character getTable()
+   public character table()
    {
       return new character(fieldRef.getParentBuffer().getTable());
    }
@@ -1366,7 +1367,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(this.admData);
    }
@@ -1378,7 +1379,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData = value;
    }
@@ -1390,7 +1391,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData = value.toJavaType();
    }
@@ -1402,7 +1403,7 @@
     * @return   The integer number of the children.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(this.uniqueID);
    }
@@ -1424,9 +1425,9 @@
     * @return  the current value of the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public character getSerializeName()
+   public character serializeName()
    {
-      String sName = lfi.getSerializeOptions(getTempTable()).getSerializeName();
+      String sName = lfi.getSerializeOptions(getTempTable()).serializeName();
       return new character(sName == null || sName.trim().isEmpty() ? lfi.getLegacyName() : sName);
    }
    
@@ -1437,9 +1438,9 @@
     *          the new value for the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public void setSerializeName(Text sName)
+   public void serializeName(Text sName)
    {
-      setSerializeName(sName == null || sName.isUnknown() ? null : sName.getValue());
+      serializeName(sName == null || sName.isUnknown() ? null : sName.getValue());
    }
    
    /**
@@ -1449,10 +1450,10 @@
     *          the new value for the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public void setSerializeName(String sName)
+   public void serializeName(String sName)
    {
       // this actually works for permanent tables, too, although they cannot be serialized
-      lfi.getSerializeOptions(getTempTable()).setSerializeName(sName);
+      lfi.getSerializeOptions(getTempTable()).serializeName(sName);
    }
    
    /**

=== modified file 'src/com/goldencode/p2j/persist/BufferImpl.java'
--- src/com/goldencode/p2j/persist/BufferImpl.java	2022-10-10 09:11:45 +0000
+++ src/com/goldencode/p2j/persist/BufferImpl.java	2022-10-10 15:15:43 +0000
@@ -74,7 +74,7 @@
 ** 025 ECF 20131028 Import change.
 ** 026 SVL 20131028 Handled bufferField() for static tables, added doSetName.
 ** 027 CA  20131013 Static buffers are deleted only when the instantiating procedure gets deleted.
-** 028 OM  20131128 Stub implementation for getUniqueID.
+** 028 OM  20131128 Stub implementation for uniqueID.
 ** 029 HC  20131222 Implemented ADM-DATA and UNIQUE-ID attribute.
 ** 030 VMN 20140110 Implemented bufferField(character).
 ** 031 OM  20140107 Implemented disableDumpTriggers() and disableLoadTriggers() methods and 
@@ -224,6 +224,7 @@
 **                  BUFFER-FIELD's instantiating procedure must be the BUFFER's, and not when it gets lazily
 **                  created.
 **     CA  20221010 Reduced 'toLowerCase' usage in 'attachDataSource'.  Refs #6820
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -687,7 +688,7 @@
     * @return  {@code true} when the data has been modified.
     */
    @Override
-   public logical isDataSourceModified()
+   public logical dataSourceModified()
    {
       return new logical(dataSourceModified);
    }
@@ -699,7 +700,7 @@
     *          {@code true} when the data is marked as modified and {@code false} otherwise.
     */
    @Override
-   public void setDataSourceModified(logical mod)
+   public void dataSourceModified(logical mod)
    {
       if (mod == null || mod.isUnknown())
       {
@@ -707,7 +708,7 @@
          return;
       }
       
-      setDataSourceModified(mod.getValue());
+      dataSourceModified(mod.getValue());
    }
    
    /**
@@ -717,7 +718,7 @@
     *          {@code true} when the data is marked as modified and {@code false} otherwise.
     */
    @Override
-   public void setDataSourceModified(boolean mod)
+   public void dataSourceModified(boolean mod)
    {
       this.dataSourceModified = mod;
    }
@@ -932,7 +933,7 @@
     * @return   See above.
     */
    @Override
-   public logical isMultiTenant()
+   public logical multiTenant()
    {
       // TODO: multi-tenant is not supported at this time
       return new logical(false);
@@ -945,7 +946,7 @@
     *           The flag value.
     */
    @Override
-   public void setMultiTenant(logical l)
+   public void multiTenant(logical l)
    {
       // TODO: multi-tenant is not supported at this time
    }
@@ -957,7 +958,7 @@
     *           The flag value.
     */
    @Override
-   public void setMultiTenant(boolean l)
+   public void multiTenant(boolean l)
    {
       // TODO: multi-tenant is not supported at this time
    }
@@ -4322,7 +4323,7 @@
     *
     * @return  Current value of the DBNAME attribute.
     */
-   public character getDbName()
+   public character dbName()
    {
       final RecordBuffer buf = buffer();
       if (buf.getParentTable() != null)
@@ -4341,7 +4342,7 @@
     * @return    Current value of the TABLE attribute.
     */
    @Override
-   public character getTable()
+   public character table()
    {
       return new character(TableMapper.getLegacyName(this.buffer()));
    }
@@ -4455,7 +4456,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(this.admData);
    }
@@ -4467,7 +4468,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData = value;
    }
@@ -4479,7 +4480,7 @@
     *          The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData = value.toJavaType();
    }
@@ -4492,7 +4493,7 @@
     *          current process.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(this.uniqueID);
    }
@@ -4571,9 +4572,9 @@
     * @return  The current value of the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public character getSerializeName()
+   public character serializeName()
    {
-      return buffer().getParentTable().getSerializeName();
+      return buffer().getParentTable().serializeName();
    }
    
    /**
@@ -4583,9 +4584,9 @@
     *          the new value for the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public void setSerializeName(Text sName)
+   public void serializeName(Text sName)
    {
-      buffer().getParentTable().setSerializeName(sName);
+      buffer().getParentTable().serializeName(sName);
    }
    
    /**
@@ -4595,9 +4596,9 @@
     *         The new value for the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public void setSerializeName(String sName)
+   public void serializeName(String sName)
    {
-      buffer().getParentTable().setSerializeName(sName);
+      buffer().getParentTable().serializeName(sName);
    }
    
    /**
@@ -6040,7 +6041,7 @@
     * @return   The associated query or {@code unknown} if none exists.
     */
    @Override
-   public handle getQueryAsHandle()
+   public handle queryAsHandle()
    {
       // bit of maintenance
       if (lastQuery != null && !lastQuery._isValid())
@@ -6059,7 +6060,7 @@
     *          The query to associate.
     */
    @Override
-   public void setQueryAsHandle(handle qry)
+   public void queryAsHandle(handle qry)
    {
       handle.invalidAttribute("QUERY", true, LegacyResource.BUFFER);
    }
@@ -6072,7 +6073,7 @@
     *          The query to associate.
     */
    @Override
-   public void setQueryAsHandle(QueryWrapper qry)
+   public void queryAsHandle(QueryWrapper qry)
    {
       handle.invalidAttribute("QUERY", true, LegacyResource.BUFFER);
    }
@@ -7694,7 +7695,7 @@
          boolean suppliedQuery = false;
          if (srcBufCount > 1)
          {
-            if (!dataSource.getQueryAsHandle()._isValid())
+            if (!dataSource.queryAsHandle()._isValid())
             {
                ErrorManager.recordOrShowError(11980);
                // Must assign a user query to a data-source that is a join before filling.
@@ -7706,7 +7707,7 @@
             
             suppliedQuery = true;
          }
-         if (dataSource.getQueryAsHandle()._isValid())
+         if (dataSource.queryAsHandle()._isValid())
          {
             suppliedQuery = true;
          }
@@ -7764,7 +7765,7 @@
          P2JQuery fillQuery = null;
          if (suppliedQuery)
          {
-            hQuery = dataSource.getQueryAsHandle();
+            hQuery = dataSource.queryAsHandle();
             fillQuery = (P2JQuery) hQuery.getResource();
             if (fillQuery.prepareString().isUnknown())
             {
@@ -10195,10 +10196,10 @@
             //       deleted before-image loaded in before-buffer(this) will set the attribute, instead.
             if (rowState == ROW_MODIFIED || rowState == ROW_DELETED)
             {
-               BufferImpl.this.setDataSourceModified(true);
-               tableHandle().unwrapDataSourceModifiable().setDataSourceModified(true);
-               after.tableHandle().unwrapDataSourceModifiable().setDataSourceModified(true);
-               peerBuffer.dataSet.setDataSourceModified(true);
+               BufferImpl.this.dataSourceModified(true);
+               tableHandle().unwrapDataSourceModifiable().dataSourceModified(true);
+               after.tableHandle().unwrapDataSourceModifiable().dataSourceModified(true);
+               peerBuffer.dataSet.dataSourceModified(true);
             }
             
             logical ok = new logical();

=== modified file 'src/com/goldencode/p2j/persist/DataRelation.java'
--- src/com/goldencode/p2j/persist/DataRelation.java	2022-10-05 08:54:36 +0000
+++ src/com/goldencode/p2j/persist/DataRelation.java	2022-10-10 15:15:57 +0000
@@ -17,6 +17,7 @@
 **     OM  20210930 Only the name of dynamic relations have name constraints.
 **     OM  20220120 Added getRelationFields(boolean) method.
 **     CA  20220923 Internal var definitions must be done via TypeFactory and not UndoableFactory.
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -744,7 +745,7 @@
     * @return The associated query or {@code unknown} if none exists.
     */
    @Override
-   public handle getQueryAsHandle()
+   public handle queryAsHandle()
    {
       if (query == null)
       {
@@ -762,7 +763,7 @@
     *          The query to associate.
     */
    @Override
-   public void setQueryAsHandle(handle qry)
+   public void queryAsHandle(handle qry)
    {
       handle.invalidAttribute("QUERY", true, LegacyResource.DATA_RELATION);
    }
@@ -774,7 +775,7 @@
     *          The query to associate.
     */
    @Override
-   public void setQueryAsHandle(QueryWrapper qry)
+   public void queryAsHandle(QueryWrapper qry)
    {
       handle.invalidAttribute("QUERY", true, LegacyResource.DATA_RELATION);
    }
@@ -785,7 +786,7 @@
     * @return See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(admData);
    }
@@ -796,7 +797,7 @@
     * @param value The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       admData = value;
    }
@@ -807,7 +808,7 @@
     * @param value The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       admData = (value == null || value.isUnknown()) ? null : value.getValue();
    }

=== modified file 'src/com/goldencode/p2j/persist/DataSet.java'
--- src/com/goldencode/p2j/persist/DataSet.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/DataSet.java	2022-10-10 15:16:08 +0000
@@ -73,6 +73,7 @@
 **                  and every block.
 **     CA  20220923 Internal var definitions must be done via TypeFactory and not UndoableFactory.
 **     CA  20221006 UNIQUE-ID is kept as Java type instead of BDT.  Refs #6827
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -1873,7 +1874,7 @@
     * @return  {@code true} when the data has been modified.
     */
    @Override
-   public logical isDataSourceModified()
+   public logical dataSourceModified()
    {
       return new logical(dataSourceModified);
    }
@@ -1885,7 +1886,7 @@
     *          {@code true} when the data is marked as modified and {@code false} otherwise.
     */
    @Override
-   public void setDataSourceModified(logical mod)
+   public void dataSourceModified(logical mod)
    {
       if (mod == null || mod.isUnknown())
       {
@@ -1893,7 +1894,7 @@
          return;
       }
    
-      setDataSourceModified(mod.getValue());
+      dataSourceModified(mod.getValue());
    }
    
    /**
@@ -1903,7 +1904,7 @@
     *          {@code true} when the data is marked as modified and {@code false} otherwise.
     */
    @Override
-   public void setDataSourceModified(boolean mod)
+   public void dataSourceModified(boolean mod)
    {
       this.dataSourceModified = mod;
    }
@@ -2249,7 +2250,7 @@
     * @return the current value of the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public character getSerializeName()
+   public character serializeName()
    {
       String jsName = serializeName != null ? serializeName : name;
       if (jsName == null || jsName.isEmpty())
@@ -2266,9 +2267,9 @@
     * @param sName the new value for the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public void setSerializeName(Text sName)
+   public void serializeName(Text sName)
    {
-      setSerializeName(sName.toJavaType());
+      serializeName(sName.toJavaType());
    }
    
    /**
@@ -2277,7 +2278,7 @@
     * @param sName the new value for the {@code SERIALIZE-NAME} attribute.
     */
    @Override
-   public void setSerializeName(String sName)
+   public void serializeName(String sName)
    {
       if (sName != null)
       {
@@ -2379,7 +2380,7 @@
     * @return See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(admData);
    }
@@ -2390,7 +2391,7 @@
     * @param value The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData = value;
    }
@@ -2401,7 +2402,7 @@
     * @param value The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData = value.toJavaType();
    }
@@ -2822,7 +2823,7 @@
          for (DataRelation rel : relations)
          {
             Buffer cb = rel.getChildBuffer().unwrapBuffer();
-            int uuid = cb.getUniqueID().intValue();
+            int uuid = cb.uniqueID().intValue();
             if (childBuffers.contains(uuid))
             {
                ErrorManager.recordOrShowError(11979, cb.name().toStringMessage());
@@ -5155,7 +5156,7 @@
     * @return  an integer values that uniques identifies this resource.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(this.uuid);
    }
@@ -5456,13 +5457,13 @@
     */
    protected DataRelation allowsActiveChild(Buffer childBuffer)
    {
-      int childUid = childBuffer.getUniqueID().intValue();
+      int childUid = childBuffer.uniqueID().intValue();
       
       for (DataRelation relation : relations)
       {
          if (relation._isActive()      &&
              !relation._isReposition() &&
-             relation.getChildBuffer().unwrapBuffer().getUniqueID().intValue() == childUid)
+             relation.getChildBuffer().unwrapBuffer().uniqueID().intValue() == childUid)
          {
             return relation;
          }
@@ -6321,9 +6322,9 @@
        *
        * @return  A reference of this object in order to help chaining.
        */
-      public Builder setSerializeName(String serName)
+      public Builder serializeName(String serName)
       {
-         buildChain.add(() -> target.setSerializeName(serName));
+         buildChain.add(() -> target.serializeName(serName));
          return this;
       }
       

=== modified file 'src/com/goldencode/p2j/persist/DataSource.java'
--- src/com/goldencode/p2j/persist/DataSource.java	2022-08-10 20:01:47 +0000
+++ src/com/goldencode/p2j/persist/DataSource.java	2022-10-10 15:16:19 +0000
@@ -25,6 +25,7 @@
 **     OM  20220217 Fixed SAVE-WHERE-STRING for ROWID keys.
 **     OM  20220412 Setting the query attribute to unknown is a no-op.
 **     OM  20220801 Recompute the buffer list dynamically.
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -332,7 +333,7 @@
     * @return See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(admData);
    }
@@ -343,7 +344,7 @@
     * @param value The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData = value;
    }
@@ -354,7 +355,7 @@
     * @param value The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData = value.toJavaType();
    }
@@ -365,7 +366,7 @@
     * @return The associated query or {@code unknown} if none exists.
     */
    @Override
-   public handle getQueryAsHandle()
+   public handle queryAsHandle()
    {
       return query._isValid() ? new handle(query.getResource()) : new handle();
    }
@@ -377,7 +378,7 @@
     *          The query to associate.
     */
    @Override
-   public void setQueryAsHandle(handle qry)
+   public void queryAsHandle(handle qry)
    {
       if (qry.isUnknown())
       {
@@ -403,7 +404,7 @@
     *          The query to associate.
     */
    @Override
-   public void setQueryAsHandle(QueryWrapper qry)
+   public void queryAsHandle(QueryWrapper qry)
    {
       setQueryImpl(qry);
    }
@@ -2180,7 +2181,7 @@
        */
       public Builder setQuery(QueryWrapper query)
       {
-         DataSource.this.setQueryAsHandle(query);
+         DataSource.this.queryAsHandle(query);
          return this;
       }
       

=== modified file 'src/com/goldencode/p2j/persist/DataSourceModifiable.java'
--- src/com/goldencode/p2j/persist/DataSourceModifiable.java	2020-11-18 21:54:53 +0000
+++ src/com/goldencode/p2j/persist/DataSourceModifiable.java	2022-10-10 15:16:37 +0000
@@ -3,10 +3,11 @@
 ** Abstract : Declares the public methods for DATA-SOURCE-MODIFIED attributes of DataSet, Buffer, and
 *             TempTable.
 **
-** Copyright (c) 2020, Golden Code Development Corporation.
+** Copyright (c) 2020-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------------Description---------------------------------------
 ** 001 OM  20201020 Created initial version.
+** 002 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -77,29 +78,29 @@
     * @return  {@code true} when the data has been modified.
     */
    @LegacyAttribute(name = "DATA-SOURCE-MODIFIED")
-   public logical isDataSourceModified();
-   
-   /**
-    * Manually mark the data in the target structure as modified.
-    *
-    * @param   mod
-    *          {@code true} when the data is marked as modified and {@code false} otherwise.
-    */
-   @LegacyAttribute(name = "DATA-SOURCE-MODIFIED", setter = true)
-   public void setDataSourceModified(logical mod);
-   
-   /**
-    * Manually mark the data in the target structure as modified.
-    *
-    * @param   mod
-    *          {@code true} when the data is marked as modified and {@code false} otherwise.
-    */
-   @LegacyAttribute(name = "DATA-SOURCE-MODIFIED", setter = true)
-   public void setDataSourceModified(boolean mod);
-   
-   public static logical isDataSourceModified(Buffer rb)
+   public logical dataSourceModified();
+   
+   /**
+    * Manually mark the data in the target structure as modified.
+    *
+    * @param   mod
+    *          {@code true} when the data is marked as modified and {@code false} otherwise.
+    */
+   @LegacyAttribute(name = "DATA-SOURCE-MODIFIED", setter = true)
+   public void dataSourceModified(logical mod);
+   
+   /**
+    * Manually mark the data in the target structure as modified.
+    *
+    * @param   mod
+    *          {@code true} when the data is marked as modified and {@code false} otherwise.
+    */
+   @LegacyAttribute(name = "DATA-SOURCE-MODIFIED", setter = true)
+   public void dataSourceModified(boolean mod);
+   
+   public static logical dataSourceModified(Buffer rb)
    {
-      return rb.isDataSourceModified();
+      return rb.dataSourceModified();
    }
 }
 

=== modified file 'src/com/goldencode/p2j/persist/NamedSerializable.java'
--- src/com/goldencode/p2j/persist/NamedSerializable.java	2019-08-15 18:56:53 +0000
+++ src/com/goldencode/p2j/persist/NamedSerializable.java	2022-10-10 15:16:53 +0000
@@ -3,12 +3,13 @@
 ** Abstract : Interface which defines access methods for SERIALIZE-NAME attribute of a DataSet,
 **            a temp-table, a temp-table buffer or a temp-table buffer-field object. 
 **
-** Copyright (c) 2018-2019, Golden Code Development Corporation.
+** Copyright (c) 2018-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------Description---------------------------------
 ** 001 OM  20181114 Created initial version.
 ** 002 OM  20190327 Renamed to DataSource to avoid conflicts with DataSet source.
 ** 003 CA  20190812 Added legacy attribute annotations.
+** 004 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -81,23 +82,23 @@
     * @return  the current value of the {@code SERIALIZE-NAME} attribute. 
     */
    @LegacyAttribute(name = "SERIALIZE-NAME")
-   public character getSerializeName();
-   
-   /**
-    * Implementation of the write access of the {@code SERIALIZE-NAME} attribute.
-    *
-    * @param   sName
-    *          the new value for the {@code SERIALIZE-NAME} attribute. 
-    */
-   @LegacyAttribute(name = "SERIALIZE-NAME", setter = true)
-   public void setSerializeName(Text sName);
-   
-   /**
-    * Implementation of the write access of the {@code SERIALIZE-NAME} attribute.
-    *
-    * @param   sName
-    *          the new value for the {@code SERIALIZE-NAME} attribute. 
-    */
-   @LegacyAttribute(name = "SERIALIZE-NAME", setter = true)
-   public void setSerializeName(String sName);
+   public character serializeName();
+   
+   /**
+    * Implementation of the write access of the {@code SERIALIZE-NAME} attribute.
+    *
+    * @param   sName
+    *          the new value for the {@code SERIALIZE-NAME} attribute. 
+    */
+   @LegacyAttribute(name = "SERIALIZE-NAME", setter = true)
+   public void serializeName(Text sName);
+   
+   /**
+    * Implementation of the write access of the {@code SERIALIZE-NAME} attribute.
+    *
+    * @param   sName
+    *          the new value for the {@code SERIALIZE-NAME} attribute. 
+    */
+   @LegacyAttribute(name = "SERIALIZE-NAME", setter = true)
+   public void serializeName(String sName);
 }

=== modified file 'src/com/goldencode/p2j/persist/P2JField.java'
--- src/com/goldencode/p2j/persist/P2JField.java	2020-07-31 20:20:20 +0000
+++ src/com/goldencode/p2j/persist/P2JField.java	2022-10-10 15:17:20 +0000
@@ -2,7 +2,7 @@
 ** Module   : P2JField.java
 ** Abstract : Container for DMO field definitions.
 **
-** Copyright (c) 2013-2020, Golden Code Development Corporation.
+** Copyright (c) 2013-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------------Description---------------------------------------
 ** 001 SVL 20130624 Created initial version.
@@ -13,6 +13,7 @@
 ** 006 CA  20191203 The field's help and serialize options must be used to uniquely identify it.
 ** 007 CA  20200724 The 'initial' BDT is mutable, keep a copy, not the exact reference.
 **     OM  20200701 Made class immutable. Added debugging support.
+** 008 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -350,7 +351,7 @@
     * 
     * @return   See above.
     */
-   public String getSerializeName()
+   public String serializeName()
    {
       return serializeName;
    }

=== modified file 'src/com/goldencode/p2j/persist/QueryAssociable.java'
--- src/com/goldencode/p2j/persist/QueryAssociable.java	2017-04-01 23:33:34 +0000
+++ src/com/goldencode/p2j/persist/QueryAssociable.java	2022-10-10 15:17:37 +0000
@@ -2,11 +2,12 @@
 ** Module   : QueryAssociable.java
 ** Abstract : interface which that defines features about associated queries
 **
-** Copyright (c) 2014-2017, Golden Code Development Corporation.
+** Copyright (c) 2014-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------Description---------------------------------
 ** 001 GES 20141126 Created initial version.
 ** 002 SVL 20150804 Added setQueryAsHandle(QueryWrapper).
+** 003 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 /*
 ** This program is free software: you can redistribute it and/or modify
@@ -76,7 +77,7 @@
     * @return   The associated query or <code>unknown</code> if none exists.
     */
    @LegacyAttribute(name = "QUERY")
-   public handle getQueryAsHandle();
+   public handle queryAsHandle();
    
    /**
     * Set the query associated with the given resource.
@@ -85,7 +86,7 @@
     *           The query to associate.
     */
    @LegacyAttribute(name = "QUERY", setter = true)
-   public void setQueryAsHandle(handle qry);
+   public void queryAsHandle(handle qry);
 
    /**
     * Set the query associated with the given resource.
@@ -94,5 +95,5 @@
     *           The query to associate.
     */
    @LegacyAttribute(name = "QUERY", setter = true)
-   public void setQueryAsHandle(QueryWrapper qry);
+   public void queryAsHandle(QueryWrapper qry);
 }
\ No newline at end of file

=== modified file 'src/com/goldencode/p2j/persist/QueryWrapper.java'
--- src/com/goldencode/p2j/persist/QueryWrapper.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/QueryWrapper.java	2022-10-10 15:17:49 +0000
@@ -260,6 +260,7 @@
 **     CA  20220930          Refactored the callback invocation to be performed via a call-site and 
 **                           InvokeConfig, to allow caching of the resolved target.
 **     CA  20221006          UNIQUE-ID and ADM-DATA are kept as Java types instead of BDT.  Refs #6827
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -4531,7 +4532,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(admData);
    }
@@ -4543,7 +4544,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData = value;
    }
@@ -4555,7 +4556,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData = value.toJavaType();
    }
@@ -4567,7 +4568,7 @@
     * @return   The integer number of the children.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(uniqueID);
    }

=== modified file 'src/com/goldencode/p2j/persist/RecordBuffer.java'
--- src/com/goldencode/p2j/persist/RecordBuffer.java	2022-10-10 09:11:45 +0000
+++ src/com/goldencode/p2j/persist/RecordBuffer.java	2022-10-10 15:18:01 +0000
@@ -1236,6 +1236,7 @@
 **                           directly.  Refs #6826
 **     CA  20221010          Performance improvements - avoid the ProcedureData lookup, by keeping a parallel 
 **                           stack of this data for THIS-PROCEDURE.  Refs #6826
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -11286,7 +11287,7 @@
       if (dmoProxy != null)
       {
          // reset the DATA-SOURCE-MODIFIED
-         ((Buffer) dmoProxy).setDataSourceModified(false);
+         ((Buffer) dmoProxy).dataSourceModified(false);
       }
       
       if (newCrtRecord != null)

=== modified file 'src/com/goldencode/p2j/persist/StaticTempTable.java'
--- src/com/goldencode/p2j/persist/StaticTempTable.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/StaticTempTable.java	2022-10-10 15:18:09 +0000
@@ -39,6 +39,7 @@
 **                  child shared temp-tables) is deleted.
 **     OM  20210921 Initialized serializeName, xmlNodeName, namespaceUri, and namespacePrefix from DmoInfo.
 **     CA  20221006 The equals and hashCode methods must not be implemented by resources.
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -139,7 +140,7 @@
       DmoMeta dmoInfo = buffer.getDmoInfo();
       if (!dmoInfo.serializeName.isEmpty())
       {
-         super.setSerializeName(dmoInfo.serializeName);
+         super.serializeName(dmoInfo.serializeName);
       }
       if (!dmoInfo.xmlNodeName.isEmpty())
       {
@@ -1433,7 +1434,7 @@
    public String toString()
    {
       String myName = (name == null) ? "unnamed" : name().getValue();
-      return "STATIC " + myName + ", ID " + getUniqueID().getValue();
+      return "STATIC " + myName + ", ID " + uniqueID().getValue();
    }
 
    /**

=== modified file 'src/com/goldencode/p2j/persist/TempTableBuilder.java'
--- src/com/goldencode/p2j/persist/TempTableBuilder.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/TempTableBuilder.java	2022-10-10 15:18:18 +0000
@@ -114,6 +114,7 @@
 **     CA  20221006 Added JMX instrumentation for dynamic temp-table prepare. Refs #6814
 **                  Do not access tableHandle() in the FWD runtime, get the TempTable instance directly.  
 **                  Refs #6826
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -3542,7 +3543,7 @@
                           srcField.getCodePage(),
                           srcField.getHelp(),
                           srcField.isSerializeHidden(),
-                          srcField.getSerializeName(),
+                          srcField.serializeName(),
                           srcField.getXmlDataType(),
                           srcField.getXmlNodeName(),
                           srcField.getXmlNodeType(),
@@ -3694,6 +3695,6 @@
             eh.clearPending();
          }
       }
-      return "DYNAMIC " + myName + ", ID " + getUniqueID().getValue() + "\n" + lc.toStringMessage();
+      return "DYNAMIC " + myName + ", ID " + uniqueID().getValue() + "\n" + lc.toStringMessage();
    }
 }

=== modified file 'src/com/goldencode/p2j/persist/serial/ExtentTracker.java'
--- src/com/goldencode/p2j/persist/serial/ExtentTracker.java	2021-05-10 08:13:32 +0000
+++ src/com/goldencode/p2j/persist/serial/ExtentTracker.java	2022-10-10 15:18:37 +0000
@@ -2,12 +2,13 @@
 ** Module   : ExtentTracker.java
 ** Abstract : Helper object to track extents during temp-table data import.
 **
-** Copyright (c) 2017-2021, Golden Code Development Corporation.
+** Copyright (c) 2017-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------------Description---------------------------------------
 ** 001 ECF 20190123 Extracted from XmlImport.
 ** 002 OM  20201120 Small fix in constructor.
 ** 003 CA  20210510 Fixed JSON and XML serialization when XML-NODE-NAME/SERIALIZE-NAME field options are set.
+** 004 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -93,7 +94,7 @@
          Integer extent = column.getExtent();
          if (extent != null && extent > 0)
          {
-            String name = json ? column.getSerializeName() : column.getXmlNodeName();
+            String name = json ? column.serializeName() : column.getXmlNodeName();
             ExtentTracker.Tracker tracker = new Tracker(extent);
             trackers.put(name, tracker);
          }

=== modified file 'src/com/goldencode/p2j/persist/serial/JsonExport.java'
--- src/com/goldencode/p2j/persist/serial/JsonExport.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/serial/JsonExport.java	2022-10-10 15:18:49 +0000
@@ -29,6 +29,7 @@
 **                  the BlockManager API
 **     CA  20221006 Do not access tableHandle() in the FWD runtime, get the TempTable instance directly.  
 **                  Refs #6826
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -454,7 +455,7 @@
       
       JsonObject json = (JsonObject) (((ObjectVar<?>) ufo).ref());
       clearObject(json);
-      json.add_1(buffer.getSerializeName(), root);
+      json.add_1(buffer.serializeName(), root);
       
       return true; // all good!
    }
@@ -544,7 +545,7 @@
          
          JsonObject json = (JsonObject) (((ObjectVar<?>) ufo).ref());
          clearObject(json);
-         json.add(((BufferImpl) buffer.getDMOProxy()).getSerializeName(), root);
+         json.add(((BufferImpl) buffer.getDMOProxy()).serializeName(), root);
       }
       else //if (isJATarget)
       {
@@ -598,7 +599,7 @@
       
       for (TempTableSchema.Column column : schema.columns())
       {
-         String name = column.getSerializeName();
+         String name = column.serializeName();
          if (ReservedProperty.isReservedProperty(name))
          {
             // some fields which start with "__" are hidden fields (specific to BEFORE tables)
@@ -626,7 +627,7 @@
                addPropertyToJsonArray(jsonExtent.ref(), column, datum);
             }
             
-            root.ref().add(new character(column.getSerializeName()), jsonExtent);
+            root.ref().add(new character(column.serializeName()), jsonExtent);
          }
          else // plain property
          {
@@ -660,24 +661,24 @@
    {
       switch (column.getType().getSimpleName().toLowerCase())
       {
-         case "character": dest.add(new character(column.getSerializeName()), (character) datum); break;
-         case "comhandle": dest.add(new character(column.getSerializeName()), (comhandle) datum); break;
-         case "date": dest.add(new character(column.getSerializeName()), (date) datum); break;
-         case "datetime": dest.add(new character(column.getSerializeName()), (datetime) datum); break;
-         case "datetimetz": dest.add(new character(column.getSerializeName()), (datetimetz) datum); break;
-         case "decimal": dest.add(new character(column.getSerializeName()), (decimal) datum); break;
-         case "handle": dest.add(new character(column.getSerializeName()), (handle) datum); break;
-         case "int64": dest.add(new character(column.getSerializeName()), (int64) datum); break;
-         case "integer": dest.add(new character(column.getSerializeName()), (integer) datum); break;
-         case "logical": dest.add(new character(column.getSerializeName()), (logical) datum); break;
-         case "longchar": dest.add(new character(column.getSerializeName()), (longchar) datum); break;
-         case "memptr": dest.add(new character(column.getSerializeName()), (memptr) datum); break;
-         case "raw": dest.add(new character(column.getSerializeName()), (raw) datum); break;
-         case "recid": dest.add(new character(column.getSerializeName()), (recid) datum); break;
-         case "rowid": dest.add(new character(column.getSerializeName()), (rowid) datum); break;
-         case "object": dest.add_1(new character(column.getSerializeName()), (object) datum); break;
-         case "blob": dest.add(new character(column.getSerializeName()), (blob) datum); break;
-         case "clob": dest.add(new character(column.getSerializeName()), (clob) datum); break;
+         case "character": dest.add(new character(column.serializeName()), (character) datum); break;
+         case "comhandle": dest.add(new character(column.serializeName()), (comhandle) datum); break;
+         case "date": dest.add(new character(column.serializeName()), (date) datum); break;
+         case "datetime": dest.add(new character(column.serializeName()), (datetime) datum); break;
+         case "datetimetz": dest.add(new character(column.serializeName()), (datetimetz) datum); break;
+         case "decimal": dest.add(new character(column.serializeName()), (decimal) datum); break;
+         case "handle": dest.add(new character(column.serializeName()), (handle) datum); break;
+         case "int64": dest.add(new character(column.serializeName()), (int64) datum); break;
+         case "integer": dest.add(new character(column.serializeName()), (integer) datum); break;
+         case "logical": dest.add(new character(column.serializeName()), (logical) datum); break;
+         case "longchar": dest.add(new character(column.serializeName()), (longchar) datum); break;
+         case "memptr": dest.add(new character(column.serializeName()), (memptr) datum); break;
+         case "raw": dest.add(new character(column.serializeName()), (raw) datum); break;
+         case "recid": dest.add(new character(column.serializeName()), (recid) datum); break;
+         case "rowid": dest.add(new character(column.serializeName()), (rowid) datum); break;
+         case "object": dest.add_1(new character(column.serializeName()), (object) datum); break;
+         case "blob": dest.add(new character(column.serializeName()), (blob) datum); break;
+         case "clob": dest.add(new character(column.serializeName()), (clob) datum); break;
       }
    }
    
@@ -780,13 +781,13 @@
                ttRoot.ref().add_2(node);
             });
             
-            dsRoot.ref().add(after.getSerializeName(), ttRoot);
+            dsRoot.ref().add(after.serializeName(), ttRoot);
          }
       }
       
       JsonObject json = (JsonObject) (((ObjectVar<?>) ufo).ref());
       clearObject(json);
-      json.add_1(dataSet.getSerializeName(), dsRoot);
+      json.add_1(dataSet.serializeName(), dsRoot);
       
       return true;
    }
@@ -835,7 +836,7 @@
       TempTableSchema schema = new TempTableSchema(buffer, true);
       boolean isBefore = (overrideBeforeName != null);
       TempTable tempTable = buffer.getParentTable();
-      String serializeName = tempTable.getSerializeName().toJavaType();
+      String serializeName = tempTable.serializeName().toJavaType();
       String tableName = isBefore 
                             ? overrideBeforeName
                             : serializeName != null && !serializeName.isEmpty() 
@@ -882,7 +883,7 @@
       }
       
       // build a query depending on the relation, and add each record from the relation
-      handle hquery = relation.getQueryAsHandle();
+      handle hquery = relation.queryAsHandle();
       QueryWrapper query = (QueryWrapper) hquery.getResource();
       query.queryOpen();
       query.first();
@@ -940,7 +941,7 @@
    {
       TempTableSchema schema = new TempTableSchema(buffer, true);
       TempTable tempTable = buffer.getParentTable();
-      String serializeName = tempTable.getSerializeName().toJavaType();
+      String serializeName = tempTable.serializeName().toJavaType();
       String tableName = serializeName != null && !serializeName.isEmpty() ? serializeName
                : schema.getTableName();
       
@@ -1020,7 +1021,7 @@
    {
       if (!noOuter)
       {
-         json.fieldName(dataSet.getSerializeName().toStringMessage());
+         json.fieldName(dataSet.serializeName().toStringMessage());
          json.startObject();
       }
       
@@ -1245,7 +1246,7 @@
       {
         for (TempTableSchema.Column column : schema.columns())
         {
-           String name = column.getSerializeName();
+           String name = column.serializeName();
            if (!hiddenFields && ReservedProperty.isReservedProperty(name))
            {
               // fields which start with "__" are hidden fields (specific to BEFORE tables)
@@ -1361,7 +1362,7 @@
       
       if (!extent)
       {
-         json.fieldName(column.getSerializeName());
+         json.fieldName(column.serializeName());
       }
       
       if (((BaseDataType) datum).isUnknown())

=== modified file 'src/com/goldencode/p2j/persist/serial/JsonImport.java'
--- src/com/goldencode/p2j/persist/serial/JsonImport.java	2022-04-22 22:17:35 +0000
+++ src/com/goldencode/p2j/persist/serial/JsonImport.java	2022-10-10 15:19:04 +0000
@@ -24,6 +24,7 @@
 **     OM  20220420 Rewrite the read in REPLACE mode.
 **     CA  20220420 Reading from JSON allows a table field to not exist in the JSON, which will default to its
 **                  initial value.
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -447,7 +448,7 @@
       
       ObjectMapper mapper = new ObjectMapper();
       JsonFactory factory = mapper.getFactory();
-      String tableName = proxy.getSerializeName().toJavaType();
+      String tableName = proxy.serializeName().toJavaType();
       try (Reader reader = new InputStreamReader(source.getStream());
            JsonParser parser = factory.createParser(reader))
       {

=== modified file 'src/com/goldencode/p2j/persist/serial/SerializeOptions.java'
--- src/com/goldencode/p2j/persist/serial/SerializeOptions.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/serial/SerializeOptions.java	2022-10-10 15:19:14 +0000
@@ -12,6 +12,7 @@
 ** 005 OM  20010121 Allow the field members be mutable.
 **     CA  20221006 Refactored TableMapper for temp-tables to keep a cache of LegacyTableInfo and the mutable 
 **                  state in MutableFieldInfo, for the actual TempTable instance. Refs #6825
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -183,7 +184,7 @@
     * 
     * @return  Serialize name.
     */
-   public String getSerializeName()
+   public String serializeName()
    {
       return serializeName;
    }
@@ -194,7 +195,7 @@
     * @param   sName
     *          The new serialize name.
     */
-   public void  setSerializeName(String sName)
+   public void  serializeName(String sName)
    {
       serializeName = sName;
    }

=== modified file 'src/com/goldencode/p2j/persist/serial/TableSerializeOptions.java'
--- src/com/goldencode/p2j/persist/serial/TableSerializeOptions.java	2018-11-14 18:57:49 +0000
+++ src/com/goldencode/p2j/persist/serial/TableSerializeOptions.java	2022-10-10 15:19:31 +0000
@@ -2,11 +2,12 @@
 ** Module   : SerializeOptions.java
 ** Abstract : Options related to serialized temp-table data.
 **
-** Copyright (c) 2018, Golden Code Development Corporation.
+** Copyright (c) 2018-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------Description---------------------------------
 ** 001 CA  20180511 Created initial version.
 ** 002 OM  20181114 Made serializeName attribute mutable.
+** 003 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -109,7 +110,7 @@
     * 
     * @return  Serialize name.
     */
-   public String getSerializeName()
+   public String serializeName()
    {
       return serializeName;
    }
@@ -120,7 +121,7 @@
     * @param   sName
     *          The new serialize name.
     */
-   public void  setSerializeName(String sName)
+   public void  serializeName(String sName)
    {
       serializeName = sName;
    }

=== modified file 'src/com/goldencode/p2j/persist/serial/TempTableSchema.java'
--- src/com/goldencode/p2j/persist/serial/TempTableSchema.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/serial/TempTableSchema.java	2022-10-10 15:19:39 +0000
@@ -25,6 +25,7 @@
 **     OM  20220212 Use ReservedProperty static method for testing reserved properties names.
 **     CA  20221006 Refactored TableMapper for temp-tables to keep a cache of LegacyTableInfo and the mutable 
 **                  state in MutableFieldInfo, for the actual TempTable instance. Refs #6825
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -133,7 +134,7 @@
       
       // the table name is used for serialization, regardless of the individual buffer name
       this.name = TableMapper.getLegacyName(recBuf);
-      this.xmlName = buf.getSerializeName().toJavaType();
+      this.xmlName = buf.serializeName().toJavaType();
       
       Class<? extends DataModelObject> dmoIface = recBuf.getDMOInterface();
       Map<String, Method> getterMap = PropertyHelper.allGettersByProperty(dmoIface);
@@ -173,7 +174,7 @@
          }
          
          Column col = new Column(i + 1, getterMap, setterMap, info, recBuf);
-         String cname = json ? col.getSerializeName() : col.getXmlNodeName();
+         String cname = json ? col.serializeName() : col.getXmlNodeName();
          cname = cname.toLowerCase();
          if (columns.containsKey(cname))
          {
@@ -387,7 +388,7 @@
          this.lfi = lfi;
          SerializeOptions opts = lfi.getSerializeOptions(tt);
          
-         String serName = opts.getSerializeName();
+         String serName = opts.serializeName();
          if ("".equals(serName))
          {
             serName = null;
@@ -508,7 +509,7 @@
        * 
        * @return    The field name used for (de)serialization.
        */
-      public String getSerializeName()
+      public String serializeName()
       {
          if (lfi == null)
          {

=== modified file 'src/com/goldencode/p2j/persist/serial/XmlExport.java'
--- src/com/goldencode/p2j/persist/serial/XmlExport.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/serial/XmlExport.java	2022-10-10 15:19:49 +0000
@@ -34,6 +34,7 @@
 **     CA  20220218 Ensure the group and decimal separators are ',' and '.' during record write.
 **     CA  20221006 Do not access tableHandle() in the FWD runtime, get the TempTable instance directly.  
 **                  Refs #6826
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -1703,7 +1704,7 @@
       }
       
       // build a query depending on the relation, and add each record from the relation
-      QueryWrapper query = (QueryWrapper) relation.getQueryAsHandle().getResource();
+      QueryWrapper query = (QueryWrapper) relation.queryAsHandle().getResource();
       query.queryOpen();
       query.first();
       while (!query._isOffEnd())

=== modified file 'src/com/goldencode/p2j/persist/serial/XmlImport.java'
--- src/com/goldencode/p2j/persist/serial/XmlImport.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/persist/serial/XmlImport.java	2022-10-10 15:19:58 +0000
@@ -36,6 +36,7 @@
 **     OM  20220422 Rewrite the read in REPLACE mode.
 **     CA  20221006 Do not access tableHandle() in the FWD runtime, get the TempTable instance directly.  
 **                  Refs #6826
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -466,7 +467,7 @@
                            for (int i = 1; i <= numBuf; i++)
                            {
                               buffer = (BufferImpl) ds.bufferHandle(i).getResource();
-                              if (buffer.getSerializeName().toStringMessage().equalsIgnoreCase(name) || 
+                              if (buffer.serializeName().toStringMessage().equalsIgnoreCase(name) || 
                                   buffer.name().toStringMessage().equalsIgnoreCase(name))
                               {
                                  found = true;

=== modified file 'src/com/goldencode/p2j/ui/BrowseWidget.java'
--- src/com/goldencode/p2j/ui/BrowseWidget.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/ui/BrowseWidget.java	2022-10-10 15:20:19 +0000
@@ -377,6 +377,7 @@
 **     CA  20221006          Refactored TableMapper for temp-tables to keep a cache of LegacyTableInfo and
 **                           the mutable state in MutableFieldInfo, for the actual TempTable instance. 
 **                           Refs #6825
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -2673,7 +2674,7 @@
     * @return   The associated query or <code>unknown</code> if none exists.
     */
    @Override
-   public handle getQueryAsHandle()
+   public handle queryAsHandle()
    {
       P2JQuery query = getQuery();
       
@@ -2687,7 +2688,7 @@
     *           The query to associate.
     */
    @Override
-   public void setQueryAsHandle(handle qry)
+   public void queryAsHandle(handle qry)
    {
       if (qry == null || qry.isUnknown() || !qry._isValid())
       {
@@ -2722,7 +2723,7 @@
     *           The query to associate.
     */
    @Override
-   public void setQueryAsHandle(QueryWrapper qry)
+   public void queryAsHandle(QueryWrapper qry)
    {
       setQuery(qry);
    }

=== modified file 'src/com/goldencode/p2j/ui/FrameWidget.java'
--- src/com/goldencode/p2j/ui/FrameWidget.java	2022-06-27 14:32:59 +0000
+++ src/com/goldencode/p2j/ui/FrameWidget.java	2022-10-10 15:20:34 +0000
@@ -200,6 +200,7 @@
 **     ME  20220512          Frame has fixed size only when size is assigned outside of frame setup.
 **     ME  20220526          Extend validation for ROW/COLUMN attributes against parent.
 **     CA  20220627          SCREEN-VALUE is not a queryable/settable attribute for FRAME.
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
 /*
 ** This program is free software: you can redistribute it and/or modify
@@ -814,7 +815,7 @@
     *          A {@link handle} for the current iteration of the frame.
     */
    @Override
-   public void setCurrentIteration(handle newIter)
+   public void currentIteration(handle newIter)
    {
       UnimplementedFeature.missing("CURRENT-ITERATION setter is not implemented for frames.");
    }

=== modified file 'src/com/goldencode/p2j/ui/GenericFrame.java'
--- src/com/goldencode/p2j/ui/GenericFrame.java	2022-10-05 08:54:36 +0000
+++ src/com/goldencode/p2j/ui/GenericFrame.java	2022-10-10 15:20:46 +0000
@@ -965,6 +965,7 @@
 **                           the scopeable is 'active' (i.e. unnamed streams or accumulators are used).  This
 **                           allows a lazy registration of scopeables, to avoid the unnecessary overhead of
 **                           processing all the scopeables for each and every block.
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -2377,7 +2378,7 @@
     *          A {@link handle} for the current iteration of the frame.
     */
    @Override
-   public void setCurrentIteration(handle newIter)
+   public void currentIteration(handle newIter)
    {
       UnimplementedFeature.missing("CURRENT-ITERATION setter is not implemented for frames.");
    }

=== modified file 'src/com/goldencode/p2j/ui/GenericWidget.java'
--- src/com/goldencode/p2j/ui/GenericWidget.java	2022-08-08 23:21:00 +0000
+++ src/com/goldencode/p2j/ui/GenericWidget.java	2022-10-10 15:20:54 +0000
@@ -349,6 +349,7 @@
 **                           enclosed frame visible.
 **     EVL 20220808          Reverted previous fix for resetting HIDDEN attribute to false.  The change has
 **                           been moved to GenericFrame class, processing DISPLAY statement.
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -2297,7 +2298,7 @@
     *         with the widget.
     */
    @Override
-   public character getTable()
+   public character table()
    {
       // TODO: this returns unknown value when no name has been set, is that correct?
       //       (it probably isn't becuase the FRAME-FILE function returns "" when none if
@@ -2321,7 +2322,7 @@
     * @return   Current value of the DBNAME attribute.
     */
    @Override
-   public character getDbName()
+   public character dbName()
    {
       // TODO: this returns unknown value when no name has been set, is that correct?
       //       (it probably isn't becuase the FRAME-DB function returns "" when none if
@@ -2334,7 +2335,7 @@
     *
     * @return   Current value of the DBNAME attribute or empty string if no value is set.
     */
-   public String _getDbName()
+   public String _dbName()
    {
       return (dbName == null) ? "" : dbName;
    }

=== modified file 'src/com/goldencode/p2j/ui/LogicalTerminal.java'
--- src/com/goldencode/p2j/ui/LogicalTerminal.java	2022-10-07 15:48:09 +0000
+++ src/com/goldencode/p2j/ui/LogicalTerminal.java	2022-10-10 15:21:05 +0000
@@ -1012,6 +1012,7 @@
 **                           processing all the scopeables for each and every block.
 **     CA  20220906          Moved the interactive client cleaner to LogicalTerminal.registerCleaner().
 **     EVL 20221007          Adding runtime support for SESSION:LOAD-ICON.
+**     VVT 2022yyyy          Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -15230,7 +15231,7 @@
              lt.frameName  = gfr._getName();
              lt.frameField = gfr.getOriginalName(valWidget);
              lt.frameFile  = valWidget._getTable();
-             lt.frameDb    = valWidget._getDbName();
+             lt.frameDb    = valWidget._dbName();
           }
       }
    }

=== modified file 'src/com/goldencode/p2j/util/ADMData.java'
--- src/com/goldencode/p2j/util/ADMData.java	2017-04-01 23:33:34 +0000
+++ src/com/goldencode/p2j/util/ADMData.java	2022-10-10 15:21:21 +0000
@@ -2,11 +2,12 @@
 ** Module   : ADMData.java
 ** Abstract : Define getter and setter for ADM-DATA attribute.
 **
-** Copyright (c) 2013-2017, Golden Code Development Corporation.
+** Copyright (c) 2013-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- -----------------------Description------------------------
 ** 001 CA  20130220 Created initial version.
 ** 002 EVL 20130911 Adding legacy attributes annotation.
+** 003 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 /*
 ** This program is free software: you can redistribute it and/or modify
@@ -74,23 +75,23 @@
     * @return   See above.
     */
    @LegacyAttribute(name = "ADM-DATA")
-   public character getADMData();
-
-   /**
-    * Set the value of the ADM-DATA attribute.
-    * 
-    * @param    value
-    *           The new value.
-    */
-   @LegacyAttribute(name = "ADM-DATA", setter = true)
-   public void setADMData(String value);
-
-   /**
-    * Set the value of the ADM-DATA attribute.
-    * 
-    * @param    value
-    *           The new value.
-    */
-   @LegacyAttribute(name = "ADM-DATA", setter = true)
-   public void setADMData(character value);
+   public character admData();
+
+   /**
+    * Set the value of the ADM-DATA attribute.
+    * 
+    * @param    value
+    *           The new value.
+    */
+   @LegacyAttribute(name = "ADM-DATA", setter = true)
+   public void admData(String value);
+
+   /**
+    * Set the value of the ADM-DATA attribute.
+    * 
+    * @param    value
+    *           The new value.
+    */
+   @LegacyAttribute(name = "ADM-DATA", setter = true)
+   public void admData(character value);
 }
\ No newline at end of file

=== modified file 'src/com/goldencode/p2j/util/Call.java'
--- src/com/goldencode/p2j/util/Call.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/util/Call.java	2022-10-10 15:21:34 +0000
@@ -33,6 +33,7 @@
 **     CA  20220930 Refactored the callback invocation to be performed via a call-site and InvokeConfig, to
 **                  allow caching of the resolved target.
 **     CA  20221006 UNIQUE-ID is kept as Java type instead of BDT.  Refs #6827
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -320,7 +321,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(admData);
    }
@@ -332,7 +333,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData.assign(value);
    }
@@ -344,7 +345,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData.assign(value);
    }
@@ -356,7 +357,7 @@
     * @return   The integer number of the children.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(uniqueID);
    }

=== modified file 'src/com/goldencode/p2j/util/DatabaseInfo.java'
--- src/com/goldencode/p2j/util/DatabaseInfo.java	2017-04-01 23:33:34 +0000
+++ src/com/goldencode/p2j/util/DatabaseInfo.java	2022-10-10 15:21:48 +0000
@@ -2,11 +2,12 @@
 ** Module   : DatabaseInfo.java
 ** Abstract : Defines database-related methods and attributes support.
 **
-** Copyright (c) 2013-2017, Golden Code Development Corporation.
+** Copyright (c) 2013-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- -----------------------Description------------------------
 ** 001 VMN 20130217 Created initial version.
 ** 002 EVL 20130911 Adding legacy attributes and methods annotation.
+** 003 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 /*
 ** This program is free software: you can redistribute it and/or modify
@@ -74,7 +75,7 @@
     * @return    Current value of the DBNAME attribute.
     */
    @LegacyAttribute(name = "DBNAME")
-   public character getDbName();
+   public character dbName();
 
    /**
     * Returns the state of the TABLE attribute
@@ -82,5 +83,5 @@
     * @return    Current value of the TABLE attribute.
     */
    @LegacyAttribute(name = "TABLE")
-   public character getTable();
+   public character table();
 }
\ No newline at end of file

=== modified file 'src/com/goldencode/p2j/util/ExternalProgramWrapper.java'
--- src/com/goldencode/p2j/util/ExternalProgramWrapper.java	2022-10-03 15:17:22 +0000
+++ src/com/goldencode/p2j/util/ExternalProgramWrapper.java	2022-10-10 15:21:56 +0000
@@ -47,6 +47,7 @@
 **                  a connection.
 **     VVT 20221003 CommonHandle.getResourceType() method renamed to resourceType() to prevent conflicts
 **                  with namesakes in DMO. See #6694.
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -621,33 +622,33 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
-   {
-      return ProcedureManager.getADMData(referent);
-   }
-
-   /**
-    * Set the value of the ADM-DATA attribute.
-    * 
-    * @param    value
-    *           The new value.
-    */
-   @Override
-   public void setADMData(String value)
-   {
-      ProcedureManager.setADMData(referent, value);
-   }
-
-   /**
-    * Set the value of the ADM-DATA attribute.
-    * 
-    * @param    value
-    *           The new value.
-    */
-   @Override
-   public void setADMData(character value)
-   {
-      ProcedureManager.setADMData(referent, value.getValue());
+   public character admData()
+   {
+      return ProcedureManager.admData(referent);
+   }
+
+   /**
+    * Set the value of the ADM-DATA attribute.
+    * 
+    * @param    value
+    *           The new value.
+    */
+   @Override
+   public void admData(String value)
+   {
+      ProcedureManager.admData(referent, value);
+   }
+
+   /**
+    * Set the value of the ADM-DATA attribute.
+    * 
+    * @param    value
+    *           The new value.
+    */
+   @Override
+   public void admData(character value)
+   {
+      ProcedureManager.admData(referent, value.getValue());
    }
 
    /**
@@ -657,9 +658,9 @@
     * @return   The integer number of the children.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
-      return ProcedureManager.getUniqueID(referent);
+      return ProcedureManager.uniqueID(referent);
    }
    
    /**

=== modified file 'src/com/goldencode/p2j/util/IterableResource.java'
--- src/com/goldencode/p2j/util/IterableResource.java	2017-04-01 23:33:34 +0000
+++ src/com/goldencode/p2j/util/IterableResource.java	2022-10-10 15:22:12 +0000
@@ -2,12 +2,13 @@
 ** Module   : IterableResource.java
 ** Abstract : interface which must be implemented iterable components such as Buffer or Frame 
 **
-** Copyright (c) 2014-2017, Golden Code Development Corporation.
+** Copyright (c) 2014-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------Description---------------------------------
 ** 001 VIG 20140121 Created initial version.
 ** 002 EVL 20160621 Adding setter.  Now the frame interface inherits this instead of direct
 **                  defining setter and getter.
+** 003 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 /*
 ** This program is free software: you can redistribute it and/or modify
@@ -87,5 +88,5 @@
     *          A {@link handle} for the current iteration of the frame.
     */
    @LegacyAttribute(name = "CURRENT-ITERATION", setter = true)
-   public void setCurrentIteration(handle newIter);
+   public void currentIteration(handle newIter);
 }
\ No newline at end of file

=== modified file 'src/com/goldencode/p2j/util/PortTypeWrapper.java'
--- src/com/goldencode/p2j/util/PortTypeWrapper.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/util/PortTypeWrapper.java	2022-10-10 15:22:25 +0000
@@ -12,6 +12,7 @@
 ** 023 OM  20201030 Invalid attribute API support for getters/setters.
 **     OM  20201120 Added callback procedure management methods.
 **     CA  20221006 UNIQUE-ID is kept as Java type instead of BDT.  Refs #6827
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -555,7 +556,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(this.admData);
    }
@@ -567,7 +568,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData.assign(value);
    }
@@ -579,7 +580,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData.assign(value);
    }
@@ -591,7 +592,7 @@
     * @return   See above.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(this.uniqueId);
    }

=== modified file 'src/com/goldencode/p2j/util/ProcedureManager.java'
--- src/com/goldencode/p2j/util/ProcedureManager.java	2022-10-10 10:16:01 +0000
+++ src/com/goldencode/p2j/util/ProcedureManager.java	2022-10-10 15:22:37 +0000
@@ -214,6 +214,7 @@
 **                  UNIQUE-ID is kept as Java type instead of BDT.  Refs #6827
 **     CA  20221010 Performance improvements - avoid the ProcedureData lookup, by keeping a parallel stack of
 **                  this data for THIS-PROCEDURE.  Refs #6826
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -2704,7 +2705,7 @@
     * 
     * @return   See above.
     */
-   static character getADMData(Object referent)
+   static character admData(Object referent)
    {
       ProcedureData pp = locateProcedure(referent);
       return new character(pp.admData);
@@ -2719,7 +2720,7 @@
     * @param    value
     *           The new value.
     */
-   static void setADMData(Object referent, String value)
+   static void admData(Object referent, String value)
    {
       ProcedureData pp = locateProcedure(referent);
       pp.admData.assign(value);
@@ -2734,7 +2735,7 @@
     *
     * @return   The integer number of the children.
     */
-   static integer getUniqueID(Object referent)
+   static integer uniqueID(Object referent)
    {
       ProcedureData pp = locateProcedure(referent);
       return new integer(pp.uniqueID);

=== modified file 'src/com/goldencode/p2j/util/SOAPHeaderEntryImpl.java'
--- src/com/goldencode/p2j/util/SOAPHeaderEntryImpl.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/util/SOAPHeaderEntryImpl.java	2022-10-10 15:22:48 +0000
@@ -15,6 +15,7 @@
 ** 008 OM  20201120 Changed method names to fit the buffer no-bean prefix convention.
 **     OM  20210309 Removed deprecation warnings.
 **     CA  20221006 UNIQUE-ID is kept as Java type instead of BDT.  Refs #6827
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -477,7 +478,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(this.admData);
    }
@@ -489,7 +490,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData.assign(value);
    }
@@ -501,7 +502,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData.assign(value);
    }
@@ -513,7 +514,7 @@
     * @return   The integer number of the children.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(this.uniqueID);
    }

=== modified file 'src/com/goldencode/p2j/util/SOAPHeaderImpl.java'
--- src/com/goldencode/p2j/util/SOAPHeaderImpl.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/util/SOAPHeaderImpl.java	2022-10-10 15:22:55 +0000
@@ -15,6 +15,7 @@
 ** 007 CA  20140107 Added runtime support.
 ** 008 VVT 20220306 Uniform toString() support added.
 **     CA  20221006 UNIQUE-ID is kept as Java type instead of BDT.  Refs #6827
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 /*
 ** This program is free software: you can redistribute it and/or modify
@@ -264,7 +265,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(this.admData);
    }
@@ -276,7 +277,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
       this.admData.assign(value);
    }
@@ -288,7 +289,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       this.admData.assign(value);
    }
@@ -300,7 +301,7 @@
     * @return   The integer number of the children.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(this.uniqueID);
    }

=== modified file 'src/com/goldencode/p2j/util/UniqueID.java'
--- src/com/goldencode/p2j/util/UniqueID.java	2019-04-19 20:07:43 +0000
+++ src/com/goldencode/p2j/util/UniqueID.java	2022-10-10 15:23:12 +0000
@@ -2,12 +2,13 @@
 ** Module   : UniqueID.java
 ** Abstract : Define getter for UNIQUE-ID attribute.
 **
-** Copyright (c) 2013-2019, Golden Code Development Corporation.
+** Copyright (c) 2013-2022, Golden Code Development Corporation.
 **
 ** -#- -I- --Date-- ---------------------------------Description---------------------------------
 ** 001 CA  20130220 Created initial version.
 ** 002 EVL 20130930 Adding legacy attributes and methods annotation.
 ** 003 OM  20190419 Updated javadoc.
+** 004 VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -77,5 +78,5 @@
     * @return  The unique integer number that identifies this object.
     */
    @LegacyAttribute(name = "UNIQUE-ID")
-   public integer getUniqueID();
+   public integer uniqueID();
 }

=== modified file 'src/com/goldencode/p2j/xml/SaxEntityImpl.java'
--- src/com/goldencode/p2j/xml/SaxEntityImpl.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/xml/SaxEntityImpl.java	2022-10-10 15:23:20 +0000
@@ -13,6 +13,7 @@
 ** 005 EVK 20140113 Moved method valid() to XCommonImpl class.
 ** 006 OM  20201030 Invalid attribute API support for getters/setters.
 ** 007 CA  20221006 UNIQUE-ID is kept as Java type instead of BDT.  Refs #6827
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -104,7 +105,7 @@
     * @return   The unique integer value for a given handle object type within an 4gl session.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(uniqueId);
    }
@@ -115,7 +116,7 @@
     * @return   See above.
     */
    @Override
-   public character getADMData()
+   public character admData()
    {
       return new character(admData);
    }
@@ -127,9 +128,9 @@
     *           The new value.
     */
    @Override
-   public void setADMData(String value)
+   public void admData(String value)
    {
-      setADMData(new character(value));
+      admData(new character(value));
    }
 
    /**
@@ -139,7 +140,7 @@
     *           The new value.
     */
    @Override
-   public void setADMData(character value)
+   public void admData(character value)
    {
       admData.assign(value);
    }

=== modified file 'src/com/goldencode/p2j/xml/XEntityImpl.java'
--- src/com/goldencode/p2j/xml/XEntityImpl.java	2022-10-06 08:18:44 +0000
+++ src/com/goldencode/p2j/xml/XEntityImpl.java	2022-10-10 15:23:32 +0000
@@ -36,6 +36,7 @@
 **     CA  20211227 GetChild must show an error if the index is not a valid child, and not raise an ERROR 
 **                  condition. 
 **     CA  20221006 UNIQUE-ID is kept as Java type instead of BDT.  Refs #6827
+**     VVT 2022yyyy Method(s) renamed to avoid method name clashes. See #6767.
 */
 
 /*
@@ -604,7 +605,7 @@
     * @return   The integer unique number of node inside document.
     */
    @Override
-   public integer getUniqueID()
+   public integer uniqueID()
    {
       return new integer(this.uniqueID);
    }

